From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 1 Apr 2011 14:49:57 +0000 (+0200)
Subject: QmlDesigner.statesEditor: do not add redundant imports
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=268265bde1bb68ab2b77af71405895f4c603dc16;p=qt-creator-jp%2Fqt-creator-jp.git

QmlDesigner.statesEditor: do not add redundant imports

Do not add QtQuick 1.0 import if we already have a QtQuick 1.1
import.

Reviewed-by: Kai Koehne
---

diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 161013a385..e03778e5fd 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -140,7 +140,9 @@ void StatesEditorView::addState()
     }
 
     try {
-        if (rootStateGroup().allStates().count() < 1)
+        if ((rootStateGroup().allStates().count() < 1) && //QtQuick import might be missing
+            (!model()->imports().contains(Import::createLibraryImport("QtQuick", "1.0")) &&
+             !model()->imports().contains(Import::createLibraryImport("QtQuick", "1.1"))))
             model()->changeImports(QList<Import>() << Import::createLibraryImport("QtQuick", "1.0"), QList<Import>());
         ModelNode newState = rootStateGroup().addState(newStateName);
         setCurrentState(newState);