From a1dbe9a3c788c9a7029c602f92b4e04c9713c6c4 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Thu, 22 Nov 2012 12:43:59 +0100
Subject: [PATCH] QML Debugging: Qt Quick 2 Application Wizard
QML debugging is enabled by default for applications
created with the Qt Quick 2 application wizard.
Task-number: QTCREATORBUG-8208
Change-Id: I1869649ce88c35e2d8d4a6677b1d257f7454f223
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/plugins/projectexplorer/runconfiguration.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 0ec71ee0838..64c70597871 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -158,9 +158,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
--
GitLab