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

rename qmlviewer to qmlobserver

Browse Source
This commit is contained in:
Lasse Holmstedt
2010-07-14 14:23:47 +02:00
committed by Olivier Goffart
parent 4a4fc8584f
commit 763d5bdd86
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

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

2
src/tools/qml/qml.pro
View File

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

2
src/tools/qml/qmlviewer/qmlviewer.pro
View File

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