diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-10-09 19:33:15 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-12 20:53:08 +0300 |
| commit | 94cfb42222c0d5e17f480a3aa2044ed7657cf082 (patch) | |
| tree | 18df271c5823935b681f29fc71e673e8d152b8b4 | |
| parent | 79b850dfcb42c39874b2592fb9d93553d42ee5c8 (diff) | |
| download | meson-94cfb42222c0d5e17f480a3aa2044ed7657cf082.zip meson-94cfb42222c0d5e17f480a3aa2044ed7657cf082.tar.gz meson-94cfb42222c0d5e17f480a3aa2044ed7657cf082.tar.bz2 | |
Fixes Qt4 plugin build and mixed Qt4/Qt5 tests builds.
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/plugin/plugin.cpp | 5 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt/plugin/plugin.h | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index c6f108b..39be19f 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -77,7 +77,7 @@ foreach qt : ['qt4', 'qt5'] moc_headers : 'plugin/plugin.h', include_directories : plugin_includes ) - plugin = library('plugin', 'plugin/plugin.cpp', pluginpreprocess, + plugin = library(qt + 'plugin', 'plugin/plugin.cpp', pluginpreprocess, include_directories : plugin_includes, dependencies : qtcore) endif diff --git a/test cases/frameworks/4 qt/plugin/plugin.cpp b/test cases/frameworks/4 qt/plugin/plugin.cpp index eeae98d..2c013fe 100644 --- a/test cases/frameworks/4 qt/plugin/plugin.cpp +++ b/test cases/frameworks/4 qt/plugin/plugin.cpp @@ -5,3 +5,8 @@ QString plugin1::getResource() { return "hello world"; } + + +#if QT_VERSION < 0x050000 + Q_EXPORT_PLUGIN2(Plugin1, plugin1) +#endif
\ No newline at end of file diff --git a/test cases/frameworks/4 qt/plugin/plugin.h b/test cases/frameworks/4 qt/plugin/plugin.h index 1138f41..c8e14e4 100644 --- a/test cases/frameworks/4 qt/plugin/plugin.h +++ b/test cases/frameworks/4 qt/plugin/plugin.h @@ -5,7 +5,10 @@ class plugin1:public QObject,public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) +#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "demo.PluginInterface" FILE "plugin.json") +#endif + public: QString getResource() override; }; |