diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:54:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:54:33 +0200 |
| commit | 2526f2c4f5a22d0d69bf6c96fedfd709e479b246 (patch) | |
| tree | f2839d8e637433d5d4a802f4e6ac9de7efbcf4d0 /src | |
| parent | 62c8c732c226a9ca0f5c0558305cd89d03421c83 (diff) | |
| parent | 6909acfd09de1ab56075efcc82c1937cbdfd6470 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I210f9a9a06e48a63073f0ef8474fc963ce24936d
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/doc/qtbluetooth.qdocconf | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothtransfermanager.cpp | 2 | ||||
| -rw-r--r-- | src/nfc/doc/qtnfc.qdocconf | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf index a4b86e95..52061d7e 100644 --- a/src/bluetooth/doc/qtbluetooth.qdocconf +++ b/src/bluetooth/doc/qtbluetooth.qdocconf @@ -4,7 +4,7 @@ project = QtBluetooth description = Qt Bluetooth Reference Documentation version = $QT_VERSION -examplesinstallpath = qtconnectivity/bluetooth +examplesinstallpath = bluetooth qhp.projects = QtBluetooth diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp index 52cefdf8..09b917a9 100644 --- a/src/bluetooth/qbluetoothtransfermanager.cpp +++ b/src/bluetooth/qbluetoothtransfermanager.cpp @@ -39,8 +39,10 @@ #elif QT_OSX_BLUETOOTH #include "qbluetoothtransferreply_osx_p.h" #else +#if !defined(QT_ANDROID_BLUETOOTH) && !defined(QT_IOS_BLUETOOTH) #include "dummy/dummy_helper_p.h" #endif +#endif QT_BEGIN_NAMESPACE diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf index 8b0ba092..61ed15b6 100644 --- a/src/nfc/doc/qtnfc.qdocconf +++ b/src/nfc/doc/qtnfc.qdocconf @@ -4,7 +4,7 @@ project = QtNfc description = Qt NFC Reference Documentation version = $QT_VERSION -examplesinstallpath = qtconnectivity/nfc +examplesinstallpath = nfc qhp.projects = QtNfc |