diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-15 10:17:37 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-15 10:17:37 (GMT) |
| commit | 02e6c5481396a841a80e9546c223e7edc041a668 (patch) | |
| tree | 003c6f09daa9bb21fbf95e6e9ffe27d7c02a5064 /Source/cmQtAutoGenerators.h | |
| parent | fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4 (diff) | |
| download | CMake-02e6c5481396a841a80e9546c223e7edc041a668.zip CMake-02e6c5481396a841a80e9546c223e7edc041a668.tar.gz CMake-02e6c5481396a841a80e9546c223e7edc041a668.tar.bz2 | |
Autogen: Restore AUTOUIC lookup paths from 3.8.2
When encountering an `#include "<PATH>ui_<BASE>.h"` statement,
search for `<BASE>.ui` in
- <SOURCE_DIR>/<BASE>.ui
- <SOURCE_DIR>/<PATH><BASE>.ui
- <AUTOUIC_SEARCH_PATH>/<BASE>.ui
- <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui
In CMake 3.8.2 the lookup list was
- <SOURCE_DIR>/<BASE>.ui
In CMake 3.9.[01] the lookup list was
- <SOURCE_DIR>/<PATH><BASE.ui>
- <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui
Closes #17168
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index b525364..337aa17 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -112,7 +112,8 @@ private: // -- Uic file generation bool UicFindIncludedFile(std::string& absFile, const std::string& sourceFile, - const std::string& includeString); + const std::string& searchPath, + const std::string& searchFile); bool UicGenerateAll( const std::map<std::string, std::vector<std::string> >& includedUis); bool UicGenerateFile(const std::string& realName, |