summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/runconfiguration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/projectexplorer/runconfiguration.cpp')
-rw-r--r--src/plugins/projectexplorer/runconfiguration.cpp10
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