Mercurial > mxe-octave

comparison src/qt-1-cherrypicks.patch @ 1811:162f2ce3e82e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package qt
author Mark Brand <mabrand@mabrand.nl>
date Tue, 10 May 2011 11:15:28 +0200
parents 1a22655f516b
children 5d6de750041c
comparison
equal deleted inserted replaced
1810:3cecbd3a603b 1811:162f2ce3e82e
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 Commits backported (cherry-picked) from Qt 4.7 branch. 4 Commits backported (cherry-picked) from Qt 4.7 branch.
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 bb75d02785da59c967dee09006700488af9f482e 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/16] removed obsolete -qt-gif configure option 10 Subject: [PATCH 01/16] 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
82 - desc("GIF", "auto", "-qt-gif", "Compile GIF reading support.\nSee also src/gui/image/qgifhandler_p.h\n"); 82 - desc("GIF", "auto", "-qt-gif", "Compile GIF reading support.\nSee also src/gui/image/qgifhandler_p.h\n");
83 83
84 desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support."); 84 desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support.");
85 desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt."); 85 desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt.");
86 -- 86 --
87 1.7.4.1 87 1.7.4.2
88 88
89 89
90 From 6f97b6dab051bc2899907ac794495bc7542d4337 Mon Sep 17 00:00:00 2001 90 From b5e382d8335628edf5d5c5a1671682de7c50c6d2 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/16] qmake: fix double directory separator 93 Subject: [PATCH 02/16] qmake: fix double directory separator
94 94
95 Merge-request: 2543 95 Merge-request: 2543
118 + } 118 + }
119 if(fixify) { 119 if(fixify) {
120 if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) 120 if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
121 ret.prepend(project->first("DESTDIR")); 121 ret.prepend(project->first("DESTDIR"));
122 -- 122 --
123 1.7.4.1 123 1.7.4.2
124 124
125 125
126 From da69fe08f058ac49788559d333bcec747b94d208 Mon Sep 17 00:00:00 2001 126 From f35c452aaf665489060d317ce180d192433abd24 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/16] qmake: don't limit pkg-config writing to unix generator 129 Subject: [PATCH 03/16] 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
545 - t << endl; 545 - t << endl;
546 -} 546 -}
547 - 547 -
548 QT_END_NAMESPACE 548 QT_END_NAMESPACE
549 -- 549 --
550 1.7.4.1 550 1.7.4.2
551 551
552 552
553 From c870095011276897127ed801570d0b4cce79d552 Mon Sep 17 00:00:00 2001 553 From e8afbb5a998931c154aa83ed87be6521cb8d50d3 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/16] qmake: write and install pkg-config files for mingw 556 Subject: [PATCH 04/16] qmake: write and install pkg-config files for mingw
557 557
558 Merge-request: 2543 558 Merge-request: 2543
599 + } 599 + }
600 if(project->isActiveConfig("shared") && !project->isActiveConfig("plugin")) { 600 if(project->isActiveConfig("shared") && !project->isActiveConfig("plugin")) {
601 QString lib_target = getLibTarget(); 601 QString lib_target = getLibTarget();
602 lib_target.remove('"'); 602 lib_target.remove('"');
603 -- 603 --
604 1.7.4.1 604 1.7.4.2
605 605
606 606
607 From 8414d5630e66546be5d5eb0e832c80dcddea5d77 Mon Sep 17 00:00:00 2001 607 From 175b395655d3f24aea0e4232069853dca1c33efd 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/16] qt project files: create pkg-config files for mingw 610 Subject: [PATCH 05/16] 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.
757 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork 757 +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
758 758
759 # Input 759 # Input
760 HEADERS += $$PHONON_DIR/abstractaudiooutput.h \ 760 HEADERS += $$PHONON_DIR/abstractaudiooutput.h \
761 diff --git a/src/qbase.pri b/src/qbase.pri 761 diff --git a/src/qbase.pri b/src/qbase.pri
762 index 75da3dc..b50f9c6 100644 762 index babea56..a72bc76 100644
763 --- a/src/qbase.pri 763 --- a/src/qbase.pri
764 +++ b/src/qbase.pri 764 +++ b/src/qbase.pri
765 @@ -152,6 +152,14 @@ unix:!symbian { 765 @@ -152,6 +152,14 @@ unix:!symbian {
766 QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace 766 QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace prefix_replace
767 } 767 }
932 +unix|win32-g++* { 932 +unix|win32-g++* {
933 CONFIG += create_pc 933 CONFIG += create_pc
934 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] 934 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
935 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET 935 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
936 -- 936 --
937 1.7.4.1 937 1.7.4.2
938 938
939 939
940 From 1cf4420ae5221d649880cc0d2e1b1895a19ad106 Mon Sep 17 00:00:00 2001 940 From 5ef7985e6015c09735094545a07ed93832075507 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/16] Fix static build on Windows with MinGW. 943 Subject: [PATCH 06/16] 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
1071 +Q_GUI_EXPORT int qt_defaultDpiY(); 1071 +Q_GUI_EXPORT int qt_defaultDpiY();
1072 1072
1073 int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const 1073 int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
1074 { 1074 {
1075 diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp 1075 diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
1076 index c2a4c9b..d273d33 100644 1076 index ec2936e..af077e4 100644
1077 --- a/src/openvg/qpaintengine_vg.cpp 1077 --- a/src/openvg/qpaintengine_vg.cpp
1078 +++ b/src/openvg/qpaintengine_vg.cpp 1078 +++ b/src/openvg/qpaintengine_vg.cpp
1079 @@ -77,8 +77,8 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; 1079 @@ -77,8 +77,8 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
1080 1080
1081 #if !defined(QVG_NO_DRAW_GLYPHS) 1081 #if !defined(QVG_NO_DRAW_GLYPHS)
1119 +Q_GUI_EXPORT int qt_defaultDpiY(); 1119 +Q_GUI_EXPORT int qt_defaultDpiY();
1120 1120
1121 int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const 1121 int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
1122 { 1122 {
1123 -- 1123 --
1124 1.7.4.1 1124 1.7.4.2
1125 1125
1126 1126
1127 From e285e9993d4f2c6823782840d89f44c1bab74afa Mon Sep 17 00:00:00 2001 1127 From 3411ae8c3d83b3eb9407c8c338336e95fe74edf3 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/16] Allow the user to select imageformats to be built as plugin vs internal 1130 Subject: [PATCH 07/16] 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
1227 + dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "no"; 1227 + dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "no";
1228 #endif 1228 #endif
1229 // IDE project generation ----------------------------------- 1229 // IDE project generation -----------------------------------
1230 else if (configCmdLine.at(i) == "-no-dsp") 1230 else if (configCmdLine.at(i) == "-no-dsp")
1231 -- 1231 --
1232 1.7.4.1 1232 1.7.4.2
1233 1233
1234 1234
1235 From 095583fb68a8ae02fd16790eaaa922693d268443 Mon Sep 17 00:00:00 2001 1235 From 8d719e67c51987fb6439ea1d05a2b10684b974e1 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/16] explicitly include -llcms for -lmng (mingw-cross-env specific) 1238 Subject: [PATCH 08/16] explicitly include -llcms for -lmng (mingw-cross-env specific)
1239 1239
1240 --- 1240 ---
1253 + if(unix|win32-g++*):LIBS += -lmng -llcms 1253 + if(unix|win32-g++*):LIBS += -lmng -llcms
1254 else:win32: LIBS += libmng.lib 1254 else:win32: LIBS += libmng.lib
1255 } else { 1255 } else {
1256 include($$PWD/../../3rdparty/libmng.pri) 1256 include($$PWD/../../3rdparty/libmng.pri)
1257 -- 1257 --
1258 1.7.4.1 1258 1.7.4.2
1259 1259
1260 1260
1261 From 3baf871e135d70edbc2431038708886d2795b8b3 Mon Sep 17 00:00:00 2001 1261 From c34bd635af9263d1a719cd270db123b1a787640c 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/16] added missing INSTALLS to JavaScriptCore.pro for static libjscore (mingw-cross-env specific) 1264 Subject: [PATCH 09/16] 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
1285 + 1285 +
1286 contains(QT_CONFIG, embedded):CONFIG += embedded 1286 contains(QT_CONFIG, embedded):CONFIG += embedded
1287 1287
1288 CONFIG(QTDIR_build) { 1288 CONFIG(QTDIR_build) {
1289 -- 1289 --
1290 1.7.4.1 1290 1.7.4.2
1291 1291
1292 1292
1293 From 9e5d4702daa1168ab14ba936014dd6a7bb5671c9 Mon Sep 17 00:00:00 2001 1293 From c56ec08a3e3af1a9beae552872b443c6a7cf401c 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/16] Partially restored support for static linking of QtWebKit (mingw-cross-env specific) 1296 Subject: [PATCH 10/16] 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.
1317 -fi 1317 -fi
1318 1318
1319 CFG_CONCURRENT="yes" 1319 CFG_CONCURRENT="yes"
1320 if [ "$canBuildQtConcurrent" = "no" ]; then 1320 if [ "$canBuildQtConcurrent" = "no" ]; then
1321 -- 1321 --
1322 1.7.4.1 1322 1.7.4.2
1323 1323
1324 1324
1325 From 61064254a0c5c2c3785909acf60cabdbdcb18d5b Mon Sep 17 00:00:00 2001 1325 From 074e13614d6071247600eea3c3d6a1f4c4f4a0d5 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/16] pkg-config file for jscore (mingw-cross-env specific) 1328 Subject: [PATCH 11/16] pkg-config file for jscore (mingw-cross-env specific)
1329 1329
1330 --- 1330 ---
1346 + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET 1346 + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
1347 + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS] 1347 + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
1348 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig 1348 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig
1349 +} 1349 +}
1350 -- 1350 --
1351 1.7.4.1 1351 1.7.4.2
1352 1352
1353 1353
1354 From 0ad5aac2fdc0f2e81f94c92867bb4e15b3da3ddf Mon Sep 17 00:00:00 2001 1354 From c907c7c1f0922416fd5f19cb477b71c6f97fee45 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/16] workaround for native build on OSX (mingw-cross-env specific) 1357 Subject: [PATCH 12/16] workaround for native build on OSX (mingw-cross-env specific)
1358 1358
1359 The native build complains about: 1359 The native build complains about:
1377 +QMAKE_CXX = g++ -arch i386 1377 +QMAKE_CXX = g++ -arch i386
1378 1378
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.2
1383 1383
1384 1384
1385 From db85d5c4df98ee12261f62fa637e629b120680a6 Mon Sep 17 00:00:00 2001 1385 From ac552171a0729e1fae026741e4ec89a415298667 Mon Sep 17 00:00:00 2001
1386 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> 1386 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
1387 Date: Mon, 10 Jan 2011 20:09:24 +0100 1387 Date: Mon, 10 Jan 2011 20:09:24 +0100
1388 Subject: [PATCH 13/16] fix -enable-stdcall-fixup usage 1388 Subject: [PATCH 13/16] fix -enable-stdcall-fixup usage
1389 1389
1390 the leading "-Wl," was apparently accidentally split off to the wrong 1390 the leading "-Wl," was apparently accidentally split off to the wrong
1411 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads 1411 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
1412 QMAKE_LFLAGS_EXCEPTIONS_OFF = 1412 QMAKE_LFLAGS_EXCEPTIONS_OFF =
1413 QMAKE_LFLAGS_RELEASE = -Wl,-s 1413 QMAKE_LFLAGS_RELEASE = -Wl,-s
1414 QMAKE_LFLAGS_DEBUG = 1414 QMAKE_LFLAGS_DEBUG =
1415 -- 1415 --
1416 1.7.4.1 1416 1.7.4.2
1417 1417
1418 1418
1419 From 201fa69318fa3367463bbda1c14857eaa0622dab Mon Sep 17 00:00:00 2001 1419 From 0e32298cb08ef1168dc6c06dd48bab8ee62c6e5d Mon Sep 17 00:00:00 2001
1420 From: Mark Brand <mabrand@mabrand.nl> 1420 From: Mark Brand <mabrand@mabrand.nl>
1421 Date: Mon, 28 Mar 2011 13:33:58 +0200 1421 Date: Mon, 28 Mar 2011 13:33:58 +0200
1422 Subject: [PATCH 14/16] fix -enable-stdcall-fixup usage 1422 Subject: [PATCH 14/16] fix -enable-stdcall-fixup usage
1423 1423
1424 the leading "-Wl," was apparently accidentally split off to the wrong 1424 the leading "-Wl," was apparently accidentally split off to the wrong
1447 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads 1447 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
1448 QMAKE_LFLAGS_EXCEPTIONS_OFF = 1448 QMAKE_LFLAGS_EXCEPTIONS_OFF =
1449 QMAKE_LFLAGS_RELEASE = -Wl,-s 1449 QMAKE_LFLAGS_RELEASE = -Wl,-s
1450 QMAKE_LFLAGS_DEBUG = 1450 QMAKE_LFLAGS_DEBUG =
1451 -- 1451 --
1452 1.7.4.1 1452 1.7.4.2
1453 1453
1454 1454
1455 From fb824ac4fa8cc94269c0f02128f68b473693f3e3 Mon Sep 17 00:00:00 2001 1455 From 0a9731cad65337c7084791b54db8bfeb0939dc7d Mon Sep 17 00:00:00 2001
1456 From: Jonathan Liu <net147@gmail.com> 1456 From: Jonathan Liu <net147@gmail.com>
1457 Date: Mon, 4 Apr 2011 13:01:48 +0200 1457 Date: Mon, 4 Apr 2011 13:01:48 +0200
1458 Subject: [PATCH 15/16] win32-g++: Correct the order of linked Windows libraries 1458 Subject: [PATCH 15/16] win32-g++: Correct the order of linked Windows libraries
1459 1459
1460 On Windows 7, kernel32.dll exports many of the same functions as 1460 On Windows 7, kernel32.dll exports many of the same functions as
1528 + win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 1528 + win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32
1529 } 1529 }
1530 1530
1531 qnx { 1531 qnx {
1532 -- 1532 --
1533 1.7.4.1 1533 1.7.4.2
1534 1534
1535 1535
1536 From aeea4172988bd2963d040128fa3fa3fb568f5482 Mon Sep 17 00:00:00 2001 1536 From c4a1848f4178fe99daa2c12ad1f14e8de14cc389 Mon Sep 17 00:00:00 2001
1537 From: Mark Brand <mabrand@mabrand.nl> 1537 From: Mark Brand <mabrand@mabrand.nl>
1538 Date: Mon, 4 Apr 2011 23:09:58 +0200 1538 Date: Tue, 5 Apr 2011 10:35:58 +0200
1539 Subject: [PATCH 16/16] win32-g++: Correct the order of linked Windows libraries 1539 Subject: [PATCH 16/16] win32-g++: Correct the order of linked Windows libraries
1540 1540
1541 Commit a6d48ca corrected the problem for win32-g++. Here we do the same 1541 Commit a6d48ca corrected the problem for win32-g++. Here we do the same
1542 for win32-g++-cross. 1542 for win32-g++-cross.
1543
1544 Merge-request: 1173
1545 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
1546 (cherry picked from commit 63ea4ba0ceb8f625da48ddbe31f96b2148f62146)
1543 --- 1547 ---
1544 mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 +- 1548 mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 +-
1545 1 files changed, 1 insertions(+), 1 deletions(-) 1549 1 files changed, 1 insertions(+), 1 deletions(-)
1546 1550
1547 diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf 1551 diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf
1556 +QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 1560 +QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
1557 QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32 1561 QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
1558 QMAKE_LIBS_NETWORK = -lws2_32 1562 QMAKE_LIBS_NETWORK = -lws2_32
1559 QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 1563 QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
1560 -- 1564 --
1561 1.7.4.1 1565 1.7.4.2
1562 1566