X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2Fmodules%2FFindQt4.cmake;h=ebd0106297e02e80b8c56a35d15b4f76e42d9d48;hp=f67395b62cf9270d82c4c3738a533ab20681014d;hb=e0014404a0bade964151fb589a568ad40ec25992;hpb=ce62e47d23bf4f826b35c7e51bc8b26cc8ffc966

diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake
index f67395b6..ebd01062 100644
--- a/cmake/modules/FindQt4.cmake
+++ b/cmake/modules/FindQt4.cmake
@@ -287,9 +287,9 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
 SET( QT_DEFINITIONS "")
 
-IF (WIN32)
+IF (WIN32 AND NOT STATIC)
   SET(QT_DEFINITIONS -DQT_DLL)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT STATIC)
 
 SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
 
@@ -1456,6 +1456,11 @@ IF (QT4_QMAKE_FOUND)
     # Trolltech said they'd consider exporting it for all platforms in future releases.
     SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
   ENDIF(NOT QT_CONFIG MATCHES "static")
+
+  # OpenSSL
+  IF(NOT QT_QCONFIG MATCHES "openssl")
+    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
+  ENDIF(NOT QT_QCONFIG MATCHES "openssl")
   
   ## system png
   IF(QT_QCONFIG MATCHES "system-png")