From e8181da0e28ace8e0e84d965376e071b5a97f8f2 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 5 Jan 2016 14:28:57 +0100 Subject: [PATCH] Qt Quick Designer: Support "import QtQuick 2.6" 2.5 was the maximum, till now. Qt 5.6 comes with QtQuick 2.6. Change-Id: I110399539992423684ecd270e172cc3605123683 Reviewed-by: Thomas Hartmann --- .../designercore/model/texttomodelmerger.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index ac5925d8a3a..7a2580f9e3d 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -65,10 +65,12 @@ static inline bool isSupportedAttachedProperties(const QString &propertyName) static inline QStringList supportedVersionsList() { - QStringList list; - list << QStringLiteral("2.0") << QStringLiteral("2.1") - << QStringLiteral("2.2") << QStringLiteral("2.3") - << QStringLiteral("2.4") << QStringLiteral("2.5"); + static const QStringList list = { + QStringLiteral("2.0"), QStringLiteral("2.1"), + QStringLiteral("2.2"), QStringLiteral("2.3"), + QStringLiteral("2.4"), QStringLiteral("2.5"), + QStringLiteral("2.6") + }; return list; }