diff options
32 files changed, 57 insertions, 29 deletions
diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h index 34a183668..edb897b1d 100644 --- a/examples/designer/containerextension/multipagewidgetplugin.h +++ b/examples/designer/containerextension/multipagewidgetplugin.h @@ -42,7 +42,7 @@ #ifndef MULTIPAGEWIDGETPLUGIN_H #define MULTIPAGEWIDGETPLUGIN_H -#include <QtDesigner/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> QT_BEGIN_NAMESPACE class QIcon; diff --git a/examples/designer/customwidgetplugin/analogclock.h b/examples/designer/customwidgetplugin/analogclock.h index 1ea6d9eb4..daec72452 100644 --- a/examples/designer/customwidgetplugin/analogclock.h +++ b/examples/designer/customwidgetplugin/analogclock.h @@ -42,7 +42,7 @@ #define ANALOGCLOCK_H #include <QWidget> -#include <QtDesigner/QDesignerExportWidget> +#include <QtUiPlugin/QDesignerExportWidget> class QDESIGNER_WIDGET_EXPORT AnalogClock : public QWidget { diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.h b/examples/designer/customwidgetplugin/customwidgetplugin.h index a5037477d..dd48fbf87 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.h +++ b/examples/designer/customwidgetplugin/customwidgetplugin.h @@ -41,7 +41,7 @@ #ifndef CUSTOMWIDGETPLUGIN_H #define CUSTOMWIDGETPLUGIN_H -#include <QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> //! [0] class AnalogClockPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro index 0e2006f37..4c2c29843 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -1,5 +1,5 @@ #! [0] -QT += widgets designer +QT += widgets uiplugin #! [0] QTDIR_build { diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro index 38987f8da..2248d3ec1 100644 --- a/examples/designer/designer.pro +++ b/examples/designer/designer.pro @@ -14,8 +14,5 @@ solaris-cc*:SUBDIRS -= calculatorbuilder \ qtNomakeTools( \ containerextension \ - customwidgetplugin \ taskmenuextension \ - worldtimeclockbuilder \ - worldtimeclockplugin \ ) diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h index 6ed8b7659..783caa93d 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.h +++ b/examples/designer/taskmenuextension/tictactoeplugin.h @@ -42,7 +42,7 @@ #ifndef TICTACTOEPLUGIN_H #define TICTACTOEPLUGIN_H -#include <QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> QT_BEGIN_NAMESPACE class QIcon; diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.h b/examples/designer/worldtimeclockplugin/worldtimeclock.h index e0220a8dc..8aede328c 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclock.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclock.h @@ -43,7 +43,7 @@ #include <QTime> #include <QWidget> -#include <QtDesigner/QDesignerExportWidget> +#include <QtUiPlugin/QDesignerExportWidget> //! [0] //! [1] class QDESIGNER_WIDGET_EXPORT WorldTimeClock : public QWidget diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h index 7ed81ba6f..0a4a40745 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h @@ -41,7 +41,7 @@ #ifndef WORLDTIMECLOCKPLUGIN_H #define WORLDTIMECLOCKPLUGIN_H -#include <QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> //! [0] class WorldTimeClockPlugin : public QObject, diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index 80a97152a..e8a2d2aab 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -1,5 +1,5 @@ #! [0] -QT += widgets designer +QT += widgets uiplugin #! [0] QTDIR_build { diff --git a/examples/uitools/uitools.pro b/examples/uitools/uitools.pro index c2e3c3405..39bf8e30b 100644 --- a/examples/uitools/uitools.pro +++ b/examples/uitools/uitools.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = multipleinheritance -!wince*:contains(QT_BUILD_PARTS, tools): SUBDIRS += textfinder +!wince: SUBDIRS += textfinder diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index 1b16831ba..cc1c7570e 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -44,9 +44,10 @@ // sdk #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerDnDItemInterface> -#include <QtDesigner/QDesignerCustomWidgetInterface> #include <QtDesigner/QDesignerSettingsInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> + #include <QtWidgets/QHeaderView> #include <QtWidgets/QApplication> #include <QtWidgets/QTreeWidgetItem> diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf index cad640eaa..0f9f4a270 100644 --- a/src/designer/src/designer/doc/qtdesigner.qdocconf +++ b/src/designer/src/designer/doc/qtdesigner.qdocconf @@ -30,9 +30,11 @@ qhp.QtDesigner.subprojects.classes.sortPages = true language = Cpp headerdirs += .. \ + ../../uiplugin \ ../../lib sourcedirs = .. \ + ../../uiplugin \ ../../lib exampledirs = ../../../../../examples/designer \ diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index 642fa617c..2a597d0cf 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -1,10 +1,9 @@ MODULE = designer TARGET = QtDesigner -QT = core-private gui-private widgets-private xml +QT = core-private gui-private widgets-private xml uiplugin MODULE_PLUGIN_TYPES = designer -MODULE_CONFIG = designer_defines load(qt_module) DEFINES += \ diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp index 3f8f9da39..ecf9acb81 100644 --- a/src/designer/src/lib/shared/plugindialog.cpp +++ b/src/designer/src/lib/shared/plugindialog.cpp @@ -37,9 +37,10 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QDesignerCustomWidgetCollectionInterface> #include <QtDesigner/QDesignerWidgetDataBaseInterface> +#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface> + #include <QtWidgets/QStyle> #include <QtWidgets/QHeaderView> #include <QtWidgets/QPushButton> diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index e7dca4358..856e07cf4 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -36,10 +36,11 @@ #include "qdesigner_qsettings_p.h" #include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerCustomWidgetInterface> #include <QtDesigner/QExtensionManager> #include <QtDesigner/QDesignerLanguageExtension> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> + #include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QFileInfo> diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index 2e50172d8..8ad93be50 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -41,15 +41,15 @@ #include <QtDesigner/private/formbuilderextra_p.h> // sdk #include <QtDesigner/container.h> -#include <QtDesigner/customwidget.h> #include <QtDesigner/propertysheet.h> #include <QtDesigner/QExtensionManager> #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerFormWindowInterface> #include <QtDesigner/QDesignerWidgetFactoryInterface> -#include <QtDesigner/QDesignerCustomWidgetInterface> #include <abstractdialoggui_p.h> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> + // shared #include <qdesigner_propertysheet_p.h> #include <qdesigner_utils_p.h> diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp index 21295f766..989b0bc8e 100644 --- a/src/designer/src/lib/shared/qsimpleresource.cpp +++ b/src/designer/src/lib/shared/qsimpleresource.cpp @@ -41,9 +41,10 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerLanguageExtension> #include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerCustomWidgetInterface> #include <QtDesigner/extrainfo.h> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> + #include <QtGui/QIcon> #include <QtWidgets/QWidget> #include <QtWidgets/QAction> diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 311078449..4840bee14 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -40,11 +40,12 @@ #include "qdesigner_utils_p.h" #include <QtDesigner/private/ui4_p.h> -#include <QtDesigner/customwidget.h> #include <QtDesigner/propertysheet.h> #include <QtDesigner/QExtensionManager> #include <QtDesigner/QDesignerFormEditorInterface> +#include <QtUiPlugin/customwidget.h> + #include <QtCore/QXmlStreamWriter> #include <QtCore/QScopedPointer> diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index ebc22520a..2208db2d5 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -55,13 +55,14 @@ // sdk #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QDesignerCustomWidgetInterface> #include <QtDesigner/QExtensionManager> #include <QtDesigner/QDesignerPropertySheetExtension> #include <QtDesigner/QDesignerLanguageExtension> #include <QtDesigner/QDesignerFormWindowManagerInterface> #include <QtDesigner/QDesignerFormWindowCursorInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> + #include <QtWidgets/QtWidgets> #include <QtWidgets/QScrollBar> #include <QtWidgets/QFontComboBox> diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index 17cc314f0..f29257cd0 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -31,11 +31,11 @@ ** ****************************************************************************/ -#include "customwidget.h" #include "formbuilder.h" #include "formbuilderextra_p.h" #include "ui4_p.h" +#include <QtUiPlugin/customwidget.h> #include <QtWidgets/QtWidgets> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/uilib/uilib.pri b/src/designer/src/lib/uilib/uilib.pri index d0002b481..26510bcb3 100644 --- a/src/designer/src/lib/uilib/uilib.pri +++ b/src/designer/src/lib/uilib/uilib.pri @@ -3,14 +3,13 @@ INCLUDEPATH += $$PWD DEFINES += QT_DESIGNER -QT += widgets +QT += widgets uiplugin # Input HEADERS += \ $$PWD/ui4_p.h \ $$PWD/abstractformbuilder.h \ $$PWD/formbuilder.h \ - $$PWD/customwidget.h \ $$PWD/properties_p.h \ $$PWD/formbuilderextra_p.h \ $$PWD/resourcebuilder_p.h \ diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h index 1834b2ea1..8a6709a66 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h +++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h @@ -34,7 +34,7 @@ #ifndef ACTIVEXPLUGIN_H #define ACTIVEXPLUGIN_H -#include <QtDesigner/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> #include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h index 93107127d..7c832fecf 100644 --- a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h +++ b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h @@ -35,7 +35,7 @@ #define QQUICKWIDGET_PLUGIN_H #include <QtQuick/QQuickWindow> -#include <QtDesigner/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.h b/src/designer/src/plugins/qwebview/qwebview_plugin.h index 077d5a273..c402c6671 100644 --- a/src/designer/src/plugins/qwebview/qwebview_plugin.h +++ b/src/designer/src/plugins/qwebview/qwebview_plugin.h @@ -34,7 +34,7 @@ #ifndef QWEBPAGE_PLUGIN_H #define QWEBPAGE_PLUGIN_H -#include <QtDesigner/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro index e02ca8efb..6915e34e9 100644 --- a/src/designer/src/src.pro +++ b/src/designer/src/src.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ + uiplugin \ uitools \ lib \ components \ @@ -8,6 +9,8 @@ SUBDIRS = \ contains(QT_CONFIG, shared): SUBDIRS += plugins +uitools.depends = uiplugin +lib.depends = uiplugin components.depends = lib designer.depends = components plugins.depends = lib diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/uiplugin/customwidget.h index 3c9083fdc..3c9083fdc 100644 --- a/src/designer/src/lib/uilib/customwidget.h +++ b/src/designer/src/uiplugin/customwidget.h diff --git a/src/designer/src/lib/uilib/customwidget.qdoc b/src/designer/src/uiplugin/customwidget.qdoc index e8e4a4b76..e8e4a4b76 100644 --- a/src/designer/src/lib/uilib/customwidget.qdoc +++ b/src/designer/src/uiplugin/customwidget.qdoc diff --git a/src/designer/src/lib/uilib/qdesignerexportwidget.h b/src/designer/src/uiplugin/qdesignerexportwidget.h index ff7e28ad9..ff7e28ad9 100644 --- a/src/designer/src/lib/uilib/qdesignerexportwidget.h +++ b/src/designer/src/uiplugin/qdesignerexportwidget.h diff --git a/src/designer/src/uiplugin/uiplugin.pro b/src/designer/src/uiplugin/uiplugin.pro new file mode 100644 index 000000000..7c41ea78c --- /dev/null +++ b/src/designer/src/uiplugin/uiplugin.pro @@ -0,0 +1,6 @@ +TARGET = QtUiPlugin +CONFIG += no_private_module header_module +QT += widgets + +MODULE_CONFIG = designer_defines +load(qt_module) diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index af2ee4fd9..a225744e1 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -34,7 +34,8 @@ #include "quiloader.h" #include "quiloader_p.h" -#include "customwidget.h" + +#include <QtUiPlugin/customwidget.h> #include <formbuilder.h> #include <formbuilderextra_p.h> diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index 9cdc59633..b9e500080 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -5,6 +5,11 @@ include(../lib/uilib/uilib.pri) QMAKE_DOCS = $$PWD/doc/qtuitools.qdocconf +# QtUiPlugins end up in designer for historical reasons. However, if +# designer isn't actually built, we need to claim the plugin type here. +!qtBuildPart(tools): \ + MODULE_PLUGIN_TYPES = designer + load(qt_module) HEADERS += quiloader.h diff --git a/sync.profile b/sync.profile index 97beabbb3..ff59ca3c2 100644 --- a/sync.profile +++ b/sync.profile @@ -2,6 +2,7 @@ "QtCLucene" => "$basedir/src/assistant/clucene", "QtHelp" => "$basedir/src/assistant/help", "QtUiTools" => "$basedir/src/designer/src/uitools", + "QtUiPlugin" => "$basedir/src/designer/src/uiplugin", "QtDesigner" => "$basedir/src/designer/src/lib", "QtDesignerComponents" => "$basedir/src/designer/src/components/lib", ); @@ -9,6 +10,15 @@ ); %classnames = ( ); +%deprecatedheaders = ( + "QtDesigner" => { + "customwidget.h" => "QtUiPlugin/customwidget.h", + "QDesignerCustomWidgetInterface" => "QtUiPlugin/QDesignerCustomWidgetInterface", + "QDesignerCustomWidgetCollectionInterface" => "QtUiPlugin/QDesignerCustomWidgetCollectionInterface", + "qdesignerexportwidget.h" => "QtUiPlugin/qdesignerexportwidget.h", + "QDesignerExportWidget" => "QtUiPlugin/QDesignerExportWidget" + } +); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |