summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier S. Pedro <dev.git@javispedro.com>2014-10-27 21:05:46 +0100
committerJavier S. Pedro <dev.git@javispedro.com>2014-10-27 21:05:46 +0100
commit1ef70cd48ec84dd6dd169f67ce2c211a4b535878 (patch)
treec2a0c7705592fb6519b42c5e1df6f35a913c5e6d
parent75e3ea1a6ede925d8aca4dca3793a629da98ed04 (diff)
downloadsalmeta-1ef70cd48ec84dd6dd169f67ce2c211a4b535878.tar.gz
salmeta-1ef70cd48ec84dd6dd169f67ce2c211a4b535878.zip
initial attempt to fix qt5.2 build issues
-rw-r--r--src/metawatch.h3
-rw-r--r--src/metawatchbttransport.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/metawatch.h b/src/metawatch.h
index 606e478..0d22a4b 100644
--- a/src/metawatch.h
+++ b/src/metawatch.h
@@ -2,9 +2,6 @@
#define METAWATCH_H
#include <QObject>
-#include <QBluetoothAddress>
-
-QT_USE_NAMESPACE_BLUETOOTH
#include "metawatchtransport.h"
#include "widgetinfo.h"
diff --git a/src/metawatchbttransport.h b/src/metawatchbttransport.h
index a27328a..b1f3bf0 100644
--- a/src/metawatchbttransport.h
+++ b/src/metawatchbttransport.h
@@ -3,7 +3,9 @@
#include <QtBluetooth/QBluetoothSocket>
+#ifdef QT_USE_NAMESPACE_BLUETOOTH
QT_USE_NAMESPACE_BLUETOOTH
+#endif
#include "metawatchtransport.h"