summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-09-23 10:27:00 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-09-23 11:23:29 +0000
commit6ff123be879bcb8d476c11af44a36624e2b626aa (patch)
tree53e6c3a5c409612fd82d58207f9411a8f51b9fb7
parent80d86fed13c5a59691d26a711ffa9bfdd994f27c (diff)
pro2cmake: Ignore generated .qrc files
...instead of complaining about non-existing files. qtscxml/tests/auto/scion/scion.pro has RESOURCES = $$OUT_PWD/scion.qrc Change-Id: I5737fe5078c87689152fc7fa0d8d25ddc2b1a00f Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rwxr-xr-xutil/cmake/pro2cmake.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 797844f7d5..649aacc28d 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -2273,6 +2273,9 @@ def write_resources(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0,
skip_qtquick_compiler = r in qtquickcompiler_skipped
retain_qtquick_compiler = r in qtquickcompiler_retained
if r.endswith(".qrc"):
+ if "${CMAKE_CURRENT_BINARY_DIR}" in r:
+ cm_fh.write(f"#### Ignored generated resource: {r}")
+ continue
qrc_output += process_qrc_file(
target,
r,