diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-03-02 11:32:47 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-03-06 21:01:02 (GMT) |
| commit | a28ae16e3cd6d42ab068b5bc0bedf5725a6ce743 (patch) | |
| tree | 6683392784fe33dd75fc29d5fb3698686cede860 /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | 0d9a5baa0e96fb2d14838ebeb6a86eec62acf100 (diff) | |
| download | CMake-a28ae16e3cd6d42ab068b5bc0bedf5725a6ce743.zip CMake-a28ae16e3cd6d42ab068b5bc0bedf5725a6ce743.tar.gz CMake-a28ae16e3cd6d42ab068b5bc0bedf5725a6ce743.tar.bz2 | |
Autogen: Embrace qrc file lists in braces in AutogenInfo.cmake
This allows empty .qrc files in any list position.
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 151f39c..0f29e02 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -489,16 +489,17 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target, _rcc_files.push_back(absFile); // qrc file entries { - std::string entriesList; + std::string entriesList = "{"; if (!cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) { std::vector<std::string> files; if (cmQtAutoGeneratorCommon::RccListInputs( qtMajorVersion, rccCommand, absFile, files)) { - entriesList = cmJoin(files, cmQtAutoGeneratorCommon::listSep); + entriesList += cmJoin(files, cmQtAutoGeneratorCommon::listSep); } else { return; } } + entriesList += "}"; _rcc_inputs.push_back(entriesList); } // rcc options for this qrc file |