aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-05-21 11:22:32 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-05-22 17:42:46 +0200
commit1c6a3b9dbfab31eb36838da9bba609fe469d27e6 (patch)
treecdb3c3b9296d254afac9dcced5a160786f8c4613
parentb9ff6e65cf16684b3c9a573d7cce77efca019cab (diff)
QmlDesigner: Check for QtQuick 2.1 in states editor
Task-number: QTCREATORBUG-9298 Change-Id: I8660e7d9614e77d23e1ef6515904941505f410dd Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
-rw-r--r--src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 58f52e9d8d..3409f7bb39 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -135,7 +135,8 @@ void StatesEditorView::addState()
if ((rootStateGroup().allStates().count() < 1) && //QtQuick import might be missing
(!model()->hasImport(Import::createLibraryImport("QtQuick", "1.0"), true)
&& !model()->hasImport(Import::createLibraryImport("QtQuick", "1.1"), true)
- && !model()->hasImport(Import::createLibraryImport("QtQuick", "2.0"), true)))
+ && !model()->hasImport(Import::createLibraryImport("QtQuick", "2.0"), true)
+ && !model()->hasImport(Import::createLibraryImport("QtQuick", "2.1"), true)))
model()->changeImports(QList<Import>() << Import::createLibraryImport("QtQuick", "1.0"), QList<Import>());
ModelNode newState = rootStateGroup().addState(newStateName);
setCurrentState(newState);