From 94cfb42222c0d5e17f480a3aa2044ed7657cf082 Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Mon, 9 Oct 2017 19:33:15 +0200 Subject: Fixes Qt4 plugin build and mixed Qt4/Qt5 tests builds. Signed-off-by: Alexis Jeandet --- test cases/frameworks/4 qt/meson.build | 2 +- test cases/frameworks/4 qt/plugin/plugin.cpp | 5 +++++ test cases/frameworks/4 qt/plugin/plugin.h | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) 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; }; -- cgit v1.1