diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-16 13:07:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-24 11:49:36 +0200 |
| commit | f2e1341908198d842e87711ef1106391a22d9133 (patch) | |
| tree | 10e6612d54bff860e60b68c57a27d37220915f61 /src/serviceframework | |
| parent | a28c4c9eebe92c84b6b5c1792cd2bacaae94e58d (diff) | |
make use of QT_{,FOR_}PRIVATE to specify private Qt dependencies, take 2v5.0.0-beta1
Change-Id: I40c2efe22e373dec3c6e1e75bdd35da9be3ff0eb
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/serviceframework')
| -rw-r--r-- | src/serviceframework/ipc/ipc.pri | 4 | ||||
| -rw-r--r-- | src/serviceframework/serviceframework.pro | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/serviceframework/ipc/ipc.pri b/src/serviceframework/ipc/ipc.pri index 8965db5d..500bdeae 100644 --- a/src/serviceframework/ipc/ipc.pri +++ b/src/serviceframework/ipc/ipc.pri @@ -25,7 +25,7 @@ equals(SFW_BACKEND,unix) { ipc/objectendpoint.cpp } else:equals(SFW_BACKEND,dbus) { DEFINES += SFW_USE_DBUS_BACKEND - QT += dbus \ + QT_FOR_PRIVATE += dbus \ network PRIVATE_HEADERS += ipc/qremoteserviceregister_dbus_p.h \ ipc/objectendpoint_dbus_p.h \ @@ -35,7 +35,7 @@ equals(SFW_BACKEND,unix) { ipc/qservicemetaobject_dbus.cpp } else:equals(SFW_BACKEND,localsocket) { DEFINES += SFW_USE_LOCALSOCKET_BACKEND - QT += network + QT_FOR_PRIVATE += network PRIVATE_HEADERS += ipc/qremoteserviceregister_ls_p.h \ ipc/objectendpoint_p.h SOURCES += ipc/qremoteserviceregister_ls_p.cpp \ diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro index 42b99c69..8f03996a 100644 --- a/src/serviceframework/serviceframework.pro +++ b/src/serviceframework/serviceframework.pro @@ -3,16 +3,14 @@ load(qt_build_config) TARGET = QtServiceFramework QT = core -load(qt_module) - sfwdebug { DEFINES += QT_SFW_IPC_DEBUG - QT += network + QT_PRIVATE += network } jsondb { DEFINES += QT_NO_DBUS QT_ADDON_JSONDB_LIB - QT += jsondb + QT_FOR_PRIVATE += jsondb } include(ipc/ipc.pri) @@ -47,7 +45,7 @@ jsondb { SOURCES += databasemanager_jsondb.cpp PRIVATE_HEADERS += databasemanager_jsondb_p.h } else { - QT += sql + QT_FOR_PRIVATE += sql SOURCES += servicedatabase.cpp \ databasemanager.cpp PRIVATE_HEADERS += servicedatabase_p.h \ @@ -60,6 +58,7 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \ qservicereply_p.h \ qservicerequest_p.h +load(qt_module) # Enable doc submodule doc builds include (../../doc/config/serviceframework/qtserviceframework_doc.pri)
\ No newline at end of file |