summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2018-09-13 13:48:36 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2018-09-13 13:38:09 +0000
commit70fdbedbd8a8a4e00ef4e9ad282063115921a752 (patch)
treec2f4b5bd786dc7062e9d2a0b138fd0809c6c3dd1 /src/plugins/qmldesigner
parent4b852b4e04574e9d6780ff041163af2427c2a350 (diff)
downloadqt-creator-70fdbedbd8a8a4e00ef4e9ad282063115921a752.tar.gz
Qml tooling: Support Qt 5.12
QtQuick 2.12 QtQuick.Controls 2.5 QtQuick.Window 2.12 QtQuick.VirtualKeyboard 2.4 Change-Id: Ie4a60ac93b25ca735e28ac84447cfe60778f8d7d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner')
-rw-r--r--src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index df9fbb0b94..c168eed504 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -76,7 +76,7 @@ bool isSupportedAttachedProperties(const QString &propertyName)
QStringList supportedVersionsList()
{
static const QStringList list = {
- "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11"
+ "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.9", "2.10", "2.11", "2.12"
};
return list;
}