diff options
author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2018-01-20 13:39:10 +0100 |
---|---|---|
committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2018-01-20 13:49:52 +0100 |
commit | 4e6630690a8394473e2ed1197cb4ceef29a97534 (patch) | |
tree | 3d5fe1e5ddd71ced6e1fb1d4e283de2a69701bac | |
parent | bdfcecd2c6337cc9ebc3256abadafe0d47b90a8d (diff) | |
download | meson-4e6630690a8394473e2ed1197cb4ceef29a97534.zip meson-4e6630690a8394473e2ed1197cb4ceef29a97534.tar.gz meson-4e6630690a8394473e2ed1197cb4ceef29a97534.tar.bz2 |
Added failing test case
When having Qt resources in a meson subdir, meson prepends twice
the subdir name in resource file dependencies.
Here it will set 'subfolder/subfolder/resources/thing.png' as dependencie
for stuff3.qrc.
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
-rw-r--r-- | test cases/frameworks/4 qt/meson.build | 3 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/subfolder/main.cpp | 10 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/subfolder/meson.build | 4 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/subfolder/resources/stuff3.qrc | 6 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/subfolder/resources/thing.png | bin | 0 -> 40303 bytes |
5 files changed, 23 insertions, 0 deletions
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index 7c33268..b0e848d 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -92,5 +92,8 @@ foreach qt : ['qt4', 'qt5'] plugin = library(qt + 'plugin', 'plugin/plugin.cpp', pluginpreprocess, include_directories : plugin_includes, dependencies : qtcore) + if qt == 'qt5' + subdir('subfolder') + endif endif endforeach diff --git a/test cases/frameworks/4 qt/subfolder/main.cpp b/test cases/frameworks/4 qt/subfolder/main.cpp new file mode 100644 index 0000000..61cc9d4 --- /dev/null +++ b/test cases/frameworks/4 qt/subfolder/main.cpp @@ -0,0 +1,10 @@ +#include <QImage> + +int main(int argc, char **argv) { + Q_INIT_RESOURCE(stuff3); + QImage qi(":/thing.png"); + if(qi.width() != 640) { + return 1; + } + return 0; +}
\ No newline at end of file diff --git a/test cases/frameworks/4 qt/subfolder/meson.build b/test cases/frameworks/4 qt/subfolder/meson.build new file mode 100644 index 0000000..d3ff609 --- /dev/null +++ b/test cases/frameworks/4 qt/subfolder/meson.build @@ -0,0 +1,4 @@ + +qresources = qtmodule.preprocess(qresources : 'resources/stuff3.qrc') + +app = executable('subfolder', 'main.cpp', qresources, dependencies : qtdep) diff --git a/test cases/frameworks/4 qt/subfolder/resources/stuff3.qrc b/test cases/frameworks/4 qt/subfolder/resources/stuff3.qrc new file mode 100644 index 0000000..fdfb58e --- /dev/null +++ b/test cases/frameworks/4 qt/subfolder/resources/stuff3.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource> + <file>thing.png</file> + </qresource> +</RCC> diff --git a/test cases/frameworks/4 qt/subfolder/resources/thing.png b/test cases/frameworks/4 qt/subfolder/resources/thing.png Binary files differnew file mode 100644 index 0000000..4b001bd --- /dev/null +++ b/test cases/frameworks/4 qt/subfolder/resources/thing.png |