QmlDesigner.Plugin: Add experimental desktop components

Change-Id: Id43c494eb50650cb21f1f89d4f14bb3b3c9230a4
Reviewed-on: http://codereview.qt.nokia.com/575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

diff --git a/src/plugins/qmldesigner/desktopplugin/desktop.metainfo b/src/plugins/qmldesigner/desktopplugin/desktop.metainfo
new file mode 100644 (file)
index 0000000..51be4f3
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/desktop.metainfo
@@ -0,0 +1,148 @@
+<metainfo>
+  <node name="QtDesktop.Button" icon=":/desktopplugin/images/button16.png">
+    <itemlibraryentry name="Button"  category="Components Desktop" libraryIcon=":/desktopplugin/images/button.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="Button"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ComboBox" icon=":/desktopplugin/images/button16.png">
+    <itemlibraryentry name="ComboBox"  category="Components Desktop" libraryIcon=":/desktopplugin/images/button.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ToolButton" icon=":/desktopplugin/images/button16.png">
+    <itemlibraryentry name="ToolButton"  category="Components Desktop" libraryIcon=":/desktopplugin/images/button.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="Button"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.CheckBox" icon=":/desktopplugin/images/checkbox16.png">
+    <itemlibraryentry name="CheckBox" category="Components Desktop" libraryIcon=":/desktopplugin/images/checkbox.png"  version="0.1" requiredImport="QtDesktop">
+      <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="QtDesktop.ChoiceList" icon=":/desktopplugin/images/choicelist16.png">
+    <itemlibraryentry name="ChoiceList" category="Components Desktop" libraryIcon=":/desktopplugin/images/choicelist.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="40"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ProgressBar" icon=":/desktopplugin/images/progressbar16.png">
+    <itemlibraryentry name="ProgressBar"  category="Components Desktop" libraryIcon=":/desktopplugin/images/progressbar.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.SpinBox">
+    <itemlibraryentry name="SpinBox"  category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="30"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.Dial">
+    <itemlibraryentry name="Dial"  category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="100"/>
+      <property name="height" type="int" value="100"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.SplitterRow">
+    <itemlibraryentry name="SplitterRow"  category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="200"/>
+      <property name="height" type="int" value="200"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.RadioButton" icon=":/desktopplugin/images/radiobutton16.png">
+    <itemlibraryentry name="RadioButton" category="Components Desktop" libraryIcon=":/desktopplugin/images/radiobutton.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="30"/>
+      <property name="text" type="QString" value="RadioButton"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.TextArea" icon=":/desktopplugin/images/textarea16.png">
+    <itemlibraryentry name="TextArea" category="Components Desktop" libraryIcon=":/desktopplugin/images/textarea.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="180"/>
+      <property name="text" type="QString" value="TextArea"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ButtonRow" icon=":/desktopplugin/images/buttonrow16.png">
+    <itemlibraryentry name="ButtonRow" category="Components Desktop" libraryIcon=":/desktopplugin/images/buttonrow.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="120"/>
+      <property name="height" type="int" value="20"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.TabBar" icon=":/desktopplugin/images/tabbar16.png">
+    <itemlibraryentry name="TabBar" category="Components Desktop" libraryIcon=":/desktopplugin/images/tabbar.png"  version="0.1" requiredImport="QtDesktop">
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.Slider" icon=":/desktopplugin/images/slider16.png">
+    <itemlibraryentry name="Slider (horizontal)" category="Components Desktop" libraryIcon=":/desktopplugin/images/slider.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="30"/>
+      <property name="orientation" type="int" value="1"/>
+    </itemlibraryentry>
+    <itemlibraryentry name="Slider (vertical)" category="Components Desktop" libraryIcon=":/desktopplugin/images/sliderh.png" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="30"/>
+      <property name="height" type="int" value="180"/>
+      <property name="orientation" type="int" value="2"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ScrollBar">
+    <itemlibraryentry name="ScrollBar (horizontal)" category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="30"/>
+      <property name="orientation" type="int" value="1"/>
+    </itemlibraryentry>
+    <itemlibraryentry name="ScrollBar (vertical)" category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="30"/>
+      <property name="height" type="int" value="180"/>
+      <property name="orientation" type="int" value="2"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.TabFrame" icon=":/desktopplugin//images/window16.png">
+    <itemlibraryentry name="TabGroup" category="Components Desktop" libraryIcon=":/desktopplugin/images/window.png" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="360"/>
+      <property name="height" type="int" value="40"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ScrollArea">
+    <itemlibraryentry name="ScrollArea" category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="300"/>
+      <property name="height" type="int" value="300"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.GroupBox">
+    <itemlibraryentry name="GroupBox" category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="300"/>
+      <property name="height" type="int" value="300"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.Frame">
+    <itemlibraryentry name="Frame" category="Components Desktop" version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="300"/>
+      <property name="height" type="int" value="300"/>
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.ToolBar" icon=":/desktopplugin/images/toolbar16.png">
+    <itemlibraryentry name="ToolBar" category="Components Desktop" libraryIcon=":/desktopplugin/images/toolbar.png" version="0.1" requiredImport="QtDesktop">
+    <property name="width" type="int" value="300"/>
+    <property name="height" type="int" value="50"/>
+   </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.Switch" icon=":/desktopplugin/images/switchbutton16.png">
+    <itemlibraryentry name="Switch" category="Components Desktop" libraryIcon=":/desktopplugin/images/switchbutton.png" version="0.1" requiredImport="QtDesktop">
+    </itemlibraryentry>
+  </node>
+  <node name="QtDesktop.TextField" icon=":/desktopplugin/images/textfield16.png">
+    <itemlibraryentry name="TextField" category="Components Desktop" libraryIcon=":/desktopplugin/images/textfield.png"  version="0.1" requiredImport="QtDesktop">
+      <property name="width" type="int" value="180"/>
+      <property name="height" type="int" value="50"/>
+      <property name="text" type="QString" value="TextField"/>
+    </itemlibraryentry>
+  </node>
+</metainfo>

diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp
new file mode 100644 (file)
index 0000000..9d90a5e
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp
@@ -0,0 +1,57 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#include "desktopplugin.h"
+#include <widgetplugin_helper.h>
+#include <QtCore/QtPlugin>
+
+namespace QmlDesigner {
+
+
+DesktopPlugin::DesktopPlugin()
+{
+}
+
+QString DesktopPlugin::pluginName()
+{
+    return ("DesktopPlugin");
+}
+
+QString DesktopPlugin::metaInfo()
+{
+    return QString(":/desktopplugin/desktop.metainfo");
+}
+
+}
+
+Q_EXPORT_PLUGIN(QmlDesigner::DesktopPlugin)
+

diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
new file mode 100644 (file)
index 0000000..a859417
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
@@ -0,0 +1,61 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef DESKTOPPLUGIN_H
+#define DESKTOPPLUGIN_H
+
+#include <iwidgetplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+
+QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
+
+namespace QmlDesigner {
+
+class DesktopPlugin : public QObject, QmlDesigner::IWidgetPlugin
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(DesktopPlugin)
+    Q_INTERFACES(QmlDesigner::IWidgetPlugin)
+public:
+    DesktopPlugin();
+    ~DesktopPlugin() {}
+
+    QString metaInfo();
+    QString pluginName();
+
+};
+
+} // namespace QmlDesigner
+
+
+#endif // DESKTOPPLUGIN_H

diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
new file mode 100644 (file)
index 0000000..3022729
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
@@ -0,0 +1,17 @@
+TARGET = desktopplugin
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += script \
+      declarative
+
+include (../designercore/iwidgetplugin.pri)
+
+DEFINES += SYMBIAN_LIBRARY
+SOURCES += $$PWD/desktopplugin.cpp
+
+HEADERS += $$PWD/desktopplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
+
+RESOURCES += $$PWD/desktopplugin.qrc
+
+OTHER_FILES += $$PWD/desktop.metainfo

diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pro b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pro
new file mode 100644 (file)
index 0000000..a8e2654
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pro
@@ -0,0 +1,4 @@
+include(../../../../qtcreator.pri)
+include(../../../private_headers.pri)
+include(desktopplugin.pri)
+include(plugindestdir.pri)

diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.qrc b/src/plugins/qmldesigner/desktopplugin/desktopplugin.qrc
new file mode 100644 (file)
index 0000000..14fd581
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.qrc
@@ -0,0 +1,41 @@
+<RCC>
+    <qresource prefix="/desktopplugin">
+        <file>desktop.metainfo</file>
+        <file>images/item-icon16.png</file>
+        <file>images/item-icon.png</file>
+        <file>images/button.png</file>
+        <file>images/button16.png</file>
+        <file>images/checkbox16.png</file>
+        <file>images/checkbox.png</file>
+        <file>images/choicelist16.png</file>
+        <file>images/choicelist.png</file>
+        <file>images/progressbar.png</file>
+        <file>images/progressbar16.png</file>
+        <file>images/radiobutton.png</file>
+        <file>images/radiobutton16.png</file>
+        <file>images/slider.png</file>
+        <file>images/slider16.png</file>
+        <file>images/textarea16.png</file>
+        <file>images/textarea.png</file>
+        <file>images/textfield16.png</file>
+        <file>images/textfield.png</file>
+        <file>images/window16.png</file>
+        <file>images/window.png</file>
+        <file>images/tabbutton16.png</file>
+        <file>images/tabbutton.png</file>
+        <file>images/busyindicator16.png</file>
+        <file>images/busyindicator.png</file>
+        <file>images/sliderh16.png</file>
+        <file>images/sliderh.png</file>
+        <file>images/switchbutton16.png</file>
+        <file>images/switchbutton.png</file>
+        <file>images/buttonrow.png</file>
+        <file>images/buttonrow16.png</file>
+        <file>images/tabbar.png</file>
+        <file>images/tabbar16.png</file>
+        <file>images/toolbar.png</file>
+        <file>images/toolbar16.png</file>
+        <file>images/buttoncolumn.png</file>
+        <file>images/buttoncolumn16.png</file>
+    </qresource>
+</RCC>

