diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-22 00:14:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 00:14:33 +0200 |
| commit | 22be11514d54c3c32bd0dcceabcedc52833508db (patch) | |
| tree | 4c0b5047f5a7548a54129fd03a3d965e89e22c1a /mesonbuild/modules/qt.py | |
| parent | 42554d5666072dc607ba4c8cad7d5a11161d7d76 (diff) | |
| parent | 81126264cdf61fff6d1228e5d549ec9f45c5d87d (diff) | |
| download | meson-22be11514d54c3c32bd0dcceabcedc52833508db.zip meson-22be11514d54c3c32bd0dcceabcedc52833508db.tar.gz meson-22be11514d54c3c32bd0dcceabcedc52833508db.tar.bz2 | |
Merge pull request #2956 from jeandet/Qt_resource_in_subfolder
Qt resource in subfolder
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 |
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 [] |