diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-02-24 21:29:26 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-02-24 21:29:26 (GMT) |
| commit | 6e6140c2c0913aa4e750dd8f8eecf0326901d84c (patch) | |
| tree | b33796873117973eadef95ead80855dba7b616c9 | |
| parent | 8dc33637e1444890246cdc05a483187f821aa08d (diff) | |
| parent | 94c2ffda28a7f11232dbdbebaeb4ef1b96426be3 (diff) | |
| download | mxe-6e6140c2c0913aa4e750dd8f8eecf0326901d84c.zip mxe-6e6140c2c0913aa4e750dd8f8eecf0326901d84c.tar.gz mxe-6e6140c2c0913aa4e750dd8f8eecf0326901d84c.tar.bz2 | |
Merge pull request #1236 from tehnick/fix-ar-error-in-qtbase
qtbase: update patch for fixing `ar' error:
| -rw-r--r-- | src/qtbase-1-fixes.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index 093e475..e720936 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -200,3 +200,22 @@ index 1111111..2222222 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF !!ENDIF + +From 3ebc085c4d7488df899f35e9ac63da819dffc1b9 Mon Sep 17 00:00:00 2001 +From: Boris Pek <tehnick-8@yandex.ru> +Date: Wed, 24 Feb 2016 19:39:46 +0300 +Subject: [PATCH] Fix ar error: `u' modifier ignored since `D' is the default (see `U') + +diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf +index 1111111..2222222 100644 +--- a/mkspecs/win32-g++/qmake.conf ++++ b/mkspecs/win32-g++/qmake.conf +@@ -94,7 +94,7 @@ + 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 |