diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:05:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:05:14 +0100 |
| commit | f15b2e266094edac11c3825c1df42396b6a76a6c (patch) | |
| tree | 4982f5cf52843c48892aede42ac57ea271404811 /src/bluetooth/bluetooth.pro | |
| parent | 5aad7c5de78c4768ee5c731f4a1dc686dbc3abd5 (diff) | |
| parent | c25d62cc83b9e8daa8c9b7fd6c03782b500093db (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/bluetooth/bluetooth.pro
Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 604f4de8..c771f237 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -6,8 +6,6 @@ QT_PRIVATE = concurrent QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator -load(qt_module) - PUBLIC_HEADERS += \ qbluetoothglobal.h \ qbluetoothaddress.h\ @@ -81,7 +79,7 @@ SOURCES += \ qlowenergyserviceprivate.cpp config_bluez:qtHaveModule(dbus) { - QT *= dbus + QT_FOR_PRIVATE += dbus DEFINES += QT_BLUEZ_BLUETOOTH include(bluez/bluez.pri) @@ -118,7 +116,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 \ @@ -139,7 +137,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 += \ @@ -174,7 +172,7 @@ config_bluez:qtHaveModule(dbus) { SOURCES -= qlowenergycontroller_p.cpp } else:ios|tvos { DEFINES += QT_IOS_BLUETOOTH - LIBS += -framework Foundation -framework CoreBluetooth + LIBS_PRIVATE += -framework Foundation -framework CoreBluetooth OBJECTIVE_SOURCES += \ qbluetoothdevicediscoveryagent_ios.mm \ @@ -215,3 +213,5 @@ config_bluez:qtHaveModule(dbus) { OTHER_FILES += HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) |