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>

4 files changed, 29 insertions, 27 deletions

diff --git a/src/publishsubscribe/publishsubscribe.pro b/src/publishsubscribe/publishsubscribe.pro
index ecc2c6fb..b0b5ade7 100644
--- a/src/publishsubscribe/publishsubscribe.pro
+++ b/src/publishsubscribe/publishsubscribe.pro
@@ -34,7 +34,7 @@ unix {
     }
 
     contains(QT_CONFIG,jsondb) {
-        QT_PRIVATE += jsondb
+        QT_FOR_PRIVATE += jsondb
 
         PRIVATE_HEADERS += jsondblayer_p.h
         SOURCES += jsondblayer.cpp
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
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index be7d7f9b..2f3190b6 100644
--- a/src/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -3,8 +3,6 @@ load(qt_build_config)
 TARGET = QtSystemInfo
 QT = core gui network
 
-load(qt_module)
-
 PUBLIC_HEADERS = qsysteminfoglobal.h \
                  qdeviceinfo.h \
                  qdisplayinfo.h \
@@ -49,16 +47,6 @@ win32: !simulator: {
 }
 
 linux-*: !simulator: {
-    # bluetooth.h is not standards compliant
-    contains(QMAKE_CXXFLAGS, -std=c++0x) {
-        QMAKE_CXXFLAGS -= -std=c++0x
-        QMAKE_CXXFLAGS += -std=gnu++0x
-        CONFIG -= c++11
-    }
-    c++11 {
-        CONFIG -= c++11
-        QMAKE_CXXFLAGS += -std=gnu++0x
-    }
     PRIVATE_HEADERS += qdeviceinfo_linux_p.h \
                        qdisplayinfo_linux_p.h \
                        qstorageinfo_linux_p.h \
@@ -89,7 +77,7 @@ linux-*: !simulator: {
     }
 
     contains(QT_CONFIG, sfw_netreg) {
-        QT += serviceframework
+        QT_FOR_PRIVATE += serviceframework
         PRIVATE_HEADERS += qnetworkservicewrapper_p.h
         SOURCES += qnetworkservicewrapper.cpp
     } else {
@@ -98,7 +86,7 @@ linux-*: !simulator: {
 
     contains(QT_CONFIG, dbus): {
         config_ofono:!contains(QT_CONFIG, sfw_netreg) {
-            QT += dbus
+            QT_FOR_PRIVATE += dbus
             PRIVATE_HEADERS += qofonowrapper_p.h
             SOURCES += qofonowrapper.cpp
         } else {
@@ -106,7 +94,7 @@ linux-*: !simulator: {
         }
 
         config_udisks {
-            QT += dbus
+            QT_PRIVATE += dbus
         } else: {
             DEFINES += QT_NO_UDISKS
         }
@@ -134,7 +122,7 @@ linux-*: !simulator: {
 }
 
 simulator {
-    QT += simulator
+    QT_PRIVATE += simulator
     DEFINES += QT_SIMULATOR
     PRIVATE_HEADERS += qsysteminfodata_simulator_p.h \
                        qsysteminfobackend_simulator_p.h \
@@ -173,7 +161,7 @@ simulator {
         }
 
         contains(QT_CONFIG, sfw_netreg) {
-            QT += serviceframework
+            QT_PRIVATE += serviceframework
             PRIVATE_HEADERS += qnetworkservicewrapper_p.h \
                                qnetworkinfo_linux_p.h
 
@@ -185,7 +173,7 @@ simulator {
 
         contains(QT_CONFIG, dbus): {
             config_ofono:!contains(QT_CONFIG, sfw_netreg) {
-            QT += dbus
+                QT_PRIVATE += dbus
             PRIVATE_HEADERS += qofonowrapper_p.h \
                                qnetworkinfo_linux_p.h
 
@@ -195,7 +183,7 @@ simulator {
                 DEFINES += QT_NO_OFONO
             }
             contains(config_test_udisks, yes): {
-                QT += dbus
+                QT_PRIVATE += dbus
             } else: {
                 DEFINES += QT_NO_UDISKS
             }
@@ -225,6 +213,21 @@ simulator {
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
+load(qt_module)
+
+# This must be done after loading qt_module.prf
+config_bluez {
+    # bluetooth.h is not standards compliant
+    contains(QMAKE_CXXFLAGS, -std=c++0x) {
+        QMAKE_CXXFLAGS -= -std=c++0x
+        QMAKE_CXXFLAGS += -std=gnu++0x
+        CONFIG -= c++11
+    }
+    c++11 {
+        CONFIG -= c++11
+        QMAKE_CXXFLAGS += -std=gnu++0x
+    }
+}
 
 # Enable doc submodule doc builds
 include (../../doc/config/systeminfo/qtsysteminfo_doc.pri)