diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2017-07-13 08:52:38 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2017-07-19 08:30:09 +0000 |
| commit | f364358a817ba57fa5aa9c67e731241249e704f8 (patch) | |
| tree | 3aee468b12dfbfc723bb84812c36e8bcb3db3020 | |
| parent | 7f9178d4c6378fe574376d9d0ce234fa5603124e (diff) | |
simulator: Export needed symbols
In order to use these functions from the Emulator they have to be
exported.
Change-Id: I1c09c6328d4f1955d4cbcae91e1e30dcf3b4b963
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| -rw-r--r-- | src/systeminfo/simulator/qsysteminfodata_simulator_p.h | 7 | ||||
| -rw-r--r-- | src/systeminfo/systeminfo.pro | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h index da9065fc..b808eb36 100644 --- a/src/systeminfo/simulator/qsysteminfodata_simulator_p.h +++ b/src/systeminfo/simulator/qsysteminfodata_simulator_p.h @@ -47,6 +47,7 @@ // We mean it. // +#include "private/qsysteminfoglobal_p.h" #include <qbatteryinfo.h> #include <QMetaType> @@ -72,10 +73,10 @@ struct QBatteryInfoData Q_DECLARE_METATYPE(QBatteryInfoData) -void qt_registerSystemInfoTypes(); +Q_SYSTEMINFO_PRIVATE_EXPORT void qt_registerSystemInfoTypes(); -QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s); -QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s); +Q_SYSTEMINFO_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s); +Q_SYSTEMINFO_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s); QT_END_NAMESPACE diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro index 395b8d8b..1620b6fd 100644 --- a/src/systeminfo/systeminfo.pro +++ b/src/systeminfo/systeminfo.pro @@ -189,7 +189,10 @@ QT += core-private simulator { QT_PRIVATE += simulator DEFINES += QT_SIMULATOR - PRIVATE_HEADERS += simulator/qsysteminfodata_simulator_p.h \ + + HEADERS += simulator/qsysteminfodata_simulator_p.h + + PRIVATE_HEADERS += \ linux/qdeviceinfo_linux_p.h \ linux/qnetworkinfo_linux_p.h \ simulator/qsysteminfobackend_simulator_p.h \ |