1 files changed, 38 insertions, 6 deletions
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index 4f918691ae..e5f7e14d82 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -1,15 +1,47 @@
 
 get_filename_component(_qt5_corelib_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
 
+if (NOT TARGET Qt5::qmake)
+    add_executable(Qt5::qmake IMPORTED)
+
+    set_target_properties(Qt5::qmake PROPERTIES
+!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+        IMPORTED_LOCATION \"${_qt5_corelib_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
+!!ELSE
+        IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\"
+!!ENDIF
+    )
+endif()
+
+if (NOT TARGET Qt5::moc)
+    add_executable(Qt5::moc IMPORTED)
+
+    set_target_properties(Qt5::moc PROPERTIES
+!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+        IMPORTED_LOCATION \"${_qt5_corelib_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
+!!ELSE
+        IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\"
+!!ENDIF
+    )
+    # For CMake automoc feature
+    get_target_property(QT_MOC_EXECUTABLE Qt5::moc LOCATION)
+endif()
+
+if (NOT TARGET Qt5::rcc)
+    add_executable(Qt5::rcc IMPORTED)
+
+    set_target_properties(Qt5::rcc PROPERTIES
 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-set(QT_QMAKE_EXECUTABLE \"${_qt5_corelib_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-set(QT_MOC_EXECUTABLE \"${_qt5_corelib_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-set(QT_RCC_EXECUTABLE \"${_qt5_corelib_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+        IMPORTED_LOCATION \"${_qt5_corelib_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
 !!ELSE
-set(QT_QMAKE_EXECUTABLE \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-set(QT_MOC_EXECUTABLE \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-set(QT_RCC_EXECUTABLE \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+        IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\"
 !!ENDIF
+    )
+endif()
+
+set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
+set(Qt5Core_MOC_EXECUTABLE Qt5::moc)
+set(Qt5Core_RCC_EXECUTABLE Qt5::rcc)
 
 !!IF isEmpty(CMAKE_DATA_DIR_IS_ABSOLUTE)
 list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5_corelib_install_prefix}/mkspecs/default\")