diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-08 23:05:14 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-08 23:05:14 +0300 |
| commit | bfa68aaeaff35ad59110ca34cd4afc6cc8238f29 (patch) | |
| tree | 941f4a11a2133fb735725ec29b16fd0c3d31e013 /test cases | |
| parent | c89bbae0ad9136031b35928688700aff6dc05334 (diff) | |
| download | meson-bfa68aaeaff35ad59110ca34cd4afc6cc8238f29.tar.gz | |
Autodetect Qt5 rcc dependencies as well as reasonably possible.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/4 qt5/meson.build | 10 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/stuff.qrc | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build index 95423312b..ae85d1d22 100644 --- a/test cases/frameworks/4 qt5/meson.build +++ b/test cases/frameworks/4 qt5/meson.build @@ -7,12 +7,14 @@ if meson.get_compiler('cpp').get_id() != 'msvc' add_global_arguments('-std=c++11', language : 'cpp') endif +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. +) + q5exe = executable('qt5app', sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. -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. -)], +prep], dependencies : qt5dep) # We need a console test application because some test environments diff --git a/test cases/frameworks/4 qt5/stuff.qrc b/test cases/frameworks/4 qt5/stuff.qrc index 48f8fda3b..9152500a3 100644 --- a/test cases/frameworks/4 qt5/stuff.qrc +++ b/test cases/frameworks/4 qt5/stuff.qrc @@ -1,6 +1,7 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>thing.png</file> - <file>thing2.png</file> -</qresource> +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource> + <file>thing.png</file> + <file>thing2.png</file> + </qresource> </RCC> |