Commit 9cb5176c authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

Features: adding features for Qt Quick versions (1 1.1 and 2)



This allows wizards to distinguish between different Qt Quick versions.

Change-Id: Ieead5ba771da896a6a3ce0d60b563827878902a5
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent bd438d1c
...@@ -261,8 +261,16 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const ...@@ -261,8 +261,16 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const
| Core::FeatureSet(QtSupport::Constants::FEATURE_QT_WEBKIT) | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_WEBKIT)
| Core::FeatureSet(QtSupport::Constants::FEATURE_QT_CONSOLE); | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_CONSOLE);
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0)) if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0)) {
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK); features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK);
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1);
}
if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 1)) {
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1_1);
}
if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0)) {
features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_2);
}
return features; return features;
} }
......
...@@ -51,6 +51,9 @@ const char WINCEQT[] = "Qt4ProjectManager.QtVersion.WinCE"; ...@@ -51,6 +51,9 @@ const char WINCEQT[] = "Qt4ProjectManager.QtVersion.WinCE";
const char FEATURE_QT[] = "QtSupport.Wizards.FeatureQt"; const char FEATURE_QT[] = "QtSupport.Wizards.FeatureQt";
const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets"; const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets";
const char FEATURE_QT_QUICK[] = "QtSupport.Wizards.FeatureQtQuick"; const char FEATURE_QT_QUICK[] = "QtSupport.Wizards.FeatureQtQuick";
const char FEATURE_QT_QUICK_1[] = "QtSupport.Wizards.FeatureQtQuick.1";
const char FEATURE_QT_QUICK_1_1[] = "QtSupport.Wizards.FeatureQtQuick.1.1";
const char FEATURE_QT_QUICK_2[] = "QtSupport.Wizards.FeatureQtQuick.2";
const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit";
const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole";
const char FEATURE_GENERIC_CPP_ENTRY_POINT[] ="QtSupport.Wizards.FeatureGenericCppEntryPoint"; const char FEATURE_GENERIC_CPP_ENTRY_POINT[] ="QtSupport.Wizards.FeatureGenericCppEntryPoint";
......
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