diff options
Diffstat (limited to 'src/designer/src')
41 files changed, 50 insertions, 180 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.json b/src/designer/src/components/buddyeditor/buddyeditor.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/components/buddyeditor/buddyeditor.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/components/buddyeditor/buddyeditor.pri b/src/designer/src/components/buddyeditor/buddyeditor.pri index c507aa01d..b6e9614c1 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor.pri +++ b/src/designer/src/components/buddyeditor/buddyeditor.pri @@ -12,5 +12,6 @@ HEADERS += \ SOURCES += \ $$PWD/buddyeditor.cpp \ $$PWD/buddyeditor_tool.cpp \ - $$PWD/buddyeditor_plugin.cpp \ - $$PWD/buddyeditor_instance.cpp + $$PWD/buddyeditor_plugin.cpp + +OTHER_FILES += $$PWD/buddyeditor.json diff --git a/src/designer/src/components/buddyeditor/buddyeditor_instance.cpp b/src/designer/src/components/buddyeditor/buddyeditor_instance.cpp deleted file mode 100644 index 50547e8fa..000000000 --- a/src/designer/src/components/buddyeditor/buddyeditor_instance.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** 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. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtCore/qplugin.h> - -#include "buddyeditor_plugin.h" - -QT_USE_NAMESPACE - -using namespace qdesigner_internal; - -Q_EXPORT_PLUGIN(BuddyEditorPlugin) diff --git a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h index 244362217..2f712a19c 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h +++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h @@ -61,6 +61,7 @@ class BuddyEditorTool; class QT_BUDDYEDITOR_EXPORT BuddyEditorPlugin: public QObject, public QDesignerFormEditorPluginInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerFormEditorPluginInterface" FILE "buddyeditor.json") Q_INTERFACES(QDesignerFormEditorPluginInterface) public: BuddyEditorPlugin(); diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.json b/src/designer/src/components/signalsloteditor/signalsloteditor.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/components/signalsloteditor/signalsloteditor.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.pri b/src/designer/src/components/signalsloteditor/signalsloteditor.pri index e903ce114..f8d9d359c 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor.pri +++ b/src/designer/src/components/signalsloteditor/signalsloteditor.pri @@ -15,7 +15,8 @@ SOURCES += $$PWD/signalslot_utils.cpp \ $$PWD/signalsloteditor.cpp \ $$PWD/signalsloteditor_tool.cpp \ $$PWD/signalsloteditor_plugin.cpp \ - $$PWD/signalsloteditor_instance.cpp \ $$PWD/signalsloteditorwindow.cpp FORMS += $$PWD/connectdialog.ui + +OTHER_FILES += $$PWD/signalsloteditor.json diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp deleted file mode 100644 index 49b86e2a4..000000000 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** 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. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtCore/qplugin.h> - -#include "signalsloteditor_plugin.h" - -QT_USE_NAMESPACE - -using namespace qdesigner_internal; - -Q_EXPORT_PLUGIN(SignalSlotEditorPlugin) diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h index 1a676d619..5d858508d 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h @@ -60,6 +60,7 @@ class SignalSlotEditorTool; class QT_SIGNALSLOTEDITOR_EXPORT SignalSlotEditorPlugin: public QObject, public QDesignerFormEditorPluginInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerFormEditorPluginInterface" FILE "signalsloteditor.json") Q_INTERFACES(QDesignerFormEditorPluginInterface) public: SignalSlotEditorPlugin(); diff --git a/src/designer/src/components/tabordereditor/tabordereditor.json b/src/designer/src/components/tabordereditor/tabordereditor.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/components/tabordereditor/tabordereditor.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/components/tabordereditor/tabordereditor.pri b/src/designer/src/components/tabordereditor/tabordereditor.pri index 786c6ae02..da1ecfbae 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor.pri +++ b/src/designer/src/components/tabordereditor/tabordereditor.pri @@ -12,5 +12,6 @@ HEADERS += \ SOURCES += \ $$PWD/tabordereditor.cpp \ $$PWD/tabordereditor_tool.cpp \ - $$PWD/tabordereditor_plugin.cpp \ - $$PWD/tabordereditor_instance.cpp + $$PWD/tabordereditor_plugin.cpp + +OTHER_FILES += $$PWD/tabordereditor.json diff --git a/src/designer/src/components/tabordereditor/tabordereditor_instance.cpp b/src/designer/src/components/tabordereditor/tabordereditor_instance.cpp deleted file mode 100644 index 8d163f1a8..000000000 --- a/src/designer/src/components/tabordereditor/tabordereditor_instance.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** 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. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtCore/qplugin.h> - -#include "tabordereditor_plugin.h" - -QT_USE_NAMESPACE -using namespace qdesigner_internal; - -Q_EXPORT_PLUGIN(TabOrderEditorPlugin) diff --git a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h index 9ad3d9672..75c53adbb 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h +++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h @@ -61,6 +61,7 @@ class TabOrderEditorTool; class QT_TABORDEREDITOR_EXPORT TabOrderEditorPlugin: public QObject, public QDesignerFormEditorPluginInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerFormEditorPluginInterface" FILE "tabordereditor.json") Q_INTERFACES(QDesignerFormEditorPluginInterface) public: TabOrderEditorPlugin(); diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h index 2cf602edf..160c1cbd5 100644 --- a/src/designer/src/lib/extension/extension.h +++ b/src/designer/src/lib/extension/extension.h @@ -58,7 +58,7 @@ public: virtual QObject *extension(QObject *object, const QString &iid) const = 0; }; -Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "com.trolltech.Qt.QAbstractExtensionFactory") +Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "org.qt-project.Qt.QAbstractExtensionFactory") class QAbstractExtensionManager { @@ -70,7 +70,7 @@ public: virtual QObject *extension(QObject *object, const QString &iid) const = 0; }; -Q_DECLARE_INTERFACE(QAbstractExtensionManager, "com.trolltech.Qt.QAbstractExtensionManager") +Q_DECLARE_INTERFACE(QAbstractExtensionManager, "org.qt-project.Qt.QAbstractExtensionManager") #if defined(Q_CC_MSVC) && (_MSC_VER < 1300) diff --git a/src/designer/src/lib/sdk/abstractformeditorplugin.h b/src/designer/src/lib/sdk/abstractformeditorplugin.h index d6be37e29..62bd4faa6 100644 --- a/src/designer/src/lib/sdk/abstractformeditorplugin.h +++ b/src/designer/src/lib/sdk/abstractformeditorplugin.h @@ -64,7 +64,7 @@ public: virtual QDesignerFormEditorInterface *core() const = 0; }; -Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "com.trolltech.Qt.Designer.QDesignerFormEditorPluginInterface") +Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "org.qt-project.Qt.Designer.QDesignerFormEditorPluginInterface") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/abstractlanguage.h b/src/designer/src/lib/sdk/abstractlanguage.h index db70b2fba..3208bc7a0 100644 --- a/src/designer/src/lib/sdk/abstractlanguage.h +++ b/src/designer/src/lib/sdk/abstractlanguage.h @@ -99,7 +99,7 @@ public: virtual QString uiExtension() const = 0; }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerLanguageExtension, "com.trolltech.Qt.Designer.Language.3") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerLanguageExtension, "org.qt-project.Qt.Designer.Language.3") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/dynamicpropertysheet.h b/src/designer/src/lib/sdk/dynamicpropertysheet.h index 171157fdb..019cf4481 100644 --- a/src/designer/src/lib/sdk/dynamicpropertysheet.h +++ b/src/designer/src/lib/sdk/dynamicpropertysheet.h @@ -72,7 +72,7 @@ public: virtual bool isDynamicProperty(int index) const = 0; virtual bool canAddDynamicProperty(const QString &propertyName) const = 0; }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerDynamicPropertySheetExtension, "com.trolltech.Qt.Designer.DynamicPropertySheet") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerDynamicPropertySheetExtension, "org.qt-project.Qt.Designer.DynamicPropertySheet") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/extrainfo.h b/src/designer/src/lib/sdk/extrainfo.h index 72133fbf5..aeb0fe2f0 100644 --- a/src/designer/src/lib/sdk/extrainfo.h +++ b/src/designer/src/lib/sdk/extrainfo.h @@ -75,7 +75,7 @@ public: private: QString m_workingDirectory; }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerExtraInfoExtension, "com.trolltech.Qt.Designer.ExtraInfo.2") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerExtraInfoExtension, "org.qt-project.Qt.Designer.ExtraInfo.2") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h index 29b9ec662..b508dcdae 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.h +++ b/src/designer/src/lib/sdk/layoutdecoration.h @@ -90,7 +90,7 @@ public: virtual void adjustIndicator(const QPoint &pos, int index) = 0; }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerLayoutDecorationExtension, "com.trolltech.Qt.Designer.LayoutDecoration") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerLayoutDecorationExtension, "org.qt-project.Qt.Designer.LayoutDecoration") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h index 87ded49b6..b60f2c035 100644 --- a/src/designer/src/lib/sdk/membersheet.h +++ b/src/designer/src/lib/sdk/membersheet.h @@ -80,7 +80,7 @@ public: virtual QList<QByteArray> parameterTypes(int index) const = 0; virtual QList<QByteArray> parameterNames(int index) const = 0; }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "com.trolltech.Qt.Designer.MemberSheet") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt.Designer.MemberSheet") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/propertysheet.h b/src/designer/src/lib/sdk/propertysheet.h index 5e73fa4a0..03129f4db 100644 --- a/src/designer/src/lib/sdk/propertysheet.h +++ b/src/designer/src/lib/sdk/propertysheet.h @@ -84,7 +84,7 @@ public: }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerPropertySheetExtension, - "com.trolltech.Qt.Designer.PropertySheet") + "org.qt-project.Qt.Designer.PropertySheet") QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h index 24544f1a6..2029e9ff8 100644 --- a/src/designer/src/lib/sdk/taskmenu.h +++ b/src/designer/src/lib/sdk/taskmenu.h @@ -59,7 +59,7 @@ public: virtual QList<QAction*> taskActions() const = 0; }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerTaskMenuExtension, "com.trolltech.Qt.Designer.TaskMenu") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerTaskMenuExtension, "org.qt-project.Qt.Designer.TaskMenu") inline QAction *QDesignerTaskMenuExtension::preferredEditAction() const diff --git a/src/designer/src/lib/shared/actionprovider_p.h b/src/designer/src/lib/shared/actionprovider_p.h index 8e9ddc0e2..45a79993f 100644 --- a/src/designer/src/lib/shared/actionprovider_p.h +++ b/src/designer/src/lib/shared/actionprovider_p.h @@ -101,7 +101,7 @@ template <class Widget> return -1; } -Q_DECLARE_EXTENSION_INTERFACE(QDesignerActionProviderExtension, "com.trolltech.Qt.Designer.ActionProvider") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerActionProviderExtension, "org.qt-project.Qt.Designer.ActionProvider") QT_END_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_utils_p.h b/src/designer/src/lib/shared/qdesigner_utils_p.h index cfbd38ce0..4ba70c1f7 100644 --- a/src/designer/src/lib/shared/qdesigner_utils_p.h +++ b/src/designer/src/lib/shared/qdesigner_utils_p.h @@ -84,7 +84,7 @@ QDESIGNER_SHARED_EXPORT void reloadIconResources(DesignerIconCache *iconCache, Q * by the form builders (names, etc). * Note that the property editor uses unqualified names ("Cancel") while the form builder serialization (uic) * requires the whole string - * ("QDialogButtonBox::Cancel" or "com.trolltech.qt.gui.QDialogButtonBox.StandardButton.Cancel").*/ + * ("QDialogButtonBox::Cancel" or "org.qt-project.qt.gui.QDialogButtonBox.StandardButton.Cancel").*/ /* --------- MetaEnum: Base class representing a QMetaEnum with lookup functions * in both ways. Template of int type since unsigned is more suitable for flags. diff --git a/src/designer/src/lib/uilib/container.h b/src/designer/src/lib/uilib/container.h index ebd527839..f7517a543 100644 --- a/src/designer/src/lib/uilib/container.h +++ b/src/designer/src/lib/uilib/container.h @@ -73,7 +73,7 @@ public: // ### Qt6 remove body, provided in Qt5 for source compatibility to Qt4. { Q_UNUSED(index); return true; } }; -Q_DECLARE_EXTENSION_INTERFACE(QDesignerContainerExtension, "com.trolltech.Qt.Designer.Container") +Q_DECLARE_EXTENSION_INTERFACE(QDesignerContainerExtension, "org.qt-project.Qt.Designer.Container") QT_END_NAMESPACE diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/lib/uilib/customwidget.h index 3d8239226..6320f581e 100644 --- a/src/designer/src/lib/uilib/customwidget.h +++ b/src/designer/src/lib/uilib/customwidget.h @@ -81,8 +81,10 @@ public: virtual QString codeTemplate() const { return QString(); } }; -Q_DECLARE_INTERFACE(QDesignerCustomWidgetInterface, "com.trolltech.Qt.Designer.CustomWidget") +#define QDesignerCustomWidgetInterface_iid "org.qt-project.QDesignerCustomWidgetInterface" + +Q_DECLARE_INTERFACE(QDesignerCustomWidgetInterface, QDesignerCustomWidgetInterface_iid) class QDesignerCustomWidgetCollectionInterface { @@ -91,8 +93,10 @@ public: virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const = 0; }; -Q_DECLARE_INTERFACE(QDesignerCustomWidgetCollectionInterface, - "com.trolltech.Qt.Designer.CustomWidgetCollection") + +#define QDesignerCustomWidgetCollectionInterface_iid "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" + +Q_DECLARE_INTERFACE(QDesignerCustomWidgetCollectionInterface, QDesignerCustomWidgetCollectionInterface_iid) QT_END_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/activeqt.json b/src/designer/src/plugins/activeqt/activeqt.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/plugins/activeqt/activeqt.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro index 2ed0b1071..038375d36 100644 --- a/src/designer/src/plugins/activeqt/activeqt.pro +++ b/src/designer/src/plugins/activeqt/activeqt.pro @@ -2,6 +2,7 @@ TARGET = $$qtLibraryTarget(qaxwidget) TEMPLATE = lib DESTDIR = $$QT.designer.plugins/designer +QT += designer-private widgets CONFIG += qt warn_on qaxcontainer plugin designer debug_and_release build_all:!build_pass { CONFIG -= build_all @@ -29,5 +30,6 @@ qaxwidgettaskmenu.h \ $$QT.activeqt.sources/shared/qaxtypes.h # install +OTHER_FILES += activeqt.json target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp index a91ebdecf..3e7bdde97 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp @@ -141,6 +141,4 @@ QString QAxWidgetPlugin::domXml() const </ui>"); } -Q_EXPORT_PLUGIN(QAxWidgetPlugin) - QT_END_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h index 2be8aabae..a9f6906ee 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h +++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h @@ -52,9 +52,10 @@ class QDesignerFormEditorInterface; class QAxWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidget" FILE "activeqt.json") Q_INTERFACES(QDesignerCustomWidgetInterface) public: - explicit inline QAxWidgetPlugin(QObject *parent = 0); + explicit QAxWidgetPlugin(QObject *parent = 0); virtual QString name() const; virtual QString group() const; diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp index bb66a1579..cf7298aff 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp @@ -45,7 +45,7 @@ #include <QtCore/QDebug> #include <QtWidgets/QIcon> #include <QtGui/QPainter> -#include <QtWidgets/QResizeEvent> +#include <QtGui/QResizeEvent> #include <ActiveQt/QAxWidget> diff --git a/src/designer/src/plugins/phononwidgets/phononcollection.cpp b/src/designer/src/plugins/phononwidgets/phononcollection.cpp index 5b41bfa59..e48313d5a 100644 --- a/src/designer/src/plugins/phononwidgets/phononcollection.cpp +++ b/src/designer/src/plugins/phononwidgets/phononcollection.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE class PhononCollection: public QObject, public QDesignerCustomWidgetCollectionInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" FILE "phonon.json") Q_INTERFACES(QDesignerCustomWidgetCollectionInterface) public: explicit PhononCollection(QObject *parent = 0); @@ -75,8 +76,6 @@ QList<QDesignerCustomWidgetInterface*> PhononCollection::customWidgets() const return m_plugins; } -Q_EXPORT_PLUGIN(PhononCollection) - QT_END_NAMESPACE #include "phononcollection.moc" diff --git a/src/designer/src/plugins/phononwidgets/phononwidgets.json b/src/designer/src/plugins/phononwidgets/phononwidgets.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/plugins/phononwidgets/phononwidgets.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/plugins/phononwidgets/phononwidgets.pro b/src/designer/src/plugins/phononwidgets/phononwidgets.pro index 1da3f5bf8..72fbd3dc7 100644 --- a/src/designer/src/plugins/phononwidgets/phononwidgets.pro +++ b/src/designer/src/plugins/phononwidgets/phononwidgets.pro @@ -21,4 +21,6 @@ HEADERS += videoplayerplugin.h \ seeksliderplugin.h \ volumesliderplugin.h +OTHER_FILES = "phonon.json" + RESOURCES += phononwidgets.qrc diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.json b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index 084441a59..199819f03 100644 --- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -11,3 +11,4 @@ build_all:!build_pass { SOURCES += qdeclarativeview_plugin.cpp HEADERS += qdeclarativeview_plugin.h +OTHER_FILES += qdeclarativeview.json diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp index 8edde5724..cdc609754 100644 --- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp @@ -127,6 +127,4 @@ QString QDeclarativeViewPlugin::domXml() const </ui>"); } -Q_EXPORT_PLUGIN2(customwidgetplugin, QDeclarativeViewPlugin) - QT_END_NAMESPACE diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h index b189c8522..32cfdbe8d 100644 --- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h +++ b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeViewPlugin: public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "qdeclarativeview.json") Q_INTERFACES(QDesignerCustomWidgetInterface) public: QDeclarativeViewPlugin(QObject *parent = 0); diff --git a/src/designer/src/plugins/qwebview/qwebview.json b/src/designer/src/plugins/qwebview/qwebview.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/src/designer/src/plugins/qwebview/qwebview.json @@ -0,0 +1 @@ +{} diff --git a/src/designer/src/plugins/qwebview/qwebview.pro b/src/designer/src/plugins/qwebview/qwebview.pro index cbbc37d2d..52fc8ff01 100644 --- a/src/designer/src/plugins/qwebview/qwebview.pro +++ b/src/designer/src/plugins/qwebview/qwebview.pro @@ -13,3 +13,4 @@ build_all:!build_pass { SOURCES += qwebview_plugin.cpp HEADERS += qwebview_plugin.h RESOURCES += qwebview_plugin.qrc +OTHER_FILES += qwebview.json diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp index c86daf000..e3ac91748 100644 --- a/src/designer/src/plugins/qwebview/qwebview_plugin.cpp +++ b/src/designer/src/plugins/qwebview/qwebview_plugin.cpp @@ -132,6 +132,4 @@ QString QWebViewPlugin::domXml() const </ui>"); } -Q_EXPORT_PLUGIN2(customwidgetplugin, QWebViewPlugin) - QT_END_NAMESPACE diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.h b/src/designer/src/plugins/qwebview/qwebview_plugin.h index 69a2a7355..392149ce9 100644 --- a/src/designer/src/plugins/qwebview/qwebview_plugin.h +++ b/src/designer/src/plugins/qwebview/qwebview_plugin.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE class QWebViewPlugin: public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "qwebview.json") Q_INTERFACES(QDesignerCustomWidgetInterface) public: QWebViewPlugin(QObject *parent = 0); |