diff options
| -rw-r--r-- | src/systeminfo/systeminfo.pro | 11 | ||||
| -rw-r--r-- | src/systeminfo/windows/qbatteryinfo_win.cpp | 2 | ||||
| -rw-r--r-- | src/systeminfo/windows/qdeviceinfo_win.cpp | 4 | ||||
| -rw-r--r-- | src/systeminfo/windows/qwmihelper_win.cpp | 6 |
4 files changed, 10 insertions, 13 deletions
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro index eaf46e88..1165c3df 100644 --- a/src/systeminfo/systeminfo.pro +++ b/src/systeminfo/systeminfo.pro @@ -44,13 +44,10 @@ win32: !simulator: { windows/qwmihelper_win.cpp LIBS += \ - -lOle32 \ - -lUser32 \ - -lGdi32 \ - -lIphlpapi \ - -lOleaut32 \ - -lPowrProf \ - -lSetupapi + -lole32 \ + -liphlpapi \ + -loleaut32 \ + -lsetupapi win32-g++: { LIBS += -luser32 -lgdi32 diff --git a/src/systeminfo/windows/qbatteryinfo_win.cpp b/src/systeminfo/windows/qbatteryinfo_win.cpp index 19ddfc39..8e41ac6f 100644 --- a/src/systeminfo/windows/qbatteryinfo_win.cpp +++ b/src/systeminfo/windows/qbatteryinfo_win.cpp @@ -48,7 +48,7 @@ #include <setupapi.h> #if !defined (Q_CC_MINGW) || defined(__MINGW64_VERSION_MAJOR) -# include <BatClass.h> +# include <batclass.h> #endif #include <QtCore/qmetaobject.h> diff --git a/src/systeminfo/windows/qdeviceinfo_win.cpp b/src/systeminfo/windows/qdeviceinfo_win.cpp index 257a4f41..408881c8 100644 --- a/src/systeminfo/windows/qdeviceinfo_win.cpp +++ b/src/systeminfo/windows/qdeviceinfo_win.cpp @@ -50,8 +50,8 @@ #include <vfw.h> #if !defined(Q_CC_MINGW) || defined(__MINGW64_VERSION_MAJOR) # include <ws2bth.h> -# include <Bthsdpdef.h> -# include <BluetoothAPIs.h> +# include <bthsdpdef.h> +# include <bluetoothapis.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/systeminfo/windows/qwmihelper_win.cpp b/src/systeminfo/windows/qwmihelper_win.cpp index ce1e83a4..4b0f9bd6 100644 --- a/src/systeminfo/windows/qwmihelper_win.cpp +++ b/src/systeminfo/windows/qwmihelper_win.cpp @@ -46,9 +46,9 @@ #include "qwmihelper_win_p.h" #include <QDebug> -#include <ObjBase.h> -#include <Wbemidl.h> -#include <Oleauto.h> +#include <objbase.h> +#include <wbemidl.h> +#include <oleauto.h> #include <QStringList> #include <QUuid> #include <comutil.h> |