diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-11 19:47:05 (GMT) |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-15 19:01:54 (GMT) |
| commit | 4f577d9f3a3604038f5b942c51cbf96e4c94146d (patch) | |
| tree | 10d1d3902197fd73536bc568f9581b4c4818b78e | |
| parent | 987f319e07428724df9f7e9a8200b3048d0b9837 (diff) | |
| download | CMake-4f577d9f3a3604038f5b942c51cbf96e4c94146d.zip CMake-4f577d9f3a3604038f5b942c51cbf96e4c94146d.tar.gz CMake-4f577d9f3a3604038f5b942c51cbf96e4c94146d.tar.bz2 | |
AUTOUIC: Fix missed ui files in Ninja deps
This fixes the issue when two .ui files have the same name,
but different locations. In this case, Ninja deps file only
contains .ui file that was found first. So <src>/xxx/yyy.ui
and <src>/yyy.ui were processed as a same file by AUTOUIC.
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 68d3c6c..75611ac 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -1589,14 +1589,14 @@ bool cmQtAutoMocUicT::JobEvalCacheUicT::FindIncludedUi( }; // Vicinity of the source - if (findUi(cmStrCat(sourceDirPrefix, this->UiName))) { - return true; - } if (!includePrefix.empty()) { if (findUi(cmStrCat(sourceDirPrefix, includePrefix, this->UiName))) { return true; } } + if (findUi(cmStrCat(sourceDirPrefix, this->UiName))) { + return true; + } // Additional AUTOUIC search paths auto const& searchPaths = this->UicConst().SearchPaths; if (!searchPaths.empty()) { |