Merge branch 'dev' into btle

Conflicts:
	examples/bluetooth/bluetooth.pro
	src/bluetooth/doc/src/examples.qdoc
	src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
	src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
	src/bluetooth/qbluetoothservicediscoveryagent_p.h
	src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp

Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d

4 files changed, 8 insertions, 4 deletions

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/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
index 6d160f52..56459e72 100644
--- a/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
+++ b/src/bluetooth/doc/snippets/doc_src_qtbluetooth.cpp
@@ -67,8 +67,8 @@ if (localDevice.isValid()) {
 //! [discovery]
 // Create a discovery agent and connect to its signals
 QBluetoothDiscoveryAgent *discoveryAgent = new QBluetoothDiscoveryAgent(this);
-connect(discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)),
-        this, SLOT(deviceDiscovered(const QBluetoothDeviceInfo&)));
+connect(discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)),
+        this, SLOT(deviceDiscovered(QBluetoothDeviceInfo)));
 
 // Start a discovery
 discoveryAgent->start();
diff --git a/src/bluetooth/doc/src/bluetooth-index.qdoc b/src/bluetooth/doc/src/bluetooth-index.qdoc
index ff1651d0..77575994 100644
--- a/src/bluetooth/doc/src/bluetooth-index.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-index.qdoc
@@ -68,6 +68,7 @@ import statement in your \c .qml file:
     \li QML
     \list
         \li \l {scanner}{QML Bluetooth Scanner}
+        \li \l {picturetransfer}{QML Bluetooth Picture Push}
     \endlist
     \li C++
     \list
diff --git a/src/bluetooth/doc/src/examples.qdoc b/src/bluetooth/doc/src/examples.qdoc
index b7ad5df3..11e38d36 100644
--- a/src/bluetooth/doc/src/examples.qdoc
+++ b/src/bluetooth/doc/src/examples.qdoc
@@ -66,9 +66,12 @@
             \li The tennis game using a QML interface to the Bluetooth API. It
             must connect to an instance of the C++ \l{bttennis}{Bluetooth Tennis} game to play.
         \row
-            \li \l{btscanner}{QML Bluetooth Scanner}
+            \li \l{scanner}{QML Bluetooth Scanner}
             \li A QML implementation of the Bluetooth device scanner.
         \row
+            \li \l{picturetransfer}{QML Picture Push Example}
+            \li A QML application that transfers pictures between Bluetooth devices.
+        \row
             \li \l{lowenergyscanner}{QML Bluetooth Low Energy Scanner}
             \li Scan for Bluetooth Low Energy devices, services and characteristics.
     \endtable