Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
dad99969
Commit
dad99969
authored
Jul 15, 2010
by
Lasse Holmstedt
Browse files
Fixed OS X qml observer name
parent
65d06121
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View file @
dad99969
...
...
@@ -96,14 +96,18 @@ void QmlProjectRunConfiguration::ctor()
setDisplayName
(
tr
(
"QML Viewer"
,
"QMLRunConfiguration display name."
));
const
QString
qmlViewerName
=
QLatin1String
(
"qmlobserver"
);
#ifdef Q_OS_MAC
const
QString
qmlObserverName
=
QLatin1String
(
"QMLObserver.app"
);
#else
const
QString
qmlObserverName
=
QLatin1String
(
"qmlobserver"
);
#endif
if
(
m_qmlViewerDefaultPath
.
isEmpty
())
{
QDir
qmlviewerExecutable
(
QCoreApplication
::
applicationDirPath
());
#if
n
def Q_OS_WIN
m_qmlViewerDefaultPath
=
qmlviewerExecutable
.
absoluteFilePath
(
qml
ViewerName
);
#ifdef Q_OS_WIN
m_qmlViewerDefaultPath
=
qmlviewerExecutable
.
absoluteFilePath
(
qml
ObserverName
+
QLatin1String
(
".exe"
)
);
#else
m_qmlViewerDefaultPath
=
qmlviewerExecutable
.
absoluteFilePath
(
QString
(
"%1.exe"
).
arg
(
qmlView
erName
)
)
;
m_qmlViewerDefaultPath
=
qmlviewerExecutable
.
absoluteFilePath
(
qmlObserv
erName
);
#endif
QFileInfo
qmlviewerFileInfo
(
m_qmlViewerDefaultPath
);
if
(
!
qmlviewerFileInfo
.
exists
())
{
...
...
src/tools/qml/qmlobserver/qmlobserver.pro
View file @
dad99969
...
...
@@ -12,7 +12,8 @@ include(../../../rpath.pri)
mac
{
QMAKE_INFO_PLIST
=
Info_mac
.
plist
TARGET
=
QMLObserver
ICON
=
qml
.
icns
}
else
{
TARGET
=
qmlobserver
}
TARGET
=
qmlobserver
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment