diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-22 00:14:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 00:14:33 +0200 |
| commit | 22be11514d54c3c32bd0dcceabcedc52833508db (patch) | |
| tree | 4c0b5047f5a7548a54129fd03a3d965e89e22c1a | |
| parent | 42554d5666072dc607ba4c8cad7d5a11161d7d76 (diff) | |
| parent | 81126264cdf61fff6d1228e5d549ec9f45c5d87d (diff) | |
| download | meson-22be11514d54c3c32bd0dcceabcedc52833508db.zip meson-22be11514d54c3c32bd0dcceabcedc52833508db.tar.gz meson-22be11514d54c3c32bd0dcceabcedc52833508db.tar.bz2 | |
Merge pull request #2956 from jeandet/Qt_resource_in_subfolder
Qt resource in subfolder
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 | ||||
| -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 |
6 files changed, 24 insertions, 1 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 54e2c73..595269e 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -83,7 +83,7 @@ class QtBaseModule: mlog.warning("malformed rcc file: ", os.path.join(state.subdir, fname)) break else: - result.append(os.path.join(state.subdir, relative_part, child.text)) + result.append(os.path.join(relative_part, child.text)) return result except Exception: return [] 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 |
