diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-27 13:28:14 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-11-03 13:09:09 +0000 |
| commit | 40214a8c8d35bb15cbe6874cc33d90344f4c533c (patch) | |
| tree | a9e0b8b644033466ff991600165cbe72327d5af0 /src/bluetooth/qlowenergycontroller_p.h | |
| parent | 37ef963092460be6cf51dda81bffcd068a875165 (diff) | |
Reorder the qlowenergycontroller_p.h includes
qlowenergycontroller_p.cpp and qlowenergycontroller_p.h are no longer
universally included by all builds. The project includes the universal
qlowenergycontroller* files across all platforms. To accomplish this
the macOS/iOS specific QLowEnergyControllerPrivate interface moved to
the common qlownergycontrollerbase_p.h.
From this point onwards qlowenergycontroller_p.[cpp|h] contains
the dummy backend only.
Change-Id: If2893a32adfb14f47cf85622e943d5f683ad38da
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_p.h')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index d7c60149..01e9420a 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -51,24 +51,6 @@ // We mean it. // -#if defined(QT_OSX_BLUETOOTH) || defined(QT_IOS_BLUETOOTH) - -#include <QtCore/qglobal.h> -#include <QtCore/qobject.h> - -QT_BEGIN_NAMESPACE - -class QLowEnergyControllerPrivate : public QObject -{ -public: - // This class is required to make shared pointer machinery and - // moc (== Obj-C syntax) happy on both OS X and iOS. -}; - -QT_END_NAMESPACE - -#else - #include <qglobal.h> #include <QtCore/QQueue> #include <QtCore/QVector> @@ -130,6 +112,4 @@ public: QT_END_NAMESPACE -#endif // QT_OSX_BLUETOOTH || QT_IOS_BLUETOOTH - #endif // QLOWENERGYCONTROLLERPRIVATE_P_H |