From c75dcc6875af90635df252f529b5722b9d4a5bd0 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 29 Jul 2019 15:07:27 +0200
Subject: [PATCH] Permit the use of qml cache file generation even inside
 qtdeclarative

After re-arranging subdirs, the cmake target level dependencies can
handle building qmlcachegen before running the custom command for
generating cache files.

Change-Id: I8a35b2b5bfd2fdf4b49462ff9c27e5f3075254fc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtBuild.cmake | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index d9afbfc0650..e00da0f17c5 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -1775,13 +1775,6 @@ function(add_qmlcachegen_target target)
         return()
     endif()
 
-    if ("${CMAKE_PROJECT_NAME}" STREQUAL "QtDeclarative"
-            AND NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen)
-        # qmlcachegen is not available when building qtdeclarative since
-        # tools get built after source. We should not error in this case.
-        return()
-    endif()
-
     if (NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen)
         message(FATAL_ERROR "Could not locate qmlcachegen tool. \
 Please add QmlTools to your find_package command."