diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-20 12:29:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 16:35:10 +0100 |
| commit | 8e13eaaf45ec6e9bce582d4676db9d4b159c0129 (patch) | |
| tree | c34aefeacd1641a11a5de216e2a50bff52d872b8 | |
| parent | d7ede7441beba324272a2ac89a8d3673d09530c8 (diff) | |
Fix broken namespace build of QtConnectivity
Change-Id: I434a80b6ac32524fa429e94c16f663c81f90003c
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| -rw-r--r-- | src/bluetooth/qlowenergycharacteristicinfo_p.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyprocess_bluez.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergycharacteristicinfo_p.h b/src/bluetooth/qlowenergycharacteristicinfo_p.h index 7a42f4a3..8fb23ad4 100644 --- a/src/bluetooth/qlowenergycharacteristicinfo_p.h +++ b/src/bluetooth/qlowenergycharacteristicinfo_p.h @@ -56,7 +56,7 @@ #endif #ifdef QT_BLUEZ_BLUETOOTH class OrgBluezCharacteristicInterface; -class QLowEnergyProcess; +QT_FORWARD_DECLARE_CLASS(QLowEnergyProcess); #endif QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qlowenergyprocess_bluez.cpp b/src/bluetooth/qlowenergyprocess_bluez.cpp index 736e45ff..df8320a0 100644 --- a/src/bluetooth/qlowenergyprocess_bluez.cpp +++ b/src/bluetooth/qlowenergyprocess_bluez.cpp @@ -41,6 +41,8 @@ #include "qlowenergyprocess_p.h" +QT_BEGIN_NAMESPACE + Q_GLOBAL_STATIC(QLowEnergyProcess, processInstance) /*! @@ -140,3 +142,5 @@ void QLowEnergyProcess::addConnection() m_counter++; connected = true; } + +QT_END_NAMESPACE |