diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:07:20 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:07:20 +0100 |
| commit | a096dfe555762ed4cee747c99c274bd8d912fe66 (patch) | |
| tree | c218bddfc62eeb3fd4a586d76a7c5862b1c8e2de /src | |
| parent | 95c8e91d498efada85533e82bd55e7f58098f7e3 (diff) | |
| parent | 0910eb9a769fbcf437dd86db2385496b498e752f (diff) | |
| download | qtconnectivity-a096dfe555762ed4cee747c99c274bd8d912fe66.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I21c1c1bc2cffde68bb13f56f08e10564464585c1
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 2 | ||||
| -rw-r--r-- | src/bluetooth/doc/qtbluetooth.qdocconf | 2 | ||||
| -rw-r--r-- | src/nfc/doc/qtnfc.qdocconf | 2 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 7c9f9f00..ef53520c 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -72,7 +72,7 @@ config_bluez:qtHaveModule(dbus) { qbluetoothlocaldevice_bluez.cpp \ qbluetoothtransferreply_bluez.cpp -} else:qnx{ +} else:CONFIG(blackberry) { DEFINES += QT_QNX_BLUETOOTH #BT_BBPPSDEBUG include(qnx/qnx.pri) diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf index 45c0d3b4..36e8cb6f 100644 --- a/src/bluetooth/doc/qtbluetooth.qdocconf +++ b/src/bluetooth/doc/qtbluetooth.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtBluetooth description = Qt Bluetooth Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtbluetooth +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION examplesinstallpath = bluetooth diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf index e136ddf7..2d5b0ef5 100644 --- a/src/nfc/doc/qtnfc.qdocconf +++ b/src/nfc/doc/qtnfc.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtNfc description = Qt NFC Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtnfc +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION examplesinstallpath = nfc diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index dfa1d3ef..d2f9bc17 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -49,11 +49,11 @@ SOURCES += \ qqmlndefrecord.cpp \ qndefnfcsmartposterrecord.cpp -qnx { +CONFIG(blackberry) { NFC_BACKEND_AVAILABLE = yes DEFINES += QNX_NFC #QQNXNFC_DEBUG - LIBS += -lnfc + LIBS_PRIVATE += -lnfc PRIVATE_HEADERS += \ qllcpserver_qnx_p.h \ |