Qml Standalong App: Fix regression when debugging apps

Adapt Qt4ProjectManager to use QMLOBSERVER instead of QMLINSPECTOR
(got changed in commit a10b26920)

4 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 0d78fb428d..0619b7a78b 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -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;
 }
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index a6403ccf0f..3ead32b80f 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -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;
 }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 8422c0261a..1eb2c36122 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -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
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
index 425711d36a..4ac6822339 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
@@ -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);