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

Added fall-back for the QML viewer to first check if there is one bundled with Qt Creator.

Browse Source
This commit is contained in:
Erik Verbruggen
2009-10-09 10:37:19 +02:00
parent 926144dcea
commit fd6e18584a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -491,8 +491,19 @@ void QmlRunConfiguration::restore(const ProjectExplorer::PersistentSettingsReade
m_qmlViewerArgs = reader.restoreValue(QLatin1String("qmlviewerargs")).toString(); m_qmlViewerArgs = reader.restoreValue(QLatin1String("qmlviewerargs")).toString();
m_scriptFile = reader.restoreValue(QLatin1String("mainscript")).toString(); m_scriptFile = reader.restoreValue(QLatin1String("mainscript")).toString();
if (m_qmlViewer.isEmpty()) if (m_qmlViewer.isEmpty()) {
m_qmlViewer = Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer")); // first see if there is a bundled qmlviewer
#ifdef Q_OS_WIN32
const QLatin1String qmlViewerExe("qmlviewer.exe");
#else
const QLatin1String qmlViewerExe("qmlviewer");
#endif
const QFileInfo info(QCoreApplication::applicationDirPath(), qmlViewerExe);
if (info.exists() && info.isExecutable())
m_qmlViewer = info.absoluteFilePath();
else // if not, then try to locate it elsewhere
m_qmlViewer = Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer"));
}
if (m_scriptFile.isEmpty()) if (m_scriptFile.isEmpty())
m_scriptFile = tr("<Current File>"); m_scriptFile = tr("<Current File>");