diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-09-07 13:10:40 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-11-08 09:09:18 +0000 |
| commit | ed872717f45dc0807d6dc59c978c82a4c74369a9 (patch) | |
| tree | 353ec32840033142a19aff4754b8836d4c5de984 | |
| parent | f1f51e406445567dda90e6456ada01bc5ea39ba7 (diff) | |
Fix namespaced simulator build
Change-Id: I2b33840e19d2903853ca20f6e738b5ab497bec16
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| -rw-r--r-- | src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h | 4 | ||||
| -rw-r--r-- | src/systeminfo/simulator/qsysteminfodata_simulator_p.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h b/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h index f7d24889..6874f277 100644 --- a/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h +++ b/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h @@ -50,6 +50,8 @@ #include <QObject> +QT_BEGIN_NAMESPACE + class QSimulatorConnection; class QSimulatorConnectionWorker; @@ -76,4 +78,6 @@ private: QSimulatorConnectionWorker *mWorker; }; +QT_END_NAMESPACE + #endif // QSYSTEMINFOCONNECTION_SIMULATOR_P_H diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h index b808eb36..9534cbf7 100644 --- a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h +++ b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h @@ -71,8 +71,6 @@ struct QBatteryInfoData float temperature; }; -Q_DECLARE_METATYPE(QBatteryInfoData) - Q_SYSTEMINFO_PRIVATE_EXPORT void qt_registerSystemInfoTypes(); Q_SYSTEMINFO_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s); @@ -80,4 +78,6 @@ Q_SYSTEMINFO_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &in, QBatteryInf QT_END_NAMESPACE +Q_DECLARE_METATYPE(QBatteryInfoData) + #endif // QSYSTEMINFODATA_SIMULATOR_P_H |