Explorar el Código

Merge topic 'autouic-missed-ui-dependency'

4f577d9f3a AUTOUIC: Fix missed ui files in Ninja deps

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5806
Brad King hace 4 años
padre
commit
88313686b7
Se han modificado 1 ficheros con 3 adiciones y 3 borrados
  1. 3 3
      Source/cmQtAutoMocUic.cxx

+ 3 - 3
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()) {