diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-28 12:01:17 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-29 12:47:36 +0000 |
| commit | a962e43e51d49dff577095a3b8ae4632056b8aa1 (patch) | |
| tree | 1015c1a710dc5517e8173313ad7d3f9459df1d40 | |
| parent | 4d554a4e0817d69ca77edec0d6ee31087c7cc016 (diff) | |
Fix build with MinGW
Change-Id: I140df0ad6b7e6ab9c2366df632d10cbef35e5a7b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | src/lib/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/filetime_win.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro index 5118cf782..0ca2b1d19 100644 --- a/src/lib/corelib/corelib.pro +++ b/src/lib/corelib/corelib.pro @@ -21,7 +21,7 @@ include(logging/logging.pri) include(parser/parser.pri) include(tools/tools.pri) -win32:LIBS += Psapi.lib +win32:LIBS += -lpsapi HEADERS += \ qbs.h diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index cdaa0c238..eb158dd7f 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -19,7 +19,7 @@ QbsLibrary { "SRCDIR=\"" + path + "\"" ]).concat(projectFileUpdateDefines) cpp.dynamicLibraries: base.concat(qbs.targetOS.contains("windows") - ? ["Psapi.lib"] : []) + ? ["Psapi"] : []) Properties { condition: qbs.targetOS.contains("darwin") diff --git a/src/lib/corelib/tools/filetime_win.cpp b/src/lib/corelib/tools/filetime_win.cpp index c8479df72..9dbc39212 100644 --- a/src/lib/corelib/tools/filetime_win.cpp +++ b/src/lib/corelib/tools/filetime_win.cpp @@ -105,7 +105,7 @@ QString FileTime::toString() const stLocal.wMilliseconds); return SUCCEEDED(hr) ? QString::fromWCharArray(szString) : QString(); #else // Q_CC_MSVC - const QString result = QString("%1.%2.%3 %4:%5:%6") + const QString result = QString::fromLatin1("%1.%2.%3 %4:%5:%6") .arg(stLocal.wDay, 2, 10, QLatin1Char('0')).arg(stLocal.wMonth, 2, 10, QLatin1Char('0')).arg(stLocal.wYear) .arg(stLocal.wHour, 2, 10, QLatin1Char('0')).arg(stLocal.wMinute, 2, 10, QLatin1Char('0')).arg(stLocal.wSecond, 2, 10, QLatin1Char('0')); return result; |