Remove qmlsceneCommand() and qmlViewerCommand() from BaseQtVersion

qmlviewer is QtQuick1 and not supported anymore.

The qmlscene command is in general not a property of the Qt version but
of the target device, as we generally assume Qt binaries to be
preinstalled on the target and qmlscene is executed on the target.

DesktopQtVersion retains a method to retrieve the qmlscene path as there
target == host and having the method available enables us to warn if the
binary is missing.

Also, QmlProjectManager needs to pick the qmlscene command from the Qt
version if it's a desktop Qt.

Change-Id: I2ee0f993e60b96d672080db2db0a6abe5ca933e3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Ulf Hermann
2017-11-27 11:58:57 +01:00
parent 8880b32426
commit 8964de84d3
6 changed files with 78 additions and 63 deletions

View File

@@ -43,6 +43,7 @@
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/desktopqtversion.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <utils/algorithm.h>
@@ -268,7 +269,8 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
return false;
return version->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0)
&& !version->qmlsceneCommand().isEmpty();
&& !static_cast<QtSupport::DesktopQtVersion *>(version)
->qmlsceneCommand().isEmpty();
})
);