Update CMakeLists.txt

Author: raphaelscholle

src/CMakeLists.txt

@@ -238,30 +238,19 @@ if (WIN32)
             "${Qt5_DIR}/../../../qml/Qt/labs/settings" "${CMAKE_BINARY_DIR}/deploy/Qt/labs/settings")
 
     # Ensure Qt Quick Controls 1/Dialogs are always staged. The Dialogs module
-    # depends on QtQuick.Controls 1.2 and its backing DLL, but windeployqt can
-    # miss them. Copy them explicitly so the NSIS script can bundle them and
-    # fail loudly if they are missing so we never ship an installer without the
-    # required FileDialog backend.
-    set(QT_QUICKCONTROLS_DLL "${Qt5_DIR}/../../../bin/Qt5QuickControls.dll")
-    set(QT_QUICKCONTROLS_DLL_PRESENT OFF)
-    if(EXISTS "${QT_QUICKCONTROLS_DLL}")
-        set(QT_QUICKCONTROLS_DLL_PRESENT ON)
-        add_custom_command(TARGET ${PROJECT_NAME}
-            POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${QT_QUICKCONTROLS_DLL}" "${CMAKE_BINARY_DIR}/deploy")
-    else()
-        message(FATAL_ERROR "Qt Quick Controls 1 library not found at ${QT_QUICKCONTROLS_DLL}; install the Qt Quick Controls component to bundle FileDialog dependencies")
-    endif()
-
+    # depends on QtQuick.Controls 1.2, but windeployqt can miss it. Copy the
+    # QML modules explicitly so the NSIS script can bundle them and fail loudly
+    # if they are missing so we never ship an installer without the required
+    # FileDialog backend.
     set(QT_QUICKCONTROLS_QML_DIR "${Qt5_DIR}/../../../qml/QtQuick/Controls")
-    if(IS_DIRECTORY "${QT_QUICKCONTROLS_QML_DIR}")
+    set(QT_QUICKCONTROLS_PLUGIN "${QT_QUICKCONTROLS_QML_DIR}/qtquickcontrolsplugin.dll")
+    if(IS_DIRECTORY "${QT_QUICKCONTROLS_QML_DIR}" AND EXISTS "${QT_QUICKCONTROLS_PLUGIN}")
         add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_directory
                 "${QT_QUICKCONTROLS_QML_DIR}" "${CMAKE_BINARY_DIR}/deploy/QtQuick/Controls")
     else()
-        message(FATAL_ERROR "Qt Quick Controls 1 QML directory not found at ${QT_QUICKCONTROLS_QML_DIR}; install the Qt Quick Controls component to bundle FileDialog dependencies")
+        message(FATAL_ERROR "Qt Quick Controls 1 QML directory not found at ${QT_QUICKCONTROLS_QML_DIR} or missing qtquickcontrolsplugin.dll; install the Qt Quick Controls component to bundle FileDialog dependencies")
     endif()
 
     set(QT_QUICKDIALOGS_QML_DIR "${Qt5_DIR}/../../../qml/QtQuick/Dialogs")