Merge remote-tracking branch 'gerrit/stable' into dev
authorAlex Blasche <alexander.blasche@digia.com>
Mon, 3 Feb 2014 08:33:29 +0000 (09:33 +0100)
committerAlex Blasche <alexander.blasche@digia.com>
Mon, 3 Feb 2014 08:33:29 +0000 (09:33 +0100)
commit5685d3b02fb448e74f319de0053e97fff265483a
treedfd3f315bdbf633f6b3210aa07eea3ff51d56c89
parent0f700c166e7369230763a4c6dbc10e86944669a1
parent7d4f4c3083d565af00f1564ae80e5cbfbc338bd5
Merge remote-tracking branch 'gerrit/stable' into dev

Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent.cpp

Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothsocket_bluez.cpp
src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp