Commit 82f4e73c authored by Kai Koehne's avatar Kai Koehne
Browse files

Qml Standalong App: Fix regression when debugging apps

Adapt Qt4ProjectManager to use QMLOBSERVER instead of QMLINSPECTOR
(got changed in commit a10b2692)
parent 544e137e
......@@ -128,7 +128,7 @@ QStringList QMakeStep::allArguments()
/// moreArguments,
/// -unix for Maemo
/// -after OBJECTS_DIR, MOC_DIR, UI_DIR, RCC_DIR
/// QMKAE_VAR_QMLINSPECTOR_PATH
/// QMAKE_VAR_QMLOBSERVER_PATH
QStringList QMakeStep::moreArguments()
{
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
......@@ -152,7 +152,7 @@ QStringList QMakeStep::moreArguments()
<< QLatin1String("RCC_DIR=rcc");
}
arguments << QLatin1String(Constants::QMAKEVAR_QMLINSPECTOR_PATH) + QLatin1Char('=') +
arguments << QLatin1String(Constants::QMAKEVAR_QMLOBSERVER_PATH) + QLatin1Char('=') +
Core::ICore::instance()->resourcePath() + QLatin1String("/qmljsdebugger");
return arguments;
}
......
......@@ -525,7 +525,7 @@ QStringList Qt4BuildConfiguration::removeQMLInspectorFromArgumentList(const QStr
{
QStringList result;
foreach (const QString &str, old)
if (!str.startsWith(QLatin1String(Constants::QMAKEVAR_QMLINSPECTOR_PATH)))
if (!str.startsWith(QLatin1String(Constants::QMAKEVAR_QMLOBSERVER_PATH)))
result << str;
return result;
}
......
......@@ -112,7 +112,7 @@ const char * const ICON_WINDOW = ":/qt4projectmanager/images/window.png";
const char * const ICON_QML_STANDALONE = ":/wizards/images/qml_standalone.png";
// Env variables
const char * const QMAKEVAR_QMLINSPECTOR_PATH = "QMLINSPECTOR_PATH";
const char * const QMAKEVAR_QMLOBSERVER_PATH = "QMLOBSERVER_PATH";
} // namespace Constants
} // namespace Qt4ProjectManager
......
......@@ -244,7 +244,7 @@ void QmlStandaloneApp::handleCurrentProFileTemplateLine(const QString &line,
}
}
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.
//uncommentNextLine = true;
Q_UNUSED(uncommentNextLine);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment