From 763d5bdd86ffb4bd8e48c4cc0ecf7669e2f0cd99 Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Wed, 14 Jul 2010 14:23:47 +0200
Subject: [PATCH] rename qmlviewer to qmlobserver
---
.../qmlprojectmanager/qmlprojectrunconfiguration.cpp | 8 ++------
src/tools/qml/qml.pro | 2 +-
src/tools/qml/qmlviewer/qmlviewer.pro | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 2bc4bfbe635..fbd9076b108 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/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";
diff --git a/src/tools/qml/qml.pro b/src/tools/qml/qml.pro
index 42a03b117c3..93681d17d53 100644
--- a/src/tools/qml/qml.pro
+++ b/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")
diff --git a/src/tools/qml/qmlviewer/qmlviewer.pro b/src/tools/qml/qmlviewer/qmlviewer.pro
index f7da4ea2556..55c30c13aeb 100644
--- a/src/tools/qml/qmlviewer/qmlviewer.pro
+++ b/src/tools/qml/qmlviewer/qmlviewer.pro
@@ -15,4 +15,4 @@ mac {
ICON=qml.icns
}
-TARGET=qmlviewer
+TARGET=qmlobserver
--
GitLab