summaryrefslogtreecommitdiff
path: root/test cases/frameworks/4 qt/subfolder/main.cpp
diff options
context:
space:
mode:
authorAlexis Jeandet <alexis.jeandet@member.fsf.org>2018-04-04 01:06:43 +0200
committerAlexis Jeandet <alexis.jeandet@member.fsf.org>2018-04-04 01:06:43 +0200
commitb4cd949c48ab67891e4bc6b14a8f9f247e28777d (patch)
treeaadef1060ca47237291454781d26086bab632837 /test cases/frameworks/4 qt/subfolder/main.cpp
parentebeb248c07693da5e5f4f7b80fafadd98939d045 (diff)
downloadmeson-b4cd949c48ab67891e4bc6b14a8f9f247e28777d.tar.gz
[Qt module] More qrc fixes
When several qrc files are given all qrc files dependencies were mixed. Fixed non working use case: When user try to guess build dir layout and add use a relative path between a generated qrc file and a generated resource. Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Diffstat (limited to 'test cases/frameworks/4 qt/subfolder/main.cpp')
-rw-r--r--test cases/frameworks/4 qt/subfolder/main.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/test cases/frameworks/4 qt/subfolder/main.cpp b/test cases/frameworks/4 qt/subfolder/main.cpp
index 042288b60..9661811da 100644
--- a/test cases/frameworks/4 qt/subfolder/main.cpp
+++ b/test cases/frameworks/4 qt/subfolder/main.cpp
@@ -8,19 +8,22 @@ int main(int argc, char **argv) {
Q_INIT_RESOURCE(stuff4);
#endif
- QImage img1(":/thing.png");
- if(img1.width() != 640) {
- return 1;
- }
- QImage img2(":/thing4.png");
- if(img2.width() != 640) {
- return 1;
+ for(auto fname:{":/thing.png", ":/thing4.png"})
+ {
+ QImage img1(fname);
+ if(img1.width() != 640) {
+ return 1;
+ }
}
- QFile file(":/txt_resource.txt");
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+
+ for(auto fname:{":/txt_resource.txt",":/txt_resource2.txt"})
+ {
+ QFile file(fname);
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
return 1;
- QString line = file.readLine();
- if(line.compare("Hello World"))
+ QString line = file.readLine();
+ if(line.compare("Hello World"))
return 1;
+ }
return 0;
} \ No newline at end of file