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

Qt Quick Designer: Support "import QtQuick 2.6"

Browse Source 
2.5 was the maximum, till now. Qt 5.6 comes with QtQuick 2.6.

Change-Id: I110399539992423684ecd270e172cc3605123683
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-01-05 14:28:57 +01:00
committed by Thomas Hartmann
parent a9ffcbcf89
commit e8181da0e2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -65,10 +65,12 @@ static inline bool isSupportedAttachedProperties(const QString &propertyName)
static inline QStringList supportedVersionsList() static inline QStringList supportedVersionsList()
{ {
QStringList list; static const QStringList list = {
list << QStringLiteral("2.0") << QStringLiteral("2.1") QStringLiteral("2.0"), QStringLiteral("2.1"),
<< QStringLiteral("2.2") << QStringLiteral("2.3") QStringLiteral("2.2"), QStringLiteral("2.3"),
<< QStringLiteral("2.4") << QStringLiteral("2.5"); QStringLiteral("2.4"), QStringLiteral("2.5"),
QStringLiteral("2.6")
};
return list; return list;
} }