diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2009-10-23 09:49:59 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2009-10-23 11:33:26 +0200 |
| commit | 4c85511d5506d51de1bd987534d99bbf1e2da6ef (patch) | |
| tree | 21807eaeebf5e46157bd668a55965af1c76ed810 /src | |
| parent | 07c2451abd28dd2598f0570622b4324288cbaccc (diff) | |
| download | qt-creator-4c85511d5506d51de1bd987534d99bbf1e2da6ef.tar.gz | |
Search qmlviewer binary also in creator/bin
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 4e891641d1..43707de1ad 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -338,7 +338,12 @@ QmlRunConfiguration::QmlRunConfiguration(QmlProject *pro) { setName(tr("QML Viewer")); - m_qmlViewer = Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer")); + // append creator/bin dir to search path (only useful for special creator-qml package) + const QString searchPath = QString(qgetenv("PATH")) + + Utils::SynchronousProcess::pathSeparator() + + QCoreApplication::applicationDirPath() +; + m_qmlViewer = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer")); } QmlRunConfiguration::~QmlRunConfiguration() |