diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2018-03-30 01:49:35 +0200 |
|---|---|---|
| committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2018-03-30 01:58:09 +0200 |
| commit | ebeb248c07693da5e5f4f7b80fafadd98939d045 (patch) | |
| tree | e8ef34d47f8de8137b4b67a3c008cbe9e3e816db /test cases/frameworks/4 qt | |
| parent | fd245ce5cf4b0d1a6841fc6dccbf98acbd8fe401 (diff) | |
| download | meson-ebeb248c07693da5e5f4f7b80fafadd98939d045.tar.gz | |
[Qt module] Added generated resource test case + some fixes
Subdir is already in generated resource path.
Some PEP8 fixes.
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Diffstat (limited to 'test cases/frameworks/4 qt')
4 files changed, 25 insertions, 0 deletions
diff --git a/test cases/frameworks/4 qt/subfolder/generator.py b/test cases/frameworks/4 qt/subfolder/generator.py new file mode 100644 index 000000000..045d99a51 --- /dev/null +++ b/test cases/frameworks/4 qt/subfolder/generator.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +import sys + +if len(sys.argv) > 1: + with open(sys.argv[1], "w") as output: + output.write("Hello World") diff --git a/test cases/frameworks/4 qt/subfolder/main.cpp b/test cases/frameworks/4 qt/subfolder/main.cpp index 61406591f..042288b60 100644 --- a/test cases/frameworks/4 qt/subfolder/main.cpp +++ b/test cases/frameworks/4 qt/subfolder/main.cpp @@ -1,4 +1,6 @@ #include <QImage> +#include <QFile> +#include <QString> int main(int argc, char **argv) { #ifndef UNITY_BUILD @@ -14,5 +16,11 @@ int main(int argc, char **argv) { if(img2.width() != 640) { return 1; } + QFile file(":/txt_resource.txt"); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + return 1; + QString line = file.readLine(); + if(line.compare("Hello World")) + 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 index abba4c70c..0b54df7f1 100644 --- a/test cases/frameworks/4 qt/subfolder/meson.build +++ b/test cases/frameworks/4 qt/subfolder/meson.build @@ -1,6 +1,16 @@ + +simple_gen = find_program('generator.py', required : true) + +txt_resource = custom_target('txt_resource', + output : 'txt_resource.txt', + command : [simple_gen, '@OUTPUT@'], +) + cfg = configuration_data() cfg.set('filepath', meson.current_source_dir()+'/../thing2.png') +cfg.set('txt_resource', txt_resource.full_path()) + rc_file = configure_file( configuration : cfg, input : 'resources/stuff4.qrc.in', diff --git a/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in b/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in index c9f67acf9..97e277833 100644 --- a/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in +++ b/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in @@ -2,5 +2,6 @@ <RCC version="1.0"> <qresource> <file alias="thing4.png">@filepath@</file> + <file alias="txt_resource.txt">@txt_resource@</file> </qresource> </RCC> |