aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test cases/frameworks/4 qt/meson.build2
-rw-r--r--test cases/frameworks/4 qt/plugin/plugin.cpp5
-rw-r--r--test cases/frameworks/4 qt/plugin/plugin.h3
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;
};