diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 22:45:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 22:45:30 +0200 |
| commit | 5aa15fbed1375dfa7f19b0263e69e5bcf2c29ddc (patch) | |
| tree | 34e1dc512dbdef33ab68d1f367bdd4c99153c053 /examples | |
| parent | 6ef8d67413511f07abb4f71593ed6d8567f61ca8 (diff) | |
| parent | 87cfa3b24f12ae4cd1ddbb5450b307b95334feb1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I5fde87a1ac22e933c926e0d86996791a38d92c4e
Diffstat (limited to 'examples')
4 files changed, 4 insertions, 0 deletions
diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro index b3e05d7f8..39b6dc2a2 100644 --- a/examples/designer/containerextension/containerextension.pro +++ b/examples/designer/containerextension/containerextension.pro @@ -3,6 +3,7 @@ QTDIR_build { PLUGIN_TYPE = designer PLUGIN_CLASS_NAME = MultiPageWidgetPlugin load(qt_plugin) +CONFIG += install_ok } else { # Public example: diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro index 4c2c29843..1447acdc4 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -7,6 +7,7 @@ QTDIR_build { PLUGIN_TYPE = designer PLUGIN_CLASS_NAME = AnalogClockPlugin load(qt_plugin) +CONFIG += install_ok } else { # Public example: diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro index 5cfebc015..71a3806d6 100644 --- a/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/examples/designer/taskmenuextension/taskmenuextension.pro @@ -7,6 +7,7 @@ QTDIR_build { PLUGIN_TYPE = designer PLUGIN_CLASS_NAME = TicTacToePlugin load(qt_plugin) +CONFIG += install_ok } else { # Public example: diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index e8a2d2aab..b6332ce46 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -7,6 +7,7 @@ QTDIR_build { PLUGIN_TYPE = designer PLUGIN_CLASS_NAME = WorldTimeClockPlugin load(qt_plugin) +CONFIG += install_ok } else { # Public example: |