diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-01 08:23:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-01 08:23:55 +0100 |
| commit | 24cd4a71905a481d937cbd5c4cb9fb8bb91532c9 (patch) | |
| tree | 67195b6b5fd1a1ddabc0f622082383ad65c94dfb /mkspecs | |
| parent | aeb169a48869f4f50237e384e57ccb406228f620 (diff) | |
| parent | 1dd0c4bf1af1c90fde1449a81d41acbc62cf1934 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic7aaa06f4a14b1aed61faa1a6e7f527ee0eeb96b
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index abc6198bc7..c5f6353d39 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -105,7 +105,7 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain QMAKE_IDL = midl -QMAKE_LIB = $${CROSS_COMPILE}ar -ru +QMAKE_LIB = $${CROSS_COMPILE}ar -rc QMAKE_RC = $${CROSS_COMPILE}windres QMAKE_STRIP = $${CROSS_COMPILE}strip |