diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-25 13:02:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-25 13:02:47 +0200 |
| commit | 35bb192645b1295b0f6f70d0ead02a9d9594af96 (patch) | |
| tree | cec280b70d5bce436536d44e0640026e222e7de4 /examples | |
| parent | d36d2c3026cae67c119384f47cb2680552c81aaf (diff) | |
| parent | e1520db966debc5ad2d5dd26ec297073367697c1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I6b72d14a0e6b6523a15e286422bdb15499f7f111
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) |