diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-05-23 21:26:26 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-05-24 08:06:07 +0000 |
| commit | cede3e176386a835f0f5d348dfce964d65d4772c (patch) | |
| tree | f6e403d1570636ada95cf58c34bfd12533bd8baa | |
| parent | eb78330fcf98e56968ae5d436d17bc114b8a4890 (diff) | |
Fix build errors when cross-building Qbs with MinGW on Linux
Linux file systems are case-sensitive while Windows file systems are
usually not. That results in build errors when includes or libraries
are incorrectly cased. Such errors wouldn't be noticed on Windows,
but only when cross-building Qbs with MinGW on Linux.
Change-Id: I3a340f907deaaf75b91369330d35918d70de56ca
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/processutils.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/vsenvironmentdetector.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index db00a7005..a9ca5131a 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -37,7 +37,7 @@ QbsLibrary { Properties { condition: qbs.targetOS.contains("windows") - cpp.dynamicLibraries: base.concat(["Psapi", "shell32"]) + cpp.dynamicLibraries: base.concat(["psapi", "shell32"]) } cpp.dynamicLibraries: base diff --git a/src/lib/corelib/tools/processutils.cpp b/src/lib/corelib/tools/processutils.cpp index 060a0577e..04a061e0c 100644 --- a/src/lib/corelib/tools/processutils.cpp +++ b/src/lib/corelib/tools/processutils.cpp @@ -42,7 +42,7 @@ #if defined(Q_OS_WIN) # define PSAPI_VERSION 1 // To use GetModuleFileNameEx from Psapi.lib on all Win versions. # include <QtCore/qt_windows.h> -# include <Psapi.h> +# include <psapi.h> #elif defined(Q_OS_DARWIN) # include <libproc.h> #elif defined(Q_OS_LINUX) diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp index 90f6b8921..f8f98e7b7 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.cpp +++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp @@ -53,7 +53,7 @@ #ifdef Q_OS_WIN #include <QtCore/qt_windows.h> -#include <ShlObj.h> +#include <shlobj.h> #endif namespace qbs { |