diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:33 +0200 |
| commit | 5b35c21437054148e867253f1ca2d740d465d047 (patch) | |
| tree | 1877c84d75b2d0da72fd06515423dc7ada6ac1ad /examples | |
| parent | b4fca58fbe488e034b762fbcf04bc7334efa2c86 (diff) | |
| parent | 570f0f314cbe4603db34d4967b6a7dd35d174eba (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Idff3a769724c52de3806697df5b2850cf004d203
Diffstat (limited to 'examples')
8 files changed, 4 insertions, 8 deletions
diff --git a/examples/designer/containerextension/multipagewidget.json b/examples/designer/containerextension/multipagewidget.json deleted file mode 100644 index 0967ef424..000000000 --- a/examples/designer/containerextension/multipagewidget.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h index edb897b1d..bf8b72f48 100644 --- a/examples/designer/containerextension/multipagewidgetplugin.h +++ b/examples/designer/containerextension/multipagewidgetplugin.h @@ -53,7 +53,7 @@ class MultiPageWidgetPlugin: public QObject, public QDesignerCustomWidgetInterfa { Q_OBJECT //! [1] - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidget" FILE "multipagewidget.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidget") //! [1] Q_INTERFACES(QDesignerCustomWidgetInterface) public: diff --git a/examples/designer/customwidgetplugin/analogclock.json b/examples/designer/customwidgetplugin/analogclock.json deleted file mode 100644 index 0967ef424..000000000 --- a/examples/designer/customwidgetplugin/analogclock.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.h b/examples/designer/customwidgetplugin/customwidgetplugin.h index dd48fbf87..8500aad83 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.h +++ b/examples/designer/customwidgetplugin/customwidgetplugin.h @@ -47,7 +47,7 @@ class AnalogClockPlugin : public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "analogclock.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface") Q_INTERFACES(QDesignerCustomWidgetInterface) public: explicit AnalogClockPlugin(QObject *parent = 0); diff --git a/examples/designer/taskmenuextension/tictactoe.json b/examples/designer/taskmenuextension/tictactoe.json deleted file mode 100644 index 0967ef424..000000000 --- a/examples/designer/taskmenuextension/tictactoe.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h index 783caa93d..ec596b569 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.h +++ b/examples/designer/taskmenuextension/tictactoeplugin.h @@ -53,7 +53,7 @@ class TicTacToePlugin : public QObject, public QDesignerCustomWidgetInterface { Q_OBJECT //! [1] - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "tictactoe.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface") //! [1] Q_INTERFACES(QDesignerCustomWidgetInterface) diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.json b/examples/designer/worldtimeclockplugin/worldtimeclock.json deleted file mode 100644 index 0967ef424..000000000 --- a/examples/designer/worldtimeclockplugin/worldtimeclock.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h index 0a4a40745..25a2b492a 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h @@ -49,7 +49,7 @@ class WorldTimeClockPlugin : public QObject, { Q_OBJECT //! [1] - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "worldtimeclock.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface") //! [1] Q_INTERFACES(QDesignerCustomWidgetInterface) |