Merge branch '1.0'

Conflicts:
	plugins/declarative/contacts/contacts.pro
	src/systeminfo/qsysteminfo_linux_common.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/configure b/configure
index 88b9100428..a376bd5f78 100755
--- a/configure
+++ b/configure
@@ -509,6 +509,7 @@ compileTest "CoreWLAN (MacOS 10.6)" corewlan
 compileTest "Maemo ICD" maemo-icd
 compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
 compileTest "Maemo5 contacts dependencies" maemo5-contacts
+compileTest "Bluez" bluez
 if [ "$LINUX_TARGET" = maemo6 ]; then
     compileTest sensord sensord
 else