diff options
Diffstat (limited to 'src/designer/src/lib/shared')
| -rw-r--r-- | src/designer/src/lib/shared/plugindialog.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/pluginmanager.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/qdesigner_formbuilder.cpp | 4 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/qsimpleresource.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/widgetdatabase.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/widgetfactory.cpp | 3 |
6 files changed, 12 insertions, 7 deletions
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> |