diff options
Diffstat (limited to 'src/dbus/dbus.pro')
| -rw-r--r-- | src/dbus/dbus.pro | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index fa67fc17ef..96a798ed66 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -3,15 +3,15 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -!contains(QT_LIBS_DBUS, .*dbus-1.*) { - win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d - else:QT_LIBS_DBUS += -ldbus-1 +!contains(QMAKE_LIBS_DBUS, .*dbus-1.*) { + win32:CONFIG(debug, debug|release):QMAKE_LIBS_DBUS += -ldbus-1d + else:QMAKE_LIBS_DBUS += -ldbus-1 } DEFINES += DBUS_API_SUBJECT_TO_CHANGE -QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { - LIBS_PRIVATE += $$QT_LIBS_DBUS + LIBS_PRIVATE += $$QMAKE_LIBS_DBUS DEFINES += QT_LINKED_LIBDBUS } @@ -27,9 +27,9 @@ DEFINES += QT_NO_FOREACH QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf -PUB_HEADERS = qdbusargument.h \ +PUB_HEADERS = qtdbusglobal.h \ + qdbusargument.h \ qdbusconnectioninterface.h \ - qdbusmacros.h \ qdbuserror.h \ qdbusextratypes.h \ qdbusmessage.h \ @@ -47,6 +47,7 @@ PUB_HEADERS = qdbusargument.h \ qdbusservicewatcher.h \ qdbusunixfiledescriptor.h HEADERS += $$PUB_HEADERS \ + qtdbusglobal_p.h \ qdbusconnection_p.h \ qdbusconnectionmanager_p.h \ qdbusmessage_p.h \ |