diff options
author | Stephen Kelly <steveire@gmail.com> | 2014-03-25 00:16:49 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2014-03-25 00:16:49 (GMT) |
commit | 261acd91093ba5f2bf79f38a9632887ab2dd5f1c (patch) | |
tree | cdd8d71264c8dad88a103098947e418243db8fa9 /Source | |
parent | 6a85d624a8d5e48080785d5aacd48badc4d41d99 (diff) | |
download | CMake-261acd91093ba5f2bf79f38a9632887ab2dd5f1c.zip CMake-261acd91093ba5f2bf79f38a9632887ab2dd5f1c.tar.gz CMake-261acd91093ba5f2bf79f38a9632887ab2dd5f1c.tar.bz2 |
QtAutogen: Use the basename for resource files.
The rcc tool generates a cpp file with a symbol called qInitResources
or called qInitResources_${name}, if the name is passed. The
qInitResources symbol clashes if multiple qrc files are used in
one target.
Always pass the name to ensure that the symbol is unique. This is also
the behavior of the qtx_add_resource macros.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmQtAutoGenerators.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 2c5dd45..fcc898a 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -2074,6 +2074,8 @@ bool cmQtAutoGenerators::GenerateQrc() } } + command.push_back("-name"); + command.push_back(basename); command.push_back("-o"); command.push_back(rcc_output_file); command.push_back(*si); |