Blob Blame History Raw
diff -up qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp.bluez_el6 qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp
--- qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp.bluez_el6	2016-05-23 00:58:18.000000000 -0500
+++ qtconnectivity-opensource-src-5.6.1/src/bluetooth/qlowenergycontroller_p.cpp	2016-06-15 13:38:51.302319277 -0500
@@ -32,8 +32,8 @@
 ****************************************************************************/
 
 #include "qlowenergycontroller_p.h"
-#ifndef QT_IOS_BLUETOOTH
-#include "dummy/dummy_helper_p.h"
+#if !defined(QT_BLUEZ_NO_BTLE) && !defined(QT_IOS_BLUETOOTH)
+//#include "dummy/dummy_helper_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -43,8 +43,8 @@ QLowEnergyControllerPrivate::QLowEnergyC
       state(QLowEnergyController::UnconnectedState),
       error(QLowEnergyController::NoError)
 {
-#ifndef QT_IOS_BLUETOOTH
-    printDummyWarning();
+#if !defined(QT_BLUEZ_NO_BTLE) && !defined(QT_IOS_BLUETOOTH)
+//    printDummyWarning();
 #endif
     registerQLowEnergyControllerMetaType();
 }