diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2017-11-27 11:48:43 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-11-30 15:57:53 +0000 |
commit | 8c504dc61e2b6189c28519be26529303bcf4b56d (patch) | |
tree | f6021f5351bd63544b505246e63bf3ac01c86bff /src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp | |
parent | 0c9c747d92b7f263b386ea89d82887dc59a24773 (diff) | |
download | qt-creator-8c504dc61e2b6189c28519be26529303bcf4b56d.tar.gz |
QmlProjectManager: Drop support for QtQuick1
Change-Id: Id60c9768d8fad03f588207af07bba676dbfc76fc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp index 77bcc46617..1e1ee2ad8f 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp @@ -36,7 +36,6 @@ namespace QmlProjectManager { namespace Internal { -const char QML_VIEWER_SUFFIX[] = ""; const char QML_SCENE_SUFFIX[] = ".QmlScene"; QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory(QObject *parent) : @@ -53,47 +52,24 @@ QList<QString> QmlProjectRunConfigurationFactory::availableBuildTargets(ProjectE QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(parent->kit()); - const QString viewer = QML_VIEWER_SUFFIX; - const QString scene = QML_SCENE_SUFFIX; - - // First id will be the default run configuration - if (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0)) { - QmlProject *project = static_cast<QmlProject*>(parent->project()); - switch (project->defaultImport()) { - case QmlProject::QtQuick1Import: - return {viewer}; - case QmlProject::QtQuick2Import: - return {scene}; - case QmlProject::UnknownImport: - default: - return {scene, viewer}; - } - } - return {viewer}; + return (version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0)) + ? QList<QString>({QML_SCENE_SUFFIX}) : QList<QString>(); } QString QmlProjectRunConfigurationFactory::displayNameForBuildTarget(const QString &buildTarget) const { - if (buildTarget == QML_VIEWER_SUFFIX) - return tr("QML Viewer"); - if (buildTarget == QML_SCENE_SUFFIX) - return tr("QML Scene"); - return QString(); + QTC_ASSERT(buildTarget == QML_SCENE_SUFFIX, return QString()); + return tr("QML Scene"); } bool QmlProjectRunConfigurationFactory::canCreateHelper(ProjectExplorer::Target *parent, const QString &buildTarget) const { - if (buildTarget == QML_VIEWER_SUFFIX) - return true; + QTC_ASSERT(buildTarget == QML_SCENE_SUFFIX, return false); - if (buildTarget == QML_SCENE_SUFFIX) { - // only support qmlscene if it's Qt5 - QtSupport::BaseQtVersion *version - = QtSupport::QtKitInformation::qtVersion(parent->kit()); - return version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0); - } - return false; + const QtSupport::BaseQtVersion *version + = QtSupport::QtKitInformation::qtVersion(parent->kit()); + return version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0); } } // namespace Internal |