feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
This commit is contained in:
Eike Ziller
2013-11-06 14:02:08 +01:00
parent f85c200244 fbd3f73594
commit 49b7e95e7f
358 changed files with 3130 additions and 107477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlproject.h
View File

@@ -97,6 +97,7 @@ private slots:
void refreshFiles(const QSet<QString> &added, const QSet<QString> &removed);
void addedTarget(ProjectExplorer::Target *target);
void onActiveTargetChanged(ProjectExplorer::Target *target);
void onKitChanged();
void addedRunConfiguration(ProjectExplorer::RunConfiguration *);
protected:
@@ -113,6 +114,7 @@ private:
QString m_projectName;
QmlImport m_defaultImport;
QmlJS::ModelManagerInterface *m_modelManager;
ProjectExplorer::Target *m_activeTarget;
// plain format
QStringList m_files;