From ed79c97d839fff3d41148063de88c42e6efd146c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 14 Feb 2011 13:37:56 +0100 Subject: [PATCH] Symbian: Move QMLJSDEBUGGER qmake argument Make sure it's before the "-after" section, and therefore available in the .pro file. --- src/plugins/qt4projectmanager/qmakestep.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index e90c9790e40..35fc4c8bded 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -160,6 +160,17 @@ QStringList QMakeStep::moreArguments() || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor)) arguments << QLatin1String("-unix"); #endif + + if (m_linkQmlDebuggingLibrary + && !bc->qtVersion()->qmlDebuggingHelperLibrary(true).isEmpty()) { + // Do not turn debugger path into native path separators: Qmake does not like that! + const QString debuggingHelperPath + = QFileInfo(bc->qtVersion()->qmlDebuggingHelperLibrary(true)).dir().path(); + + arguments << QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH) + + QLatin1Char('=') + debuggingHelperPath; + } + if (!bc->qtVersion()->supportsShadowBuilds()) { // We have a target which does not allow shadow building. // But we really don't want to have the build artefacts in the source dir @@ -172,16 +183,6 @@ QStringList QMakeStep::moreArguments() << QLatin1String("UI_DIR=ui") << QLatin1String("RCC_DIR=rcc"); } - - if (m_linkQmlDebuggingLibrary - && !bc->qtVersion()->qmlDebuggingHelperLibrary(true).isEmpty()) { - // Do not turn debugger path into native path separators: Qmake does not like that! - const QString debuggingHelperPath - = QFileInfo(bc->qtVersion()->qmlDebuggingHelperLibrary(true)).dir().path(); - - arguments << QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH) - + QLatin1Char('=') + debuggingHelperPath; - } return arguments; }