Commit 2e36b9a3 authored by Kai Koehne's avatar Kai Koehne
Browse files

Make sure that the qmlviewer from the binary package is always used

The custom creator-qml installer comes with a qmlviewer installed
in creator/bin. Make sure that this qmlviewer is used to run .qmlproject
files, even though there might be other qmlviewer binaries in the
PATH.
parent 23657d2c
...@@ -308,11 +308,11 @@ QmlRunConfiguration::QmlRunConfiguration(QmlProject *pro) ...@@ -308,11 +308,11 @@ QmlRunConfiguration::QmlRunConfiguration(QmlProject *pro)
{ {
setDisplayName(tr("QML Viewer")); setDisplayName(tr("QML Viewer"));
// append creator/bin dir to search path (only useful for special creator-qml package) // prepend creator/bin dir to search path (only useful for special creator-qml package)
const QString searchPath = QString(qgetenv("PATH")) const QString searchPath = QCoreApplication::applicationDirPath()
+ Utils::SynchronousProcess::pathSeparator() + Utils::SynchronousProcess::pathSeparator()
+ QCoreApplication::applicationDirPath() + QString(qgetenv("PATH"));
;
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer")); m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer"));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment