Просмотр исходного кода

Merge topic 'qt4-deploy-module'

b688f11 Check QtCore without warning.
David Cole 14 лет назад
Родитель
Сommit
a9e686d68b
1 измененных файлов с 5 добавлено и 1 удалено
  1. 5 1
      Modules/DeployQt4.cmake

+ 5 - 1
Modules/DeployQt4.cmake

@@ -250,7 +250,11 @@ function(install_qt4_executable executable)
         endif()
 
         get_filename_component(executable_absolute "${executable}" ABSOLUTE)
-        gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY}" qtcore_type)
+        if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
+            gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
+        elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
+            gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" qtcore_type)
+        endif()
         if(qtcore_type STREQUAL "system")
                 set(qt_plugins_dir "")
         endif()