Qrc resources should be relative to the .qrc file and not the meson.build one. Closes #105.

pull/107/head
Jussi Pakkanen 10 years ago
parent 8c0501e785
commit 58d68f3d10
  1. 3
      modules/qt4.py
  2. 3
      modules/qt5.py

@ -83,6 +83,7 @@ class Qt4Module():
def parse_qrc(self, state, fname):
abspath = os.path.join(state.environment.source_dir, state.subdir, fname)
relative_part = os.path.split(fname)[0]
try:
tree = ET.parse(abspath)
root = tree.getroot()
@ -92,7 +93,7 @@ class Qt4Module():
mlog.log("Warning, malformed rcc file: ", os.path.join(state.subdir, fname))
break
else:
result.append(os.path.join(state.subdir, child.text))
result.append(os.path.join(state.subdir, relative_part, child.text))
return result
except Exception:
return []

@ -90,6 +90,7 @@ class Qt5Module():
def parse_qrc(self, state, fname):
abspath = os.path.join(state.environment.source_dir, state.subdir, fname)
relative_part = os.path.split(fname)[0]
try:
tree = ET.parse(abspath)
root = tree.getroot()
@ -99,7 +100,7 @@ class Qt5Module():
mlog.log("Warning, malformed rcc file: ", os.path.join(state.subdir, fname))
break
else:
result.append(os.path.join(state.subdir, child.text))
result.append(os.path.join(state.subdir, relative_part, child.text))
return result
except Exception:
return []

Loading…
Cancel
Save