BUG: Fix find of dbus dependency in Qt 4.4
This commit is contained in:
parent
c1075aef7b
commit
ca8c4ea4a6
@ -1535,8 +1535,8 @@ IF (QT4_QMAKE_FOUND)
|
|||||||
ENDIF(OPENSSL_LIBRARIES)
|
ENDIF(OPENSSL_LIBRARIES)
|
||||||
ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
||||||
|
|
||||||
## qdbus
|
## dbus
|
||||||
IF(QT_QCONFIG MATCHES "qdbus")
|
IF(QT_QCONFIG MATCHES "dbus")
|
||||||
|
|
||||||
# if the dbus library isn't found, we'll assume its not required to build
|
# if the dbus library isn't found, we'll assume its not required to build
|
||||||
# shared Qt on Linux doesn't require it
|
# shared Qt on Linux doesn't require it
|
||||||
@ -1562,7 +1562,7 @@ IF (QT4_QMAKE_FOUND)
|
|||||||
MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
|
MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
|
||||||
ENDIF(NOT QT_DBUS_LIBRARY)
|
ENDIF(NOT QT_DBUS_LIBRARY)
|
||||||
|
|
||||||
ENDIF(QT_QCONFIG MATCHES "qdbus")
|
ENDIF(QT_QCONFIG MATCHES "dbus")
|
||||||
|
|
||||||
## glib
|
## glib
|
||||||
IF(QT_QCONFIG MATCHES "glib")
|
IF(QT_QCONFIG MATCHES "glib")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user