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

Qml Standalong App: Fix regression when debugging apps

Browse Source 
Adapt Qt4ProjectManager to use QMLOBSERVER instead of QMLINSPECTOR
(got changed in commit a10b26920)
This commit is contained in:
Kai Koehne
2010-09-16 17:03:22 +02:00
parent 544e137e0b
commit 82f4e73c7b
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -128,7 +128,7 @@ QStringList QMakeStep::allArguments()
/// moreArguments, /// moreArguments,
/// -unix for Maemo /// -unix for Maemo
/// -after OBJECTS_DIR, MOC_DIR, UI_DIR, RCC_DIR /// -after OBJECTS_DIR, MOC_DIR, UI_DIR, RCC_DIR
/// QMKAE_VAR_QMLINSPECTOR_PATH /// QMAKE_VAR_QMLOBSERVER_PATH
QStringList QMakeStep::moreArguments() QStringList QMakeStep::moreArguments()
{ {
Qt4BuildConfiguration *bc = qt4BuildConfiguration(); Qt4BuildConfiguration *bc = qt4BuildConfiguration();
@@ -152,7 +152,7 @@ QStringList QMakeStep::moreArguments()
<< QLatin1String("RCC_DIR=rcc"); << QLatin1String("RCC_DIR=rcc");
} }
arguments << QLatin1String(Constants::QMAKEVAR_QMLINSPECTOR_PATH) + QLatin1Char('=') + arguments << QLatin1String(Constants::QMAKEVAR_QMLOBSERVER_PATH) + QLatin1Char('=') +
Core::ICore::instance()->resourcePath() + QLatin1String("/qmljsdebugger"); Core::ICore::instance()->resourcePath() + QLatin1String("/qmljsdebugger");
return arguments; return arguments;
} }

2
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -525,7 +525,7 @@ QStringList Qt4BuildConfiguration::removeQMLInspectorFromArgumentList(const QStr
{ {
QStringList result; QStringList result;
foreach (const QString &str, old) foreach (const QString &str, old)
if (!str.startsWith(QLatin1String(Constants::QMAKEVAR_QMLINSPECTOR_PATH))) if (!str.startsWith(QLatin1String(Constants::QMAKEVAR_QMLOBSERVER_PATH)))
result << str; result << str;
return result; return result;
} }

2
src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
View File

@@ -112,7 +112,7 @@ const char * const ICON_WINDOW = ":/qt4projectmanager/images/window.png";
const char * const ICON_QML_STANDALONE = ":/wizards/images/qml_standalone.png"; const char * const ICON_QML_STANDALONE = ":/wizards/images/qml_standalone.png";
// Env variables // Env variables
const char * const QMAKEVAR_QMLINSPECTOR_PATH = "QMLINSPECTOR_PATH"; const char * const QMAKEVAR_QMLOBSERVER_PATH = "QMLOBSERVER_PATH";
} // namespace Constants } // namespace Constants
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager

2
src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
View File

@@ -244,7 +244,7 @@ void QmlStandaloneApp::handleCurrentProFileTemplateLine(const QString &line,
} }
} }
proFile << "DEPLOYMENTFOLDERS = " << folders.join(QLatin1String(" ")) << endl; proFile << "DEPLOYMENTFOLDERS = " << folders.join(QLatin1String(" ")) << endl;
} else if (line.contains(QLatin1String("# QMLINSPECTOR"))) { } else if (line.contains(QLatin1String("# QMLOBSERVER"))) {
// ### disabled for now; figure out the private headers problem first. // ### disabled for now; figure out the private headers problem first.
//uncommentNextLine = true; //uncommentNextLine = true;
Q_UNUSED(uncommentNextLine); Q_UNUSED(uncommentNextLine);