diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-29 23:42:09 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-29 23:42:09 +0300 |
| commit | cc055387cddd0ff57ed5087f93fa846678936cc6 (patch) | |
| tree | d9044b40979d6b9dbfa8f505bd4da02e9b9e0055 /test cases | |
| parent | 065dcee7f3cdd4bf548848c2f989f994f4cd9748 (diff) | |
| download | meson-cc055387cddd0ff57ed5087f93fa846678936cc6.zip meson-cc055387cddd0ff57ed5087f93fa846678936cc6.tar.gz meson-cc055387cddd0ff57ed5087f93fa846678936cc6.tar.bz2 | |
Can have multiple Qt resource files in a single target. Closes #572.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/4 qt5/meson.build | 9 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/stuff.qrc | 1 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/stuff2.qrc | 6 |
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 cfea5ba..5672071 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 9152500..fdfb58e 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 0000000..910e2fb --- /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> |