aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Jeandet <alexis.jeandet@member.fsf.org>2018-01-20 13:51:50 +0100
committerAlexis Jeandet <alexis.jeandet@member.fsf.org>2018-01-20 13:51:50 +0100
commit81126264cdf61fff6d1228e5d549ec9f45c5d87d (patch)
tree67ae10ce79eb9b5db12c7131f8a0cfc02ef58af2
parent4e6630690a8394473e2ed1197cb4ceef29a97534 (diff)
downloadmeson-81126264cdf61fff6d1228e5d549ec9f45c5d87d.zip
meson-81126264cdf61fff6d1228e5d549ec9f45c5d87d.tar.gz
meson-81126264cdf61fff6d1228e5d549ec9f45c5d87d.tar.bz2
Fixed bug
Adding the current subdir when extracting resources deps wasn't good, it is CustomTarget job to handle that. Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
-rw-r--r--mesonbuild/modules/qt.py2
1 files changed, 1 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 []