summaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/4 qt5/meson.build9
-rw-r--r--test cases/frameworks/4 qt5/stuff.qrc1
-rw-r--r--test cases/frameworks/4 qt5/stuff2.qrc6
3 files changed, 12 insertions, 4 deletions
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index cfea5ba78..56720719f 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -3,10 +3,13 @@ project('qt5 build test', 'cpp')
qt5 = import('qt5')
qt5dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets'])
+# The following has two resource files because having two in one target
+# requires you to do it properly or you get linker symbol clashes.
+
prep = qt5.preprocess(
- moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use.
- ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol.
- qresources : 'stuff.qrc', # Resource file for rcc compiler.
+ moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use.
+ ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol.
+ qresources : ['stuff.qrc', 'stuff2.qrc'], # Resource file for rcc compiler.
)
q5exe = executable('qt5app',
diff --git a/test cases/frameworks/4 qt5/stuff.qrc b/test cases/frameworks/4 qt5/stuff.qrc
index 9152500a3..fdfb58eab 100644
--- a/test cases/frameworks/4 qt5/stuff.qrc
+++ b/test cases/frameworks/4 qt5/stuff.qrc
@@ -2,6 +2,5 @@
<RCC version="1.0">
<qresource>
<file>thing.png</file>
- <file>thing2.png</file>
</qresource>
</RCC>
diff --git a/test cases/frameworks/4 qt5/stuff2.qrc b/test cases/frameworks/4 qt5/stuff2.qrc
new file mode 100644
index 000000000..910e2fbae
--- /dev/null
+++ b/test cases/frameworks/4 qt5/stuff2.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource>
+ <file>thing2.png</file>
+ </qresource>
+</RCC>