1
0
Эх сурвалжийг харах

Merge topic 'qt4-deploy'

2c601c1 DeployQt4: Add path to Qt dlls on Windows.
David Cole 13 жил өмнө
parent
commit
36ce6e01f8

+ 6 - 0
Modules/DeployQt4.cmake

@@ -126,6 +126,9 @@ function(fixup_qt4_executable executable)
         if(QT_LIBRARY_DIR)
                 list(APPEND dirs "${QT_LIBRARY_DIR}")
         endif()
+        if(QT_BINARY_DIR)
+                list(APPEND dirs "${QT_BINARY_DIR}")
+        endif()
 
         if(APPLE)
                 set(qt_conf_dir "${executable}/Contents/Resources")
@@ -258,6 +261,9 @@ function(install_qt4_executable executable)
         if(QT_LIBRARY_DIR)
                 list(APPEND dirs "${QT_LIBRARY_DIR}")
         endif()
+        if(QT_BINARY_DIR)
+                list(APPEND dirs "${QT_BINARY_DIR}")
+        endif()
         if(component)
                 set(component COMPONENT ${component})
         else()