Mercurial > mxe-octave

comparison src/qt-1-cherrypicks.patch @ 1711:39f91df0fd34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package qt: fixed -enable-stdcall-fixup
author Mark Brand <mabrand@mabrand.nl>
date Sun, 27 Mar 2011 20:58:31 +0200
parents 81169b06f296
children 1a22655f516b
comparison
equal deleted inserted replaced
1710:d3bf5db5a40f 1711:39f91df0fd34
5 http://qt.gitorious.org/qt 5 http://qt.gitorious.org/qt
6 6
7 From 8f36bff28b648f65845cd56255a6c5b2cb7f8e42 Mon Sep 17 00:00:00 2001 7 From 8f36bff28b648f65845cd56255a6c5b2cb7f8e42 Mon Sep 17 00:00:00 2001
8 From: Mark Brand <mabrand@mabrand.nl> 8 From: Mark Brand <mabrand@mabrand.nl>
9 Date: Fri, 15 Oct 2010 14:56:03 +0200 9 Date: Fri, 15 Oct 2010 14:56:03 +0200
10 Subject: [PATCH 01/12] removed obsolete -qt-gif configure option 10 Subject: [PATCH 01/14] removed obsolete -qt-gif configure option
11 11
12 Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary 12 Since "-system-gif" is not offered, offering "-qt-gif" is unnecessary
13 and perhaps misleading. By default the GIF handler is built from code 13 and perhaps misleading. By default the GIF handler is built from code
14 included with Qt, unless suppressed by "-no-gif". 14 included with Qt, unless suppressed by "-no-gif".
15 15
88 88
89 89
90 From 6f97b6dab051bc2899907ac794495bc7542d4337 Mon Sep 17 00:00:00 2001 90 From 6f97b6dab051bc2899907ac794495bc7542d4337 Mon Sep 17 00:00:00 2001
91 From: Mark Brand <mabrand@mabrand.nl> 91 From: Mark Brand <mabrand@mabrand.nl>
92 Date: Mon, 10 Jan 2011 16:41:54 +0100 92 Date: Mon, 10 Jan 2011 16:41:54 +0100
93 Subject: [PATCH 02/12] qmake: fix double directory separator 93 Subject: [PATCH 02/14] qmake: fix double directory separator
94 94
95 Merge-request: 2543 95 Merge-request: 2543
96 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> 96 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
97 (cherry picked from commit 89886a34d7c4fdacc472f6e1498bc0769f2302ad) 97 (cherry picked from commit 89886a34d7c4fdacc472f6e1498bc0769f2302ad)
98 --- 98 ---
124 124
125 125
126 From da69fe08f058ac49788559d333bcec747b94d208 Mon Sep 17 00:00:00 2001 126 From da69fe08f058ac49788559d333bcec747b94d208 Mon Sep 17 00:00:00 2001
127 From: Mark Brand <mabrand@mabrand.nl> 127 From: Mark Brand <mabrand@mabrand.nl>
128 Date: Mon, 10 Jan 2011 16:41:55 +0100 128 Date: Mon, 10 Jan 2011 16:41:55 +0100
129 Subject: [PATCH 03/12] qmake: don't limit pkg-config writing to unix generator 129 Subject: [PATCH 03/14] qmake: don't limit pkg-config writing to unix generator
130 130
131 Move pkg-config related methods from unix generator to base class 131 Move pkg-config related methods from unix generator to base class
132 so they can be used by other generators too. 132 so they can be used by other generators too.
133 133
134 Merge-request: 2543 134 Merge-request: 2543
551 551
552 552
553 From c870095011276897127ed801570d0b4cce79d552 Mon Sep 17 00:00:00 2001 553 From c870095011276897127ed801570d0b4cce79d552 Mon Sep 17 00:00:00 2001
554 From: Mark Brand <mabrand@mabrand.nl> 554 From: Mark Brand <mabrand@mabrand.nl>
555 Date: Mon, 10 Jan 2011 16:41:56 +0100 555 Date: Mon, 10 Jan 2011 16:41:56 +0100
556 Subject: [PATCH 04/12] qmake: write and install pkg-config files for mingw 556 Subject: [PATCH 04/14] qmake: write and install pkg-config files for mingw
557 557
558 Merge-request: 2543 558 Merge-request: 2543
559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> 559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
560 (cherry picked from commit f18aca79a233c71f7a4bc72c9e31de948ba43c31) 560 (cherry picked from commit f18aca79a233c71f7a4bc72c9e31de948ba43c31)
561 --- 561 ---
605 605
606 606
607 From 8414d5630e66546be5d5eb0e832c80dcddea5d77 Mon Sep 17 00:00:00 2001 607 From 8414d5630e66546be5d5eb0e832c80dcddea5d77 Mon Sep 17 00:00:00 2001
608 From: Mark Brand <mabrand@mabrand.nl> 608 From: Mark Brand <mabrand@mabrand.nl>
609 Date: Mon, 10 Jan 2011 16:41:57 +0100 609 Date: Mon, 10 Jan 2011 16:41:57 +0100
610 Subject: [PATCH 05/12] qt project files: create pkg-config files for mingw 610 Subject: [PATCH 05/14] qt project files: create pkg-config files for mingw
611 611
612 This is mostly the same as for unix. 612 This is mostly the same as for unix.
613 613
614 Merge-request: 2543 614 Merge-request: 2543
615 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> 615 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
938 938
939 939
940 From 1cf4420ae5221d649880cc0d2e1b1895a19ad106 Mon Sep 17 00:00:00 2001 940 From 1cf4420ae5221d649880cc0d2e1b1895a19ad106 Mon Sep 17 00:00:00 2001
941 From: Mark Brand <mabrand@mabrand.nl> 941 From: Mark Brand <mabrand@mabrand.nl>
942 Date: Mon, 10 Jan 2011 20:21:05 +0100 942 Date: Mon, 10 Jan 2011 20:21:05 +0100
943 Subject: [PATCH 06/12] Fix static build on Windows with MinGW. 943 Subject: [PATCH 06/14] Fix static build on Windows with MinGW.
944 944
945 Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for 945 Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for
946 static code. 946 static code.
947 947
948 Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when 948 Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when
1125 1125
1126 1126
1127 From e285e9993d4f2c6823782840d89f44c1bab74afa Mon Sep 17 00:00:00 2001 1127 From e285e9993d4f2c6823782840d89f44c1bab74afa Mon Sep 17 00:00:00 2001
1128 From: Bernhard Rosenkraenzer <br@blankpage.ch> 1128 From: Bernhard Rosenkraenzer <br@blankpage.ch>
1129 Date: Thu, 27 Jan 2011 13:48:13 +0100 1129 Date: Thu, 27 Jan 2011 13:48:13 +0100
1130 Subject: [PATCH 07/12] Allow the user to select imageformats to be built as plugin vs internal 1130 Subject: [PATCH 07/14] Allow the user to select imageformats to be built as plugin vs internal
1131 1131
1132 This adds what is already there for different plugin types to 1132 This adds what is already there for different plugin types to
1133 imageformats plugins -- allowing the user to configure which 1133 imageformats plugins -- allowing the user to configure which
1134 image formats will be built into Qt and which will be built as 1134 image formats will be built into Qt and which will be built as
1135 plugins. 1135 plugins.
1233 1233
1234 1234
1235 From 095583fb68a8ae02fd16790eaaa922693d268443 Mon Sep 17 00:00:00 2001 1235 From 095583fb68a8ae02fd16790eaaa922693d268443 Mon Sep 17 00:00:00 2001
1236 From: Mark Brand <mabrand@mabrand.nl> 1236 From: Mark Brand <mabrand@mabrand.nl>
1237 Date: Tue, 16 Nov 2010 20:06:28 +0100 1237 Date: Tue, 16 Nov 2010 20:06:28 +0100
1238 Subject: [PATCH 08/12] explicitly include -llcms for -lmng (mingw-cross-env specific) 1238 Subject: [PATCH 08/14] explicitly include -llcms for -lmng (mingw-cross-env specific)
1239 1239
1240 --- 1240 ---
1241 src/gui/image/qmnghandler.pri | 2 +- 1241 src/gui/image/qmnghandler.pri | 2 +-
1242 1 files changed, 1 insertions(+), 1 deletions(-) 1242 1 files changed, 1 insertions(+), 1 deletions(-)
1243 1243
1259 1259
1260 1260
1261 From 3baf871e135d70edbc2431038708886d2795b8b3 Mon Sep 17 00:00:00 2001 1261 From 3baf871e135d70edbc2431038708886d2795b8b3 Mon Sep 17 00:00:00 2001
1262 From: Mark Brand <mabrand@mabrand.nl> 1262 From: Mark Brand <mabrand@mabrand.nl>
1263 Date: Sat, 5 Jun 2010 23:41:04 +0200 1263 Date: Sat, 5 Jun 2010 23:41:04 +0200
1264 Subject: [PATCH 09/12] added missing INSTALLS to JavaScriptCore.pro for static libjscore (mingw-cross-env specific) 1264 Subject: [PATCH 09/14] added missing INSTALLS to JavaScriptCore.pro for static libjscore (mingw-cross-env specific)
1265 1265
1266 For static build of Qt on win32-g++*, applications using webkit 1266 For static build of Qt on win32-g++*, applications using webkit
1267 link to libjscore.a. 1267 link to libjscore.a.
1268 --- 1268 ---
1269 .../webkit/JavaScriptCore/JavaScriptCore.pro | 6 ++++++ 1269 .../webkit/JavaScriptCore/JavaScriptCore.pro | 6 ++++++
1291 1291
1292 1292
1293 From 9e5d4702daa1168ab14ba936014dd6a7bb5671c9 Mon Sep 17 00:00:00 2001 1293 From 9e5d4702daa1168ab14ba936014dd6a7bb5671c9 Mon Sep 17 00:00:00 2001
1294 From: Mark Brand <mabrand@mabrand.nl> 1294 From: Mark Brand <mabrand@mabrand.nl>
1295 Date: Tue, 9 Nov 2010 20:09:45 +0100 1295 Date: Tue, 9 Nov 2010 20:09:45 +0100
1296 Subject: [PATCH 10/12] Partially restored support for static linking of QtWebKit (mingw-cross-env specific) 1296 Subject: [PATCH 10/14] Partially restored support for static linking of QtWebKit (mingw-cross-env specific)
1297 1297
1298 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. 1298 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
1299 Static QtWebkit might be supported by mingw-cross-env. 1299 Static QtWebkit might be supported by mingw-cross-env.
1300 --- 1300 ---
1301 configure | 6 ------ 1301 configure | 6 ------
1323 1323
1324 1324
1325 From 61064254a0c5c2c3785909acf60cabdbdcb18d5b Mon Sep 17 00:00:00 2001 1325 From 61064254a0c5c2c3785909acf60cabdbdcb18d5b Mon Sep 17 00:00:00 2001
1326 From: Mark Brand <mabrand@mabrand.nl> 1326 From: Mark Brand <mabrand@mabrand.nl>
1327 Date: Thu, 6 Jan 2011 14:21:32 +0100 1327 Date: Thu, 6 Jan 2011 14:21:32 +0100
1328 Subject: [PATCH 11/12] pkg-config file for jscore (mingw-cross-env specific) 1328 Subject: [PATCH 11/14] pkg-config file for jscore (mingw-cross-env specific)
1329 1329
1330 --- 1330 ---
1331 .../webkit/JavaScriptCore/JavaScriptCore.pro | 8 ++++++++ 1331 .../webkit/JavaScriptCore/JavaScriptCore.pro | 8 ++++++++
1332 1 files changed, 8 insertions(+), 0 deletions(-) 1332 1 files changed, 8 insertions(+), 0 deletions(-)
1333 1333
1352 1352
1353 1353
1354 From 0ad5aac2fdc0f2e81f94c92867bb4e15b3da3ddf Mon Sep 17 00:00:00 2001 1354 From 0ad5aac2fdc0f2e81f94c92867bb4e15b3da3ddf Mon Sep 17 00:00:00 2001
1355 From: Tony Theodore <tonyt@logyst.com> 1355 From: Tony Theodore <tonyt@logyst.com>
1356 Date: Mon, 21 Feb 2011 22:22:04 +0100 1356 Date: Mon, 21 Feb 2011 22:22:04 +0100
1357 Subject: [PATCH 12/12] workaround for native build on OSX (mingw-cross-env specific) 1357 Subject: [PATCH 12/14] workaround for native build on OSX (mingw-cross-env specific)
1358 1358
1359 The native build complains about: 1359 The native build complains about:
1360 "You are building a 64-bit application, but using a 32-bit version of 1360 "You are building a 64-bit application, but using a 32-bit version of
1361 Qt. Check your build configuration." 1361 Qt. Check your build configuration."
1362 --- 1362 ---
1379 include(../common/mac-g++.conf) 1379 include(../common/mac-g++.conf)
1380 1380
1381 -- 1381 --
1382 1.7.4.1 1382 1.7.4.1
1383 1383
1384
1385 From db85d5c4df98ee12261f62fa637e629b120680a6 Mon Sep 17 00:00:00 2001
1386 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
1387 Date: Mon, 10 Jan 2011 20:09:24 +0100
1388 Subject: [PATCH 13/14] fix -enable-stdcall-fixup usage
1389
1390 the leading "-Wl," was apparently accidentally split off to the wrong
1391 line.
1392
1393 Task-number: QTBUG-15391
1394 Reviewed-by: mariusSO
1395 (cherry picked from commit 0953ee31dba532603fb7dfbde78c99aafb048bef)
1396 ---
1397 mkspecs/win32-g++/qmake.conf | 4 ++--
1398 1 files changed, 2 insertions(+), 2 deletions(-)
1399
1400 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
1401 index ec216aa..2d9833b 100644
1402 --- a/mkspecs/win32-g++/qmake.conf
1403 +++ b/mkspecs/win32-g++/qmake.conf
1404 @@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
1405
1406 QMAKE_LINK = g++
1407 QMAKE_LINK_C = gcc
1408 -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
1409 -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
1410 +QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
1411 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
1412 QMAKE_LFLAGS_EXCEPTIONS_OFF =
1413 QMAKE_LFLAGS_RELEASE = -Wl,-s
1414 QMAKE_LFLAGS_DEBUG =
1415 --
1416 1.7.4.1
1417
1418
1419 From ed4c5f0a04a90da94c1b9ea9cd504b7ad1e14ae1 Mon Sep 17 00:00:00 2001
1420 From: Mark Brand <mabrand@mabrand.nl>
1421 Date: Sun, 27 Mar 2011 20:55:48 +0200
1422 Subject: [PATCH 14/14] fix -enable-stdcall-fixup usage
1423
1424 the leading "-Wl," was apparently accidentally split off to the wrong
1425 line.
1426
1427 Originally done in 0953ee3 for mkspecs/win32-g++.
1428 ---
1429 mkspecs/unsupported/win32-g++-cross/qmake.conf | 4 ++--
1430 1 files changed, 2 insertions(+), 2 deletions(-)
1431
1432 diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
1433 index 7e077a1..efc3de2 100644
1434 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
1435 +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf
1436 @@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
1437
1438 QMAKE_LINK = i686-pc-mingw32-g++
1439 QMAKE_LINK_C = i686-pc-mingw32-gcc
1440 -QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
1441 -QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
1442 +QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
1443 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
1444 QMAKE_LFLAGS_EXCEPTIONS_OFF =
1445 QMAKE_LFLAGS_RELEASE = -Wl,-s
1446 QMAKE_LFLAGS_DEBUG =
1447 --
1448 1.7.4.1
1449