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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
This commit is contained in:
Eike Ziller
2012-11-26 10:52:28 +01:00
parent c9afad98ef 9820278a70
commit 387f5a7006
64 changed files with 860 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -159,9 +159,15 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
static bool isQtQuickAppProject(Project *project)
{
const QString filePath = project->projectDirectory()
const QString projectDirectory = project->projectDirectory();
// Qt Quick 1 wizard generated file
const QString qq1FilePath = projectDirectory
+ QLatin1String("/qmlapplicationviewer/qmlapplicationviewer.pri");
return project->files(Project::ExcludeGeneratedFiles).contains(filePath);
// Qt Quick 2 wizard generated file
const QString qq2FilePath = projectDirectory
+ QLatin1String("/qtquick2applicationviewer/qtquick2applicationviewer.pri");
const QStringList projectFiles = project->files(Project::ExcludeGeneratedFiles);
return projectFiles.contains(qq1FilePath) || projectFiles.contains(qq2FilePath);
}
bool DebuggerRunConfigurationAspect::useQmlDebugger() const