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
Marco Bubke
flatpak-qt-creator
Commits
763d5bdd
Commit
763d5bdd
authored
Jul 14, 2010
by
Lasse Holmstedt
Committed by
Olivier Goffart
Jul 14, 2010
Browse files
rename qmlviewer to qmlobserver
parent
4a4fc858
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View file @
763d5bdd
...
...
@@ -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():
qmlv
iewer executable does not exist at"
<<
m_qmlViewerDefaultPath
;
qWarning
()
<<
"QmlProjectRunConfiguration::ctor():
QML V
iewer 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
View file @
763d5bdd
...
...
@@ -4,7 +4,7 @@ contains(QT_CONFIG, declarative) {
include
(..
/../
private_headers
.
pri
)
exists
(
$$
{
QT_PRIVATE_HEADERS
}
/
QtDeclarative
/
private
/
qdeclarativemetatype_p
.
h
)
{
SUBDIRS
+=
qmldump
qml
view
er
SUBDIRS
+=
qmldump
qml
observ
er
}
else
{
warning
()
warning
(
"QmlDump utility has been disabled"
)
...
...
src/tools/qml/qmlviewer/qmlviewer.pro
View file @
763d5bdd
...
...
@@ -15,4 +15,4 @@ mac {
ICON
=
qml
.
icns
}
TARGET
=
qml
view
er
TARGET
=
qml
observ
er
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