diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-14 15:53:12 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-05-11 07:41:58 +0000 |
| commit | 7d4149e61fbb299e95968da22daa0818e30802b9 (patch) | |
| tree | 6084c2e9af72255098c9131c8e212dc0a5672a48 /examples | |
| parent | 3d5dd90ee924665fb1401846a3712ad176a55632 (diff) | |
move ui loader interfaces to own module
it's backwards to declare the interface as part of the designer library
itself, as that obviously pulls in half of designer itself into custom
widget plugins which should be perfectly usable from the stand-alone
ui loader in uitools. also, designer isn't built for embedded systems,
so the bundling needlessly limited the availability of widget plugins.
so move the relevant headers into a separate include-only module.
the designer module retains forwarding headers, as the old includes
obviously need to continue working.
[ChangeLog][UiTools] Custom widget plugins should now use QT+=uiplugin
instead of QT+=designer. This makes them usable on embedded systems.
Task-number: QTBUG-44724
Change-Id: I5535b10d2f095b257eeda9681f60b2f8c699f7d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'examples')
10 files changed, 9 insertions, 12 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 |