Frederik Gladhorn da39c8425b Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: .qmake.conf src/bluetooth/qlowenergyservice.cpp Change-Id: I4b0f68d35ea898819b7c8078b24d55ae90ee529c		2014-12-17 16:45:58 +01:00
..
btchat	New QML based Bt chat client	2014-09-30 14:04:54 +02:00
btfiletransfer	Merge branch 'dev' into btle	2014-07-03 09:23:25 +02:00
btscanner	Remove QLowEnergyServiceInfo	2014-09-03 08:38:55 +02:00
chat	Improve QML Chat example UI	2014-10-05 11:23:56 +02:00
heartlistener	Rename descriptorChanged() to descriptorWritten()	2014-09-02 20:18:26 +02:00
lowenergyscanner	Bluetooth example - lowenergyscanner (OS X and iOS)	2014-12-05 14:20:32 +01:00
picturetransfer	Utilize QStringLiteral where possible	2014-05-15 10:10:05 +02:00
pingpong	QtBluetooth : pingpong example on OS X	2014-09-26 15:41:00 +02:00
scanner	Add missing InvalidBluetoothAdapterError to QML discovery model	2014-11-21 12:46:08 +01:00
bluetooth.pro	New QML based Bt chat client	2014-09-30 14:04:54 +02:00