feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.itemLibrary: Use com.nokia.meego for Meego/Harmattan components

Browse Source 
Also fixing the documentation.

Change-Id: Ib40f7cea0be7f800b40272c4aed0babfc53ae433
Reviewed-on: http://codereview.qt.nokia.com/3301
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Thomas Hartmann
2011-08-22 11:43:03 +02:00
parent 2cbc2366a2
commit 54fd48d48a
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/qtcreator.qdoc
View File

@@ -1303,7 +1303,7 @@
\o \c {import com.nokia.symbian 1.0} for Symbian \o \c {import com.nokia.symbian 1.0} for Symbian
\o \c {import com.meego 1.0} for MeeGo \o \c {import com.nokia.meego 1.0} for MeeGo
\endlist \endlist

8
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -270,7 +270,7 @@ void ItemLibraryWidget::updateImports()
imports << import.url(); imports << import.url();
if (imports.contains("com.nokia.symbian", Qt::CaseInsensitive)) if (imports.contains("com.nokia.symbian", Qt::CaseInsensitive))
filter = Symbian; filter = Symbian;
if (imports.contains("com.Meego", Qt::CaseInsensitive)) if (imports.contains("com.nokia.meego", Qt::CaseInsensitive))
filter = Meego; filter = Meego;
} }
@@ -398,14 +398,14 @@ void ItemLibraryWidget::setImportFilter(FilterChangeFlag flag)
try { try {
block = true; block = true;
if (flag == QtBasic) { if (flag == QtBasic) {
removeImport(QLatin1String("com.meego")); removeImport(QLatin1String("com.nokia.meego"));
removeImport(QLatin1String("com.nokia.symbian")); removeImport(QLatin1String("com.nokia.symbian"));
} else if (flag == Symbian) { } else if (flag == Symbian) {
removeImport(QLatin1String("com.meego")); removeImport(QLatin1String("com.nokia.meego"));
addImport(QLatin1String("com.nokia.symbian"), QLatin1String("1.0")); addImport(QLatin1String("com.nokia.symbian"), QLatin1String("1.0"));
} else if (flag == Meego) { } else if (flag == Meego) {
removeImport(QLatin1String("com.nokia.symbian")); removeImport(QLatin1String("com.nokia.symbian"));
addImport(QLatin1String("com.meego"), QLatin1String("1.0")); addImport(QLatin1String("com.nokia.meego"), QLatin1String("1.0"));
} }
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
block = false; block = false;

88
src/plugins/qmldesigner/meegoplugin/meego.metainfo
View File

@@ -1,108 +1,108 @@
<metainfo> <metainfo>
<node name="com.meego.Label" icon=":/meegoplugin/images/label16.png"> <node name="com.nokia.meego.Label" icon=":/meegoplugin/images/label16.png">
<itemlibraryentry name="Label" category="Components MeeGo" libraryIcon=":/meegoplugin/images/label.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Label" category="Components MeeGo" libraryIcon=":/meegoplugin/images/label.png" version="1.0" requiredImport="com.nokia.meego">
<property name="text" type="QString" value="Label"/> <property name="text" type="QString" value="Label"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.BusyIndicator" icon=":/meegoplugin/images/busyindicator16.png"> <node name="com.nokia.meego.BusyIndicator" icon=":/meegoplugin/images/busyindicator16.png">
<itemlibraryentry name="BusyIndicator" category="Components MeeGo" libraryIcon=":/meegoplugin/images/busyindicator.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="BusyIndicator" category="Components MeeGo" libraryIcon=":/meegoplugin/images/busyindicator.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="180"/> <property name="width" type="int" value="180"/>
<property name="height" type="int" value="30"/> <property name="height" type="int" value="30"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Button" icon=":/meegoplugin/images/button16.png"> <node name="com.nokia.meego.Button" icon=":/meegoplugin/images/button16.png">
<itemlibraryentry name="Button" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Button" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ToolButton" icon=":/meegoplugin/images/button16.png"> <node name="com.nokia.meego.ToolButton" icon=":/meegoplugin/images/button16.png">
<itemlibraryentry name="ToolButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="ToolButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.TabButton" icon=":/meegoplugin/images/tabbutton16.png"> <node name="com.nokia.meego.TabButton" icon=":/meegoplugin/images/tabbutton16.png">
<itemlibraryentry name="TabButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/tabbutton.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="TabButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/tabbutton.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.SheetButton" icon=":/meegoplugin/images/button16.png"> <node name="com.nokia.meego.SheetButton" icon=":/meegoplugin/images/button16.png">
<itemlibraryentry name="SheetButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="SheetButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/button.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Slider" icon=":/meegoplugin/images/slider16.png"> <node name="com.nokia.meego.Slider" icon=":/meegoplugin/images/slider16.png">
<itemlibraryentry name="Slider" category="Components MeeGo" libraryIcon=":/meegoplugin/images/slider.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Slider" category="Components MeeGo" libraryIcon=":/meegoplugin/images/slider.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.CheckBox" icon=":/meegoplugin/images/checkbox16.png"> <node name="com.nokia.meego.CheckBox" icon=":/meegoplugin/images/checkbox16.png">
<itemlibraryentry name="CheckBox" category="Components MeeGo" libraryIcon=":/meegoplugin/images/checkbox.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="CheckBox" category="Components MeeGo" libraryIcon=":/meegoplugin/images/checkbox.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.RadioButton" icon=":/meegoplugin/images/radiobutton16.png"> <node name="com.nokia.meego.RadioButton" icon=":/meegoplugin/images/radiobutton16.png">
<itemlibraryentry name="RadioButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/radiobutton.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="RadioButton" category="Components MeeGo" libraryIcon=":/meegoplugin/images/radiobutton.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Spinner" icon=":/meegoplugin/images/item-icon16.png"> <node name="com.nokia.meego.Spinner" icon=":/meegoplugin/images/item-icon16.png">
<itemlibraryentry name="Spinner" category="Components MeeGo" libraryIcon=":/meegoplugin/images/item-icon.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Spinner" category="Components MeeGo" libraryIcon=":/meegoplugin/images/item-icon.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.TextField" icon=":/meegoplugin/images/textfield16.png"> <node name="com.nokia.meego.TextField" icon=":/meegoplugin/images/textfield16.png">
<itemlibraryentry name="TextField" category="Components MeeGo" libraryIcon=":/meegoplugin/images/textfield.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="TextField" category="Components MeeGo" libraryIcon=":/meegoplugin/images/textfield.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ProgressBar" icon=":/meegoplugin/images/progressbar16.png"> <node name="com.nokia.meego.ProgressBar" icon=":/meegoplugin/images/progressbar16.png">
<itemlibraryentry name="ProgressBar" category="Components MeeGo" libraryIcon=":/meegoplugin/images/progressbar.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="ProgressBar" category="Components MeeGo" libraryIcon=":/meegoplugin/images/progressbar.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Switch" icon=":/meegoplugin/images/switchbutton16.png"> <node name="com.nokia.meego.Switch" icon=":/meegoplugin/images/switchbutton16.png">
<itemlibraryentry name="Switch" category="Components MeeGo" libraryIcon=":/meegoplugin/images/switchbutton.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Switch" category="Components MeeGo" libraryIcon=":/meegoplugin/images/switchbutton.png" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ToolItem"> <node name="com.nokia.meego.ToolItem">
<itemlibraryentry name="ToolItem" category="Components MeeGo" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="ToolItem" category="Components MeeGo" version="1.0" requiredImport="com.nokia.meego">
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.TextArea" icon=":/meegoplugin/images/textarea16.png"> <node name="com.nokia.meego.TextArea" icon=":/meegoplugin/images/textarea16.png">
<itemlibraryentry name="TextArea" category="Components MeeGo" libraryIcon=":/meegoplugin/images/textarea.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="TextArea" category="Components MeeGo" libraryIcon=":/meegoplugin/images/textarea.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="100"/> <property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/> <property name="height" type="int" value="100"/>
<property name="text" type="QString" value="TextArea"/> <property name="text" type="QString" value="TextArea"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Window" icon=":/meegoplugin/images/window16.png"> <node name="com.nokia.meego.Window" icon=":/meegoplugin/images/window16.png">
<itemlibraryentry name="Window" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Window" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="360"/> <property name="width" type="int" value="360"/>
<property name="height" type="int" value="640"/> <property name="height" type="int" value="640"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Page" icon=":/meegoplugin/images/window16.png"> <node name="com.nokia.meego.Page" icon=":/meegoplugin/images/window16.png">
<itemlibraryentry name="Page" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Page" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="360"/> <property name="width" type="int" value="360"/>
<property name="height" type="int" value="640"/> <property name="height" type="int" value="640"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.Sheet" icon=":/meegoplugin/images/window16.png"> <node name="com.nokia.meego.Sheet" icon=":/meegoplugin/images/window16.png">
<itemlibraryentry name="Sheet" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="Sheet" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="360"/> <property name="width" type="int" value="360"/>
<property name="height" type="int" value="640"/> <property name="height" type="int" value="640"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ToolBar" icon=":/meegoplugin/images/toolbar16.png"> <node name="com.nokia.meego.ToolBar" icon=":/meegoplugin/images/toolbar16.png">
<itemlibraryentry name="ToolBar" category="Components MeeGo" libraryIcon=":/meegoplugin/images/toolbar.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="ToolBar" category="Components MeeGo" libraryIcon=":/meegoplugin/images/toolbar.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="360"/> <property name="width" type="int" value="360"/>
<property name="height" type="int" value="140"/> <property name="height" type="int" value="140"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ButtonColumn" icon=":/meegoplugin/images/buttoncolumn16.png"> <node name="com.nokia.meego.ButtonColumn" icon=":/meegoplugin/images/buttoncolumn16.png">
<itemlibraryentry name="ButtonColumn" category="Components MeeGo" libraryIcon=":/meegoplugin/images/buttoncolumn.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name="ButtonColumn" category="Components MeeGo" libraryIcon=":/meegoplugin/images/buttoncolumn.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="100"/> <property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/> <property name="height" type="int" value="100"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ButtonRow" icon=":/meegoplugin/images/buttonrow16.png"> <node name="com.nokia.meego.ButtonRow" icon=":/meegoplugin/images/buttonrow16.png">
<itemlibraryentry name=" ButtonRow" category="Components MeeGo" libraryIcon=":/meegoplugin/images/buttonrow.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name=" ButtonRow" category="Components MeeGo" libraryIcon=":/meegoplugin/images/buttonrow.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="100"/> <property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/> <property name="height" type="int" value="100"/>
</itemlibraryentry> </itemlibraryentry>
</node> </node>
<node name="com.meego.ToolButtonRow" icon=":/meegoplugin/images/window16.png"> <node name="com.nokia.meego.ToolButtonRow" icon=":/meegoplugin/images/window16.png">
<itemlibraryentry name=" ToolButtonRow" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.meego"> <itemlibraryentry name=" ToolButtonRow" category="Components MeeGo" libraryIcon=":/meegoplugin/images/window.png" version="1.0" requiredImport="com.nokia.meego">
<property name="width" type="int" value="100"/> <property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/> <property name="height" type="int" value="100"/>
</itemlibraryentry> </itemlibraryentry>