aboutsummaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-04-06 23:55:17 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-04-06 23:55:17 +0300
commit1d36109002cc5ce79b1627cceae7bc3a1e28e113 (patch)
treebb086ccf8c2fda3feb185ceb133ecbe47732cc30 /test cases/frameworks
parente2e95c7bf2920a7a515e19926534f9b81338e736 (diff)
downloadmeson-1d36109002cc5ce79b1627cceae7bc3a1e28e113.zip
meson-1d36109002cc5ce79b1627cceae7bc3a1e28e113.tar.gz
meson-1d36109002cc5ce79b1627cceae7bc3a1e28e113.tar.bz2
Can have multiple resource files in Qt5.
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/4 qt5/main.cpp4
-rw-r--r--test cases/frameworks/4 qt5/meson.build2
-rw-r--r--test cases/frameworks/4 qt5/stuff2.qrc5
-rw-r--r--test cases/frameworks/4 qt5/thing2.pngbin0 -> 40303 bytes
4 files changed, 10 insertions, 1 deletions
diff --git a/test cases/frameworks/4 qt5/main.cpp b/test cases/frameworks/4 qt5/main.cpp
index 41d7d70..4c257a4 100644
--- a/test cases/frameworks/4 qt5/main.cpp
+++ b/test cases/frameworks/4 qt5/main.cpp
@@ -8,6 +8,10 @@ int main(int argc, char **argv) {
if(qi.width() != 640) {
return 1;
}
+ QImage qi2(":/thing2.png");
+ if(qi2.width() != 640) {
+ return 1;
+ }
win->setWindowTitle("Meson Qt5 build test");
win->show();
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index 237db33..2eefafd 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -6,7 +6,7 @@ q5exe = executable('qt5app',
sources : ['main.cpp', 'mainWindow.cpp'], # Sources that don't need preprocessing.
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.
+qresources : ['stuff.qrc', 'stuff2.qrc'], # Resource files for rcc compiler.
deps : qt5dep)
# We need a console test application because some test environments
diff --git a/test cases/frameworks/4 qt5/stuff2.qrc b/test cases/frameworks/4 qt5/stuff2.qrc
new file mode 100644
index 0000000..b719919
--- /dev/null
+++ b/test cases/frameworks/4 qt5/stuff2.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+ <file>thing2.png</file>
+</qresource>
+</RCC>
diff --git a/test cases/frameworks/4 qt5/thing2.png b/test cases/frameworks/4 qt5/thing2.png
new file mode 100644
index 0000000..4b001bd
--- /dev/null
+++ b/test cases/frameworks/4 qt5/thing2.png
Binary files differ