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
..
bluetooth	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-17 16:45:58 +01:00
nfc	Fix corkboard example display	2014-12-10 12:47:47 +01:00
examples.pro	make use of qtHaveModule()	2013-01-04 09:37:58 +01:00