6 files changed, 81 insertions, 0 deletions
diff --git a/meson/test cases/frameworks/4 qt/subfolder/generator.py b/meson/test cases/frameworks/4 qt/subfolder/generator.py
new file mode 100644
index 000000000..045d99a51
--- /dev/null
+++ b/meson/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/meson/test cases/frameworks/4 qt/subfolder/main.cpp b/meson/test cases/frameworks/4 qt/subfolder/main.cpp
new file mode 100644
index 000000000..9661811da
--- /dev/null
+++ b/meson/test cases/frameworks/4 qt/subfolder/main.cpp
@@ -0,0 +1,29 @@
+#include <QImage>
+#include <QFile>
+#include <QString>
+
+int main(int argc, char **argv) {
+  #ifndef UNITY_BUILD
+  Q_INIT_RESOURCE(stuff3);
+  Q_INIT_RESOURCE(stuff4);
+  #endif
+
+  for(auto fname:{":/thing.png", ":/thing4.png"})
+  {
+    QImage img1(fname);
+    if(img1.width() != 640) {
+        return 1;
+    }
+  }
+
+  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"))
+      return 1;
+  }
+  return 0;
+}
+\ No newline at end of file
diff --git a/meson/test cases/frameworks/4 qt/subfolder/meson.build b/meson/test cases/frameworks/4 qt/subfolder/meson.build
new file mode 100644
index 000000000..f1b84e6ae
--- /dev/null
+++ b/meson/test cases/frameworks/4 qt/subfolder/meson.build
@@ -0,0 +1,32 @@
+
+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())
+# here we abuse the system by guessing build dir layout
+cfg.set('txt_resource2', 'txt_resource.txt')
+
+
+rc_file = configure_file(
+  configuration : cfg,
+  input : 'resources/stuff4.qrc.in',
+  output : 'stuff4.qrc',
+)
+
+extra_cpp_args = []
+if meson.is_unity()
+  extra_cpp_args += '-DUNITY_BUILD'
+  qresources = qtmodule.preprocess(qt + '_subfolder_unity_ressource',qresources : ['resources/stuff3.qrc', rc_file])
+else
+  qresources = qtmodule.preprocess(qresources : ['resources/stuff3.qrc', rc_file])
+endif
+
+app = executable('subfolder', 'main.cpp', qresources, dependencies : qtdep, cpp_args: extra_cpp_args)
+test(qt + 'subfolder', app)
diff --git a/meson/test cases/frameworks/4 qt/subfolder/resources/stuff3.qrc b/meson/test cases/frameworks/4 qt/subfolder/resources/stuff3.qrc
new file mode 100644
index 000000000..fdfb58eab
--- /dev/null
+++ b/meson/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/meson/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in b/meson/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in
new file mode 100644
index 000000000..c30a35842
--- /dev/null
+++ b/meson/test cases/frameworks/4 qt/subfolder/resources/stuff4.qrc.in
@@ -0,0 +1,8 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+      <file alias="thing4.png">@filepath@</file>
+      <file alias="txt_resource.txt">@txt_resource@</file>
+      <file alias="txt_resource2.txt">@txt_resource2@</file>
+  </qresource>
+</RCC>
diff --git a/meson/test cases/frameworks/4 qt/subfolder/resources/thing.png b/meson/test cases/frameworks/4 qt/subfolder/resources/thing.png
new file mode 100644
index 000000000..4b001bd5c
--- /dev/null
+++ b/meson/test cases/frameworks/4 qt/subfolder/resources/thing.png