diff --git a/src/plugins/qmldesigner/desktopplugin/images/Untitled-2.png b/src/plugins/qmldesigner/desktopplugin/images/Untitled-2.png
new file mode 100644 (file)
index 0000000..2e0bf73
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/Untitled-2.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/busyindicator.png b/src/plugins/qmldesigner/desktopplugin/images/busyindicator.png
new file mode 100644 (file)
index 0000000..89d0283
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/busyindicator.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/busyindicator16.png b/src/plugins/qmldesigner/desktopplugin/images/busyindicator16.png
new file mode 100644 (file)
index 0000000..7e3b2d3
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/busyindicator16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/busyindicatora.png b/src/plugins/qmldesigner/desktopplugin/images/busyindicatora.png
new file mode 100644 (file)
index 0000000..433f4d4
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/busyindicatora.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/busyindicatora16.png b/src/plugins/qmldesigner/desktopplugin/images/busyindicatora16.png
new file mode 100644 (file)
index 0000000..82de5b0
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/busyindicatora16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/button.png b/src/plugins/qmldesigner/desktopplugin/images/button.png
new file mode 100644 (file)
index 0000000..828af21
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/button.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/button16.png b/src/plugins/qmldesigner/desktopplugin/images/button16.png
new file mode 100644 (file)
index 0000000..8d95760
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/button16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/buttoncolumn.png b/src/plugins/qmldesigner/desktopplugin/images/buttoncolumn.png
new file mode 100644 (file)
index 0000000..46db8f6
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/buttoncolumn.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/buttoncolumn16.png b/src/plugins/qmldesigner/desktopplugin/images/buttoncolumn16.png
new file mode 100644 (file)
index 0000000..8832580
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/buttoncolumn16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/buttonrow.png b/src/plugins/qmldesigner/desktopplugin/images/buttonrow.png
new file mode 100644 (file)
index 0000000..9727749
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/buttonrow.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/buttonrow16.png b/src/plugins/qmldesigner/desktopplugin/images/buttonrow16.png
new file mode 100644 (file)
index 0000000..420de41
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/buttonrow16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/checkbox.png b/src/plugins/qmldesigner/desktopplugin/images/checkbox.png
new file mode 100644 (file)
index 0000000..0f4a826
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/checkbox.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/checkbox16.png b/src/plugins/qmldesigner/desktopplugin/images/checkbox16.png
new file mode 100644 (file)
index 0000000..01f09e3
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/checkbox16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/choicelist.png b/src/plugins/qmldesigner/desktopplugin/images/choicelist.png
new file mode 100644 (file)
index 0000000..3fd9876
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/choicelist.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/choicelist16.png b/src/plugins/qmldesigner/desktopplugin/images/choicelist16.png
new file mode 100644 (file)
index 0000000..602b282
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/choicelist16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/item-icon.png b/src/plugins/qmldesigner/desktopplugin/images/item-icon.png
new file mode 100644 (file)
index 0000000..fc53d38
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/item-icon.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/item-icon16.png b/src/plugins/qmldesigner/desktopplugin/images/item-icon16.png
new file mode 100644 (file)
index 0000000..7d2d7a5
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/item-icon16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/progressbar.png b/src/plugins/qmldesigner/desktopplugin/images/progressbar.png
new file mode 100644 (file)
index 0000000..040f5ba
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/progressbar.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/progressbar16.png b/src/plugins/qmldesigner/desktopplugin/images/progressbar16.png
new file mode 100644 (file)
index 0000000..e243247
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/progressbar16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/radiobutton.png b/src/plugins/qmldesigner/desktopplugin/images/radiobutton.png
new file mode 100644 (file)
index 0000000..143b6a9
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/radiobutton.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/radiobutton16.png b/src/plugins/qmldesigner/desktopplugin/images/radiobutton16.png
new file mode 100644 (file)
index 0000000..94912c2
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/radiobutton16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/slider.png b/src/plugins/qmldesigner/desktopplugin/images/slider.png
new file mode 100644 (file)
index 0000000..746ed51
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/slider.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/slider16.png b/src/plugins/qmldesigner/desktopplugin/images/slider16.png
new file mode 100644 (file)
index 0000000..10c4928
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/slider16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/sliderh.png b/src/plugins/qmldesigner/desktopplugin/images/sliderh.png
new file mode 100644 (file)
index 0000000..87cd556
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/sliderh.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/sliderh16.png b/src/plugins/qmldesigner/desktopplugin/images/sliderh16.png
new file mode 100644 (file)
index 0000000..c419911
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/sliderh16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/switchbutton.png b/src/plugins/qmldesigner/desktopplugin/images/switchbutton.png
new file mode 100644 (file)
index 0000000..48bf247
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/switchbutton.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/switchbutton16.png b/src/plugins/qmldesigner/desktopplugin/images/switchbutton16.png
new file mode 100644 (file)
index 0000000..238a1be
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/switchbutton16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/tabbar.png b/src/plugins/qmldesigner/desktopplugin/images/tabbar.png
new file mode 100644 (file)
index 0000000..2f44e62
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/tabbar.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/tabbar16.png b/src/plugins/qmldesigner/desktopplugin/images/tabbar16.png
new file mode 100644 (file)
index 0000000..57c7906
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/tabbar16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/tabbutton.png b/src/plugins/qmldesigner/desktopplugin/images/tabbutton.png
new file mode 100644 (file)
index 0000000..d9f5fdb
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/tabbutton.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/tabbutton16.png b/src/plugins/qmldesigner/desktopplugin/images/tabbutton16.png
new file mode 100644 (file)
index 0000000..8e279cf
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/tabbutton16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/textarea.png b/src/plugins/qmldesigner/desktopplugin/images/textarea.png
new file mode 100644 (file)
index 0000000..86f2969
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/textarea.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/textarea16.png b/src/plugins/qmldesigner/desktopplugin/images/textarea16.png
new file mode 100644 (file)
index 0000000..899a4bc
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/textarea16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/textfield.png b/src/plugins/qmldesigner/desktopplugin/images/textfield.png
new file mode 100644 (file)
index 0000000..b0f13da
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/textfield.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/textfield16.png b/src/plugins/qmldesigner/desktopplugin/images/textfield16.png
new file mode 100644 (file)
index 0000000..7feb8c7
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/textfield16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/toolbar.png b/src/plugins/qmldesigner/desktopplugin/images/toolbar.png
new file mode 100644 (file)
index 0000000..e67c042
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/toolbar.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/toolbar16.png b/src/plugins/qmldesigner/desktopplugin/images/toolbar16.png
new file mode 100644 (file)
index 0000000..f4a0c5e
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/toolbar16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/window.png b/src/plugins/qmldesigner/desktopplugin/images/window.png
new file mode 100644 (file)
index 0000000..fc53d38
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/window.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/images/window16.png b/src/plugins/qmldesigner/desktopplugin/images/window16.png
new file mode 100644 (file)
index 0000000..7d2d7a5
Binary files /dev/null and b/src/plugins/qmldesigner/desktopplugin/images/window16.png differ

diff --git a/src/plugins/qmldesigner/desktopplugin/plugindestdir.pri b/src/plugins/qmldesigner/desktopplugin/plugindestdir.pri
new file mode 100644 (file)
index 0000000..24f0c19
--- /dev/null
+++ b/src/plugins/qmldesigner/desktopplugin/plugindestdir.pri
@@ -0,0 +1,5 @@
+macx {
+  DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
+} else {
+  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
+}

diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro
index bab7341..628f60c 100644 (file)
--- a/src/plugins/qmldesigner/qmldesigner.pro
+++ b/src/plugins/qmldesigner/qmldesigner.pro
@@ -1,3 +1,3 @@
 TEMPLATE  = subdirs
 
-SUBDIRS   = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin extrasplugin
+SUBDIRS   = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin extrasplugin desktopplugin