diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
| commit | 387f5a70065b6a21143f30a693b3946f43145aa1 (patch) | |
| tree | 19499220eb78ffc2b83174768e4db33f36d33242 /src/plugins/projectexplorer/runconfiguration.cpp | |
| parent | c9afad98efee2e9d7eb09407395c8ad00f175f17 (diff) | |
| parent | 9820278a708024cc1ae01372dfafabe4ff295b88 (diff) | |
| download | qt-creator-387f5a70065b6a21143f30a693b3946f43145aa1.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
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
Diffstat (limited to 'src/plugins/projectexplorer/runconfiguration.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/runconfiguration.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 10c9f82e63..29e5e53a3d 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -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 |