QmlDesigner: Change Symbian import

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index d6266b4..d05e16b 100644 (file)
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -277,7 +277,7 @@ void ItemLibraryWidget::updateImports()
         foreach (const Import &import, m_d->model->imports())
             if (import.isLibraryImport())
                 imports << import.url();
-        if (imports.contains("Qt.labs.Symbian", Qt::CaseInsensitive))
+        if (imports.contains("com.nokia.symbian", Qt::CaseInsensitive))
             filter = Symbian;
         if (imports.contains("com.Meego", Qt::CaseInsensitive))
             filter = Meego;
@@ -373,18 +373,18 @@ void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag)
     block = true;
     if (flag == QtBasic) {
         removeImport(QLatin1String("com.meego"));
-        removeImport(QLatin1String("Qt.labs.Symbian"));
+        removeImport(QLatin1String("com.nokia.symbian"));
         emit qtBasicOnlyChecked(true);
         emit meegoChecked(false);
         emit symbianChecked(false);
     } else  if (flag == Symbian) {
         removeImport(QLatin1String("com.meego"));
-        addImport(QLatin1String("Qt.labs.Symbian"), QLatin1String("1.0"));
+        addImport(QLatin1String("com.nokia.symbian"), QLatin1String("1.0"));
         emit qtBasicOnlyChecked(false);
         emit meegoChecked(false);
         emit symbianChecked(true);
     }  else  if (flag == Meego) {
-        removeImport(QLatin1String("Qt.labs.Symbian"));
+        removeImport(QLatin1String("com.nokia.symbian"));
         addImport(QLatin1String("com.meego"), QLatin1String("1.0"));
         emit qtBasicOnlyChecked(false);
         emit meegoChecked(true);

diff --git a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
index dc2d8e4..73f2904 100644 (file)
--- a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
+++ b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo
@@ -1,13 +1,13 @@
 <metainfo>
   <node name="Label" icon=":/symbianplugin/images/label16.png">
-    <itemlibraryentry name="Label" category="Components Symbian" libraryIcon=":/symbianplugin/images/label.png"  version="1.0" requiredImport="Qt.labs.Symbian">
+    <itemlibraryentry name="Label" category="Components Symbian" libraryIcon=":/symbianplugin/images/label.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="30"/>
       <property name="text" type="QString" value="Label"/>
     </itemlibraryentry>
   </node>
   <node name="Button" icon=":/symbianplugin/images/button16.png">
-    <itemlibraryentry name="Button"  category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="Qt.labs.Symbian">
+    <itemlibraryentry name="Button"  category="Components Symbian" libraryIcon=":/symbianplugin/images/button.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="30"/>
       <property name="text" type="QString" value="Button"/>
@@ -16,14 +16,14 @@
   <node name="Slider" icon=":/symbianplugin/images/slider16.png">
   </node>
   <node name="CheckBox" icon=":/symbianplugin/images/checkbox16.png">
-    <itemlibraryentry name="CheckBox" category="Components Symbian" libraryIcon=":/symbianplugin/images/checkbox.png"  version="1.0" requiredImport="Qt.labs.Symbian">
+    <itemlibraryentry name="CheckBox" category="Components Symbian" libraryIcon=":/symbianplugin/images/checkbox.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="180"/>
       <property name="height" type="int" value="30"/>
       <property name="text" type="QString" value="CheckBox"/>
     </itemlibraryentry>
   </node>
   <node name="RadioButton" icon=":/symbianplugin/images/radiobutton16.png">
-    <itemlibraryentry name="RadioButton" category="Components Symbian" libraryIcon=":/symbianplugin/images/radiobutton.png"  version="1.0" requiredImport="Qt.labs.Symbian">
+    <itemlibraryentry name="RadioButton" category="Components Symbian" libraryIcon=":/symbianplugin/images/radiobutton.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="180"/>
       <property name="height" type="int" value="30"/>
       <property name="text" type="QString" value="RadioButton"/>
@@ -34,14 +34,14 @@
   <node name="Switch" icon=":/symbianplugin/images/item-icon16.png">
   </node>
   <node name="LineEdit" icon=":/symbianplugin/images/lineedit16.png">
-    <itemlibraryentry name="LineEdit"  category="Components Symbian" libraryIcon=":/symbianplugin/images/lineedit.png"  version="1.0" requiredImport="Qt.labs.Symbian">
+    <itemlibraryentry name="LineEdit"  category="Components Symbian" libraryIcon=":/symbianplugin/images/lineedit.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="30"/>
       <property name="text" type="QString" value="LineEdit"/>
     </itemlibraryentry>
   </node>
   <node name="ProgressBar" icon=":/symbianplugin/images/progressbar16.png">
-    <itemlibraryentry name="ProgressBar"  category="Components Symbian" libraryIcon=":/symbianplugin/images/progressbar.png"  version="1.0" requiredImport="Qt.labs.Symbian">
+    <itemlibraryentry name="ProgressBar"  category="Components Symbian" libraryIcon=":/symbianplugin/images/progressbar.png"  version="1.0" requiredImport="com.nokia.symbian">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="30"/>
     </itemlibraryentry>