Commit 8f85202f authored by Christian Kamm's avatar Christian Kamm
Browse files

QmlProject and Observer: Work with Simulator Qt targets.

This allows using the qmlviewer of a Simulator Qt version. It also
builds and uses the qmlobserver when debugging.

Reviewed-by: Kai Koehne
parent 8f70d0e2
......@@ -473,7 +473,8 @@ void QmlProjectRunConfiguration::manageQtVersions()
bool QmlProjectRunConfiguration::isValidVersion(Qt4ProjectManager::QtVersion *version)
{
if (version
&& version->supportsTargetId(Qt4ProjectManager::Constants::DESKTOP_TARGET_ID)
&& (version->supportsTargetId(Qt4ProjectManager::Constants::DESKTOP_TARGET_ID)
|| version->supportsTargetId(Qt4ProjectManager::Constants::QT_SIMULATOR_TARGET_ID))
&& !version->qmlviewerCommand().isEmpty()) {
return true;
}
......
......@@ -53,7 +53,8 @@ static inline QStringList validBinaryFilenames()
bool QmlObserverTool::canBuild(const QtVersion *qtVersion)
{
return qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID)
return (qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID)
|| qtVersion->supportsTargetId(Constants::QT_SIMULATOR_TARGET_ID))
&& checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1);
}
......
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