Renamed resources to qresources to avoid name clashes.

pull/15/head
Jussi Pakkanen 11 years ago
parent 1885733656
commit 4084e7213e
  1. 2
      dependencies.py
  2. 2
      test cases/frameworks/4 qt5/meson.build

@ -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]

@ -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

Loading…
Cancel
Save