rename qmlviewer to qmlobserver

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -96,11 +96,7 @@ void QmlProjectRunConfiguration::ctor()
 
     setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
 
-#ifdef Q_OS_MAC
-    const QString qmlViewerName = QLatin1String("QMLViewer");
-#else
-    const QString qmlViewerName = QLatin1String("qmlviewer");
-#endif
+    const QString qmlViewerName = QLatin1String("qmlobserver");
 
     if (m_qmlViewerDefaultPath.isEmpty()) {
         QDir qmlviewerExecutable(QCoreApplication::applicationDirPath());
@@ -111,7 +107,7 @@ void QmlProjectRunConfiguration::ctor()
 #endif
         QFileInfo qmlviewerFileInfo(m_qmlViewerDefaultPath);
         if (!qmlviewerFileInfo.exists()) {
-            qWarning() << "QmlProjectRunConfiguration::ctor(): qmlviewer executable does not exist at" << m_qmlViewerDefaultPath;
+            qWarning() << "QmlProjectRunConfiguration::ctor(): QML Viewer executable does not exist at" << m_qmlViewerDefaultPath;
             m_qmlViewerDefaultPath.clear();
         } else if (!qmlviewerFileInfo.isFile()) {
             qWarning() << "QmlProjectRunConfiguration::ctor(): " << m_qmlViewerDefaultPath << " is not a file";

src/tools/qml/qml.pro

@@ -4,7 +4,7 @@ contains(QT_CONFIG, declarative) {
 
     include(../../private_headers.pri)
     exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativemetatype_p.h) {
-        SUBDIRS += qmldump qmlviewer
+        SUBDIRS += qmldump qmlobserver
     } else {
         warning()
         warning("QmlDump utility has been disabled")

src/tools/qml/qmlviewer/qmlviewer.pro

@@ -15,4 +15,4 @@ mac {
     ICON=qml.icns
 }
 
-TARGET=qmlviewer
+TARGET=qmlobserver