diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-09-07 13:10:58 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-11-08 09:09:09 +0000 |
| commit | f1f51e406445567dda90e6456ada01bc5ea39ba7 (patch) | |
| tree | e69256c0af5e4a17fcd6bcf11b27aaf4954ba688 | |
| parent | 9c204e05ae7fefe9525b30238b469b1bb65d2537 (diff) | |
Fix simulator build for Windows
Change-Id: Ic564afebdaa9cb7b5fb16766e89b7e90e8d047ce
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| -rw-r--r-- | src/systeminfo/systeminfo.pro | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro index cc9b861c..b174085d 100644 --- a/src/systeminfo/systeminfo.pro +++ b/src/systeminfo/systeminfo.pro @@ -13,7 +13,7 @@ SOURCES += qdeviceinfo.cpp \ qbatteryinfo.cpp \ qnetworkinfo.cpp -win32: !simulator: { +win32 { # Wbemidl.h violates C/C++ strict strings QMAKE_CXXFLAGS -= -Zc:strictStrings QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings @@ -53,6 +53,8 @@ win32: !simulator: { win32-g++: { LIBS += -luser32 -lgdi32 } + + DEFINES += QT_NO_MIR QT_NO_UDEV } linux-*: !simulator: { @@ -194,8 +196,6 @@ simulator { PRIVATE_HEADERS += \ qinputinfomanager_p.h \ - linux/qdeviceinfo_linux_p.h \ - linux/qnetworkinfo_linux_p.h \ simulator/qsysteminfobackend_simulator_p.h \ simulator/qsysteminfoconnection_simulator_p.h \ simulator/qsysteminfo_simulator_p.h @@ -203,8 +203,6 @@ simulator { SOURCES += simulator/qsysteminfodata_simulator.cpp \ qinputinfo.cpp \ - linux/qdeviceinfo_linux.cpp \ - linux/qnetworkinfo_linux.cpp \ qinputinfomanager.cpp \ simulator/qsysteminfobackend_simulator.cpp \ simulator/qsysteminfoconnection_simulator.cpp \ @@ -215,9 +213,13 @@ simulator { linux-*: { PRIVATE_HEADERS += \ + linux/qdeviceinfo_linux_p.h \ + linux/qnetworkinfo_linux_p.h \ linux/qscreensaver_linux_p.h SOURCES += \ + linux/qdeviceinfo_linux.cpp \ + linux/qnetworkinfo_linux.cpp \ linux/qscreensaver_linux.cpp x11|config_x11 { |