diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-06 18:00:17 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-06 18:00:17 +0300 |
| commit | 4084e7213ec1c3a240d7d4509fec4b7d24f5f95d (patch) | |
| tree | cbe0c50291e929d847f4958f121252f74c3f5b64 | |
| parent | 18857336566519d319898ed4735352d1cbaaef3f (diff) | |
| download | meson-4084e7213ec1c3a240d7d4509fec4b7d24f5f95d.zip meson-4084e7213ec1c3a240d7d4509fec4b7d24f5f95d.tar.gz meson-4084e7213ec1c3a240d7d4509fec4b7d24f5f95d.tar.bz2 | |
Renamed resources to qresources to avoid name clashes.
| -rw-r--r-- | dependencies.py | 2 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py index af81b5b..3813fba 100644 --- a/dependencies.py +++ b/dependencies.py @@ -522,7 +522,7 @@ class Qt5Dependency(Dependency): 'ui_@BASENAME@.h', 'ui_files', 'ui_compile', 'Compiling @INFILE@ with the ui compiler') rrc_rule = CustomRule([self.rcc.get_command(), '@INFILE@', '-o', '@OUTFILE@'], - '@BASENAME@.cpp', 'resources', 'rc_compile', + '@BASENAME@.cpp', 'qresources', 'rc_compile', 'Compiling @INFILE@ with the rrc compiler') return [moc_rule, ui_rule, rrc_rule] diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build index 159f444..7d65167 100644 --- a/test cases/frameworks/4 qt5/meson.build +++ b/test cases/frameworks/4 qt5/meson.build @@ -6,7 +6,7 @@ q5exe = executable('qt5app', sources : ['main.cpp', 'mainWindow.cpp'], # Sources that don't need preprocessing. moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol. -resources : 'stuff.qrc', # Resource file for rcc compiler. +qresources : 'stuff.qrc', # Resource file for rcc compiler. deps : qt5dep) # We need a console test application because some test environments |