diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-11-02 13:58:54 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-11-08 15:30:39 +0000 |
| commit | aa73a7026fd8093a340b20dacba7b10e5ffa03ac (patch) | |
| tree | 01628d522c78af3ae61ca875fe58a5eb0d5f383e /src/tools/bootstrap/bootstrap.pro | |
| parent | aa7e764058cb820c86341c91360976b6bddfd4da (diff) | |
QStandardPaths: Replace deprecated Win32 SHGetSpecialFolderPath
SHGetSpecialFolderPath is declared 'unsupported' by Microsoft, and has
problems with non-ASCII characters. Replace it by the newer
SHGetKnownFolderPath.
To fix compilation with MinGW, we have to link in libuuid also in
the bootstrapped tools. The alternative is redefining all GUID's
(like we did for FOLDERID_Downloads), which is arguably less elegant.
Task-number: QTBUG-50570
Change-Id: If99be559bc72de3734ae1fa4d50f960659739898
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 0e0a617f2b..d51f9e98a4 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -134,7 +134,10 @@ macx { include(../../3rdparty/zlib_dependency.pri) } -win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 +win32 { + LIBS += -luser32 -lole32 -ladvapi32 -lshell32 + mingw: LIBS += -luuid +} load(qt_module) |