From b1ed7a450536e0f43b9544c5d35f746cb2b6e69e Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 24 Sep 2010 12:08:52 +0200
Subject: [PATCH] QmlDesigner: renaming fxplugin to qtquickplugin
See: QTCREATORBUG-1466
---
src/plugins/qmldesigner/fxplugin/fxplugin.pri | 17 -----
src/plugins/qmldesigner/qmldesigner.pro | 2 +-
.../images/border-image-icon.png | Bin
.../images/border-image-icon16.png | Bin
.../images/default-icon.png | Bin
.../images/flickable-icon.png | Bin
.../images/flickable-icon16.png | Bin
.../images/flipable-icon.png | Bin
.../images/flipable-icon16.png | Bin
.../images/focusscope-icon.png | Bin
.../images/focusscope-icon16.png | Bin
.../images/gridview-icon.png | Bin
.../images/gridview-icon16.png | Bin
.../images/image-icon.png | Bin
.../images/image-icon16.png | Bin
.../images/item-icon.png | Bin
.../images/item-icon16.png | Bin
.../images/listview-icon.png | Bin
.../images/listview-icon16.png | Bin
.../images/mouse-area-icon.png | Bin
.../images/mouse-area-icon16.png | Bin
.../images/pathview-icon.png | Bin
.../images/pathview-icon16.png | Bin
.../images/rect-icon.png | Bin
.../images/rect-icon16.png | Bin
.../images/template_image.png | Bin
.../images/text-edit-icon.png | Bin
.../images/text-edit-icon16.png | Bin
.../images/text-icon.png | Bin
.../images/text-icon16.png | Bin
.../images/text-input-icon.png | Bin
.../images/text-input-icon16.png | Bin
.../images/webview-icon.png | Bin
.../images/webview-icon16.png | Bin
.../plugindestdir.pri | 0
.../qtquickplugin.cpp} | 14 ++--
.../qtquickplugin.h} | 14 ++--
.../qtquickplugin/qtquickplugin.pri | 17 +++++
.../qtquickplugin.pro} | 2 +-
.../qtquickplugin.qrc} | 4 +-
.../quick.metainfo} | 64 +++++++++---------
41 files changed, 67 insertions(+), 67 deletions(-)
delete mode 100644 src/plugins/qmldesigner/fxplugin/fxplugin.pri
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/border-image-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/border-image-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/default-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/flickable-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/flickable-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/flipable-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/flipable-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/focusscope-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/focusscope-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/gridview-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/gridview-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/image-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/image-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/item-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/item-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/listview-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/listview-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/mouse-area-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/mouse-area-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/pathview-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/pathview-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/rect-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/rect-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/template_image.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/text-edit-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/text-edit-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/text-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/text-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/text-input-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/text-input-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/webview-icon.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/images/webview-icon16.png (100%)
rename src/plugins/qmldesigner/{fxplugin => qtquickplugin}/plugindestdir.pri (100%)
rename src/plugins/qmldesigner/{fxplugin/fxplugin.cpp => qtquickplugin/qtquickplugin.cpp} (85%)
rename src/plugins/qmldesigner/{fxplugin/fxplugin.h => qtquickplugin/qtquickplugin.h} (87%)
create mode 100644 src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
rename src/plugins/qmldesigner/{fxplugin/fxplugin.pro => qtquickplugin/qtquickplugin.pro} (78%)
rename src/plugins/qmldesigner/{fxplugin/fxplugin.qrc => qtquickplugin/qtquickplugin.qrc} (95%)
rename src/plugins/qmldesigner/{fxplugin/fx.metainfo => qtquickplugin/quick.metainfo} (69%)
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.pri b/src/plugins/qmldesigner/fxplugin/fxplugin.pri
deleted file mode 100644
index 5d880bd6c5d..00000000000
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-TARGET = fxplugin
-TEMPLATE = lib
-CONFIG += plugin
-
-QT += script \
- declarative
-
-include (../designercore/iwidgetplugin.pri)
-
-DEFINES += FX_LIBRARY
-SOURCES += $$PWD/fxplugin.cpp
-
-HEADERS += $$PWD/fxplugin.h $$PWD/../designercore/include/iwidgetplugin.h
-
-RESOURCES += $$PWD/fxplugin.qrc
-
-OTHER_FILES += $$PWD/fx.metainfo
diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro
index 28abb28999a..9ce8190cc4d 100644
--- a/src/plugins/qmldesigner/qmldesigner.pro
+++ b/src/plugins/qmldesigner/qmldesigner.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS = qmldesignerplugin.pro fxplugin
+SUBDIRS = qmldesignerplugin.pro qtquickplugin
diff --git a/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/border-image-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/border-image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/border-image-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/default-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/default-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/default-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/default-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/flickable-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/flickable-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/flickable-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/flickable-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/flipable-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flipable-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/flipable-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/flipable-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/flipable-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/flipable-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/flipable-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/flipable-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/focusscope-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/focusscope-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/focusscope-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/focusscope-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/gridview-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/gridview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/gridview-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/image-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/image-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/image-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/item-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/item-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/item-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/item-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/item-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/listview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/listview-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/listview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/listview-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/mouse-area-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/mouse-area-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/mouse-area-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/mouse-area-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/pathview-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/pathview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/pathview-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/rect-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/rect-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/rect-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/rect-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/template_image.png b/src/plugins/qmldesigner/qtquickplugin/images/template_image.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/template_image.png
rename to src/plugins/qmldesigner/qtquickplugin/images/template_image.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-edit-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/text-edit-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-edit-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/text-edit-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/text-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/text-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/text-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/text-input-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-input-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/text-input-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/webview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/webview-icon.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/webview-icon.png
rename to src/plugins/qmldesigner/qtquickplugin/images/webview-icon.png
diff --git a/src/plugins/qmldesigner/fxplugin/images/webview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/webview-icon16.png
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/images/webview-icon16.png
rename to src/plugins/qmldesigner/qtquickplugin/images/webview-icon16.png
diff --git a/src/plugins/qmldesigner/fxplugin/plugindestdir.pri b/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri
similarity index 100%
rename from src/plugins/qmldesigner/fxplugin/plugindestdir.pri
rename to src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
similarity index 85%
rename from src/plugins/qmldesigner/fxplugin/fxplugin.cpp
rename to src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index a714f659c63..f4e419ad09e 100644
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -27,7 +27,7 @@
**
**************************************************************************/
-#include "fxplugin.h"
+#include "qtquickplugin.h"
#include <widgetplugin_helper.h>
#include <QtCore/QtPlugin>
#include <private/qdeclarativerectangle_p.h>
@@ -36,23 +36,23 @@
namespace QmlDesigner {
-FxPlugin::FxPlugin()
+QtQuickPlugin::QtQuickPlugin()
{
qmlRegisterType<QDeclarativePen>("Qt", 4, 7, "Pen");
qmlRegisterType<QDeclarativeScaleGrid>("Qt", 4, 7, "ScaleGrid");
}
-QString FxPlugin::pluginName()
+QString QtQuickPlugin::pluginName()
{
- return ("FxPlugin");
+ return ("QtQuickPlugin");
}
-QString FxPlugin::metaInfo()
+QString QtQuickPlugin::metaInfo()
{
- return QString(":/fxplugin/fx.metainfo");
+ return QString(":/qtquickplugin/quick.metainfo");
}
}
-Q_EXPORT_PLUGIN(QmlDesigner::FxPlugin)
+Q_EXPORT_PLUGIN(QmlDesigner::QtQuickPlugin)
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.h b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
similarity index 87%
rename from src/plugins/qmldesigner/fxplugin/fxplugin.h
rename to src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
index f592f44ac8b..c8e67ee43fc 100644
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.h
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
@@ -27,8 +27,8 @@
**
**************************************************************************/
-#ifndef FXPLUGIN_H
-#define FXPLUGIN_H
+#ifndef QTQUICKPLUGIN_H
+#define QTQUICKPLUGIN_H
#include <iwidgetplugin.h>
#include <QtDeclarative/qdeclarative.h>
@@ -38,14 +38,14 @@ QT_END_NAMESPACE
namespace QmlDesigner {
-class FxPlugin : public QObject, QmlDesigner::IWidgetPlugin
+class QtQuickPlugin : public QObject, QmlDesigner::IWidgetPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(FxPlugin)
+ Q_DISABLE_COPY(QtQuickPlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin)
public:
- FxPlugin();
- ~FxPlugin() {}
+ QtQuickPlugin();
+ ~QtQuickPlugin() {}
QString metaInfo();
QString pluginName();
@@ -55,4 +55,4 @@ public:
} // namespace QmlDesigner
-#endif // FXPLUGIN_H
+#endif // QTQUICKPLUGIN_H
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
new file mode 100644
index 00000000000..5870c378726
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -0,0 +1,17 @@
+TARGET = qtquickplugin
+TEMPLATE = lib
+CONFIG += plugin
+
+QT += script \
+ declarative
+
+include (../designercore/iwidgetplugin.pri)
+
+DEFINES += QTQUICK_LIBRARY
+SOURCES += $$PWD/qtquickplugin.cpp
+
+HEADERS += $$PWD/qtquickplugin.h $$PWD/../designercore/include/iwidgetplugin.h
+
+RESOURCES += $$PWD/qtquickplugin.qrc
+
+OTHER_FILES += $$PWD/quick.metainfo
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.pro b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro
similarity index 78%
rename from src/plugins/qmldesigner/fxplugin/fxplugin.pro
rename to src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro
index 48cd0f6adaa..550e1786aff 100644
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.pro
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro
@@ -1,4 +1,4 @@
include(../../../../qtcreator.pri)
include(../../../private_headers.pri)
-include(fxplugin.pri)
+include(qtquickplugin.pri)
include(plugindestdir.pri)
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.qrc b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
similarity index 95%
rename from src/plugins/qmldesigner/fxplugin/fxplugin.qrc
rename to src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
index 43bf8016138..ce204436b12 100644
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
@@ -1,6 +1,6 @@
<RCC>
- <qresource prefix="/fxplugin">
- <file>fx.metainfo</file>
+ <qresource prefix="/qtquickplugin">
+ <file>quick.metainfo</file>
<file>images/template_image.png</file>
<file>images/item-icon.png</file>
<file>images/rect-icon.png</file>
diff --git a/src/plugins/qmldesigner/fxplugin/fx.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
similarity index 69%
rename from src/plugins/qmldesigner/fxplugin/fx.metainfo
rename to src/plugins/qmldesigner/qtquickplugin/quick.metainfo
index ce9e055502a..139a82bc056 100644
--- a/src/plugins/qmldesigner/fxplugin/fx.metainfo
+++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
@@ -1,120 +1,120 @@
<metainfo>
- <node name="Qt/Item" isContainer="true" icon=":/fxplugin/images/item-icon16.png">
+ <node name="Qt/Item" isContainer="true" icon=":/qtquickplugin/images/item-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="600"/>
<propertyDefaultValue name="height" type="int" defaultValue="400"/>
- <itemlibraryentry name="Item" category="Qt - Basic" icon=":/fxplugin/images/item-icon.png">
+ <itemlibraryentry name="Item" category="Qt - Basic" icon=":/qtquickplugin/images/item-icon.png">
<property name="width" type="int" value="200"/>
<property name="height" type="int" value="200"/>
</itemlibraryentry>
</node>
- <node name="Qt/Rectangle" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/rect-icon16.png">
- <itemlibraryentry name="Rectangle" category="Qt - Basic" icon=":/fxplugin/images/rect-icon.png">
+ <node name="Qt/Rectangle" category="Qt - Basic" isContainer="true" icon=":/qtquickplugin/images/rect-icon16.png">
+ <itemlibraryentry name="Rectangle" category="Qt - Basic" icon=":/qtquickplugin/images/rect-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="color" type="QColor" value="#ffffff"/>
</itemlibraryentry>
</node>
- <node name="Qt/Text" icon=":/fxplugin/images/text-icon16.png">
+ <node name="Qt/Text" icon=":/qtquickplugin/images/text-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryentry name="Text" category="Qt - Basic" icon=":/fxplugin/images/text-icon.png">
+ <itemlibraryentry name="Text" category="Qt - Basic" icon=":/qtquickplugin/images/text-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="text"/>
</itemlibraryentry>
</node>
- <node name="Qt/TextEdit" isContainer="false" icon=":/fxplugin/images/text-edit-icon16.png">
+ <node name="Qt/TextEdit" isContainer="false" icon=":/qtquickplugin/images/text-edit-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryentry name="Text Edit" category="Qt - Basic" icon=":/fxplugin/images/text-edit-icon.png">
+ <itemlibraryentry name="Text Edit" category="Qt - Basic" icon=":/qtquickplugin/images/text-edit-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="textEdit"/>
</itemlibraryentry>
</node>
- <node name="Qt/TextInput" isContainer="false" icon=":/fxplugin/images/text-input-icon16.png">
+ <node name="Qt/TextInput" isContainer="false" icon=":/qtquickplugin/images/text-input-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryentry name="Text Input" category="Qt - Basic" icon=":/fxplugin/images/text-input-icon.png">
+ <itemlibraryentry name="Text Input" category="Qt - Basic" icon=":/qtquickplugin/images/text-input-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="textInput"/>
</itemlibraryentry>
</node>
- <node name="Qt/MouseArea" icon=":/fxplugin/images/mouse-area-icon16.png">
- <itemlibraryentry name="Mouse Area" category="Qt - Interaction" icon=":/fxplugin/images/mouse-area-icon.png">
+ <node name="Qt/MouseArea" icon=":/qtquickplugin/images/mouse-area-icon16.png">
+ <itemlibraryentry name="Mouse Area" category="Qt - Interaction" icon=":/qtquickplugin/images/mouse-area-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
</itemlibraryentry>
</node>
- <node name="Qt/Image" isContainer="true" icon=":/fxplugin/images/image-icon16.png">
+ <node name="Qt/Image" isContainer="true" icon=":/qtquickplugin/images/image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
- <itemlibraryentry name="Image" category="Qt - Basic" icon=":/fxplugin/images/image-icon.png">
+ <itemlibraryentry name="Image" category="Qt - Basic" icon=":/qtquickplugin/images/image-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
- <property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
+ <property name="source" type="QUrl" value="qrc:/qtquickplugin/images/template_image.png"/>
</itemlibraryentry>
</node>
- <node name="Qt/BorderImage" icon=":/fxplugin/images/border-image-icon16.png">
+ <node name="Qt/BorderImage" icon=":/qtquickplugin/images/border-image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
- <itemlibraryentry name="Border Image" category="Qt - Basic" icon=":/fxplugin/images/border-image-icon.png">
+ <itemlibraryentry name="Border Image" category="Qt - Basic" icon=":/qtquickplugin/images/border-image-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
- <property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
+ <property name="source" type="QUrl" value="qrc:/qtquickplugin/images/template_image.png"/>
</itemlibraryentry>
</node>
- <node name="Qt/Flickable" icon=":/fxplugin/images/flickable-icon16.png">
+ <node name="Qt/Flickable" icon=":/qtquickplugin/images/flickable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
- <itemlibraryentry name="Flickable" category="Qt - Widgets" icon=":/fxplugin/images/flickable-icon.png">
+ <itemlibraryentry name="Flickable" category="Qt - Widgets" icon=":/qtquickplugin/images/flickable-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="Qt/Flipable" icon=":/fxplugin/images/flipable-icon16.png">
+ <node name="Qt/Flipable" icon=":/qtquickplugin/images/flipable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
- <itemlibraryentry name="Flipable" category="Qt - Widgets" icon=":/fxplugin/images/flipable-icon.png">
+ <itemlibraryentry name="Flipable" category="Qt - Widgets" icon=":/qtquickplugin/images/flipable-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="Qt/GridView" icon=":/fxplugin/images/gridview-icon16.png">
- <itemlibraryentry name="Grid View" category="Qt - Views" icon=":/fxplugin/images/gridview-icon.png">
+ <node name="Qt/GridView" icon=":/qtquickplugin/images/gridview-icon16.png">
+ <itemlibraryentry name="Grid View" category="Qt - Views" icon=":/qtquickplugin/images/gridview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="Qt/ListView" icon=":/fxplugin/images/listview-icon16.png">
- <itemlibraryentry name="List View" category="Qt - Views" icon=":/fxplugin/images/listview-icon.png">
+ <node name="Qt/ListView" icon=":/qtquickplugin/images/listview-icon16.png">
+ <itemlibraryentry name="List View" category="Qt - Views" icon=":/qtquickplugin/images/listview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="Qt/PathView" icon=":/fxplugin/images/pathview-icon16.png">
- <itemlibraryentry name="Path View" category="Qt - Views" icon=":/fxplugin/images/pathview-icon.png">
+ <node name="Qt/PathView" icon=":/qtquickplugin/images/pathview-icon16.png">
+ <itemlibraryentry name="Path View" category="Qt - Views" icon=":/qtquickplugin/images/pathview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="Qt/FocusScope" icon=":/fxplugin/images/focusscope-icon16.png">
+ <node name="Qt/FocusScope" icon=":/qtquickplugin/images/focusscope-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="100"/>
<propertyDefaultValue name="height" type="int" defaultValue="100"/>
- <itemlibraryentry name="Focus Scope" category="Qt - Interaction" icon=":/fxplugin/images/focusscope-icon.png">
+ <itemlibraryentry name="Focus Scope" category="Qt - Interaction" icon=":/qtquickplugin/images/focusscope-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
</itemlibraryentry>
</node>
- <node name="QtWebKit/WebView" icon=":/fxplugin/images/webview-icon16.png">
+ <node name="QtWebKit/WebView" icon=":/qtquickplugin/images/webview-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
- <itemlibraryentry name="Web View" category="Qt - Widgets" icon=":/fxplugin/images/webview-icon.png">
+ <itemlibraryentry name="Web View" category="Qt - Widgets" icon=":/qtquickplugin/images/webview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
<property name="url" type="QString" value="http://qt.nokia.com"/>
--
GitLab