projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't explicitly check for OpenSSL anymore, but rely on Qt
[quassel.git]
/
cmake
/
modules
/
Qt4ConfigDependentSettings.cmake
diff --git
a/cmake/modules/Qt4ConfigDependentSettings.cmake
b/cmake/modules/Qt4ConfigDependentSettings.cmake
index
925ab94
..
1956aa5
100644
(file)
--- a/
cmake/modules/Qt4ConfigDependentSettings.cmake
+++ b/
cmake/modules/Qt4ConfigDependentSettings.cmake
@@
-217,11
+217,6
@@
IF(NOT Q_WS_WIN)
ENDIF(_QT_NEED_OPENSSL)
ENDIF(NOT Q_WS_WIN)
ENDIF(_QT_NEED_OPENSSL)
ENDIF(NOT Q_WS_WIN)
-# Added by Sput. Still need to figure out why win is ignored upstream for this...
-IF(NOT QT_QCONFIG MATCHES "openssl")
- SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
-ENDIF(NOT QT_QCONFIG MATCHES "openssl")
-
## dbus
IF(QT_QCONFIG MATCHES "dbus")
## dbus
IF(QT_QCONFIG MATCHES "dbus")