diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:06:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:51:14 +0000 |
| commit | c25d62cc83b9e8daa8c9b7fd6c03782b500093db (patch) | |
| tree | 3f89ece0ed66fdf49099588f1326d0eee2a05165 /src | |
| parent | 6b2f3cbde61a6c5d0293500ceac1c6b69eecc013 (diff) | |
don't over-expose private dependencies
Change-Id: Ida2256e88c7ebe698f8b4734afc504dcef2da2d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 8 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index e6b61eb9..6fc19ef0 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -65,7 +65,7 @@ SOURCES += \ qlowenergyserviceprivate.cpp config_bluez:qtHaveModule(dbus) { - QT *= dbus + QT_FOR_PRIVATE += dbus DEFINES += QT_BLUEZ_BLUETOOTH include(bluez/bluez.pri) @@ -98,7 +98,7 @@ config_bluez:qtHaveModule(dbus) { } else:android:!android-no-sdk { include(android/android.pri) DEFINES += QT_ANDROID_BLUETOOTH - QT += core-private androidextras + QT_FOR_PRIVATE += core-private androidextras ANDROID_PERMISSIONS = \ android.permission.BLUETOOTH \ @@ -119,7 +119,7 @@ config_bluez:qtHaveModule(dbus) { } else:osx { DEFINES += QT_OSX_BLUETOOTH - LIBS += -framework Foundation -framework IOBluetooth + LIBS_PRIVATE += -framework Foundation -framework IOBluetooth include(osx/osxbt.pri) OBJECTIVE_SOURCES += \ @@ -154,7 +154,7 @@ config_bluez:qtHaveModule(dbus) { SOURCES -= qlowenergycontroller_p.cpp } else:ios { DEFINES += QT_IOS_BLUETOOTH - LIBS += -framework Foundation -framework CoreBluetooth + LIBS_PRIVATE += -framework Foundation -framework CoreBluetooth OBJECTIVE_SOURCES += \ qbluetoothdevicediscoveryagent_ios.mm \ diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index a0a249fc..da92b634 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -57,7 +57,7 @@ SOURCES += \ linux:!android:qtHaveModule(dbus) { NFC_BACKEND_AVAILABLE = yes - QT += dbus + QT_PRIVATE += dbus DEFINES += NEARD_NFC @@ -81,7 +81,7 @@ linux:!android:qtHaveModule(dbus) { } else:simulator { NFC_BACKEND_AVAILABLE = yes - QT *= gui + QT_PRIVATE += gui PRIVATE_HEADERS += \ qnearfieldmanagervirtualbase_p.h \ @@ -108,7 +108,7 @@ linux:!android:qtHaveModule(dbus) { ANDROID_JAR_DEPENDENCIES = \ jar/QtNfc.jar:org.qtproject.qt5.android.nfc.QtNfc DEFINES += ANDROID_NFC - QT += core-private gui androidextras + QT_PRIVATE += core-private gui androidextras PRIVATE_HEADERS += \ qllcpserver_android_p.h \ |