diff options
| -rw-r--r-- | src/qt-1-cherrypicks.patch | 74 | ||||
| -rw-r--r-- | src/qt.mk | 4 |
2 files changed, 41 insertions, 37 deletions
diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 8c14bea..b9ca8ba 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -4,7 +4,7 @@ See doc/index.html for further information. Commits backported (cherry-picked) from Qt 4.7 branch. http://qt.gitorious.org/qt -From 8f36bff28b648f65845cd56255a6c5b2cb7f8e42 Mon Sep 17 00:00:00 2001 +From bb75d02785da59c967dee09006700488af9f482e Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 15 Oct 2010 14:56:03 +0200 Subject: [PATCH 01/16] removed obsolete -qt-gif configure option @@ -84,10 +84,10 @@ index 15c0ddb..dd5647b 100644 desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support."); desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt."); -- -1.7.4.1 +1.7.4.2 -From 6f97b6dab051bc2899907ac794495bc7542d4337 Mon Sep 17 00:00:00 2001 +From b5e382d8335628edf5d5c5a1671682de7c50c6d2 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 10 Jan 2011 16:41:54 +0100 Subject: [PATCH 02/16] qmake: fix double directory separator @@ -120,10 +120,10 @@ index df580fd..81a379f 100644 if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR")); -- -1.7.4.1 +1.7.4.2 -From da69fe08f058ac49788559d333bcec747b94d208 Mon Sep 17 00:00:00 2001 +From f35c452aaf665489060d317ce180d192433abd24 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 10 Jan 2011 16:41:55 +0100 Subject: [PATCH 03/16] qmake: don't limit pkg-config writing to unix generator @@ -547,10 +547,10 @@ index 81a379f..1846d56 100644 - QT_END_NAMESPACE -- -1.7.4.1 +1.7.4.2 -From c870095011276897127ed801570d0b4cce79d552 Mon Sep 17 00:00:00 2001 +From e8afbb5a998931c154aa83ed87be6521cb8d50d3 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 10 Jan 2011 16:41:56 +0100 Subject: [PATCH 04/16] qmake: write and install pkg-config files for mingw @@ -601,10 +601,10 @@ index 8af7ddd..6d0a5c4 100644 QString lib_target = getLibTarget(); lib_target.remove('"'); -- -1.7.4.1 +1.7.4.2 -From 8414d5630e66546be5d5eb0e832c80dcddea5d77 Mon Sep 17 00:00:00 2001 +From 175b395655d3f24aea0e4232069853dca1c33efd Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 10 Jan 2011 16:41:57 +0100 Subject: [PATCH 05/16] qt project files: create pkg-config files for mingw @@ -759,7 +759,7 @@ index 7f79d0b..b16c5a1 100644 # Input HEADERS += $$PHONON_DIR/abstractaudiooutput.h \ diff --git a/src/qbase.pri b/src/qbase.pri -index 75da3dc..b50f9c6 100644 +index babea56..a72bc76 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -152,6 +152,14 @@ unix:!symbian { @@ -934,10 +934,10 @@ index 7b94587..6e0a247 100644 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET -- -1.7.4.1 +1.7.4.2 -From 1cf4420ae5221d649880cc0d2e1b1895a19ad106 Mon Sep 17 00:00:00 2001 +From 5ef7985e6015c09735094545a07ed93832075507 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 10 Jan 2011 20:21:05 +0100 Subject: [PATCH 06/16] Fix static build on Windows with MinGW. @@ -1073,7 +1073,7 @@ index 0ac647c..d901ab8 100644 int QGLPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp -index c2a4c9b..d273d33 100644 +index ec2936e..af077e4 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -77,8 +77,8 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; @@ -1121,10 +1121,10 @@ index ee5c7d9..cdff46c 100644 int QVGPixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const { -- -1.7.4.1 +1.7.4.2 -From e285e9993d4f2c6823782840d89f44c1bab74afa Mon Sep 17 00:00:00 2001 +From 3411ae8c3d83b3eb9407c8c338336e95fe74edf3 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer <br@blankpage.ch> Date: Thu, 27 Jan 2011 13:48:13 +0100 Subject: [PATCH 07/16] Allow the user to select imageformats to be built as plugin vs internal @@ -1229,10 +1229,10 @@ index dd5647b..b6e80ea 100644 // IDE project generation ----------------------------------- else if (configCmdLine.at(i) == "-no-dsp") -- -1.7.4.1 +1.7.4.2 -From 095583fb68a8ae02fd16790eaaa922693d268443 Mon Sep 17 00:00:00 2001 +From 8d719e67c51987fb6439ea1d05a2b10684b974e1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 16 Nov 2010 20:06:28 +0100 Subject: [PATCH 08/16] explicitly include -llcms for -lmng (mingw-cross-env specific) @@ -1255,10 +1255,10 @@ index ffb98de..c213e09 100644 } else { include($$PWD/../../3rdparty/libmng.pri) -- -1.7.4.1 +1.7.4.2 -From 3baf871e135d70edbc2431038708886d2795b8b3 Mon Sep 17 00:00:00 2001 +From c34bd635af9263d1a719cd270db123b1a787640c Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 5 Jun 2010 23:41:04 +0200 Subject: [PATCH 09/16] added missing INSTALLS to JavaScriptCore.pro for static libjscore (mingw-cross-env specific) @@ -1287,10 +1287,10 @@ index a805170..027eb0f 100644 CONFIG(QTDIR_build) { -- -1.7.4.1 +1.7.4.2 -From 9e5d4702daa1168ab14ba936014dd6a7bb5671c9 Mon Sep 17 00:00:00 2001 +From c56ec08a3e3af1a9beae552872b443c6a7cf401c Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 9 Nov 2010 20:09:45 +0100 Subject: [PATCH 10/16] Partially restored support for static linking of QtWebKit (mingw-cross-env specific) @@ -1319,10 +1319,10 @@ index 207dcc1..b10b0a2 100755 CFG_CONCURRENT="yes" if [ "$canBuildQtConcurrent" = "no" ]; then -- -1.7.4.1 +1.7.4.2 -From 61064254a0c5c2c3785909acf60cabdbdcb18d5b Mon Sep 17 00:00:00 2001 +From 074e13614d6071247600eea3c3d6a1f4c4f4a0d5 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 6 Jan 2011 14:21:32 +0100 Subject: [PATCH 11/16] pkg-config file for jscore (mingw-cross-env specific) @@ -1348,10 +1348,10 @@ index 027eb0f..44bbc3f 100644 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +} -- -1.7.4.1 +1.7.4.2 -From 0ad5aac2fdc0f2e81f94c92867bb4e15b3da3ddf Mon Sep 17 00:00:00 2001 +From c907c7c1f0922416fd5f19cb477b71c6f97fee45 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Mon, 21 Feb 2011 22:22:04 +0100 Subject: [PATCH 12/16] workaround for native build on OSX (mingw-cross-env specific) @@ -1379,10 +1379,10 @@ index 4464686..ba0c45b 100644 include(../common/mac-g++.conf) -- -1.7.4.1 +1.7.4.2 -From db85d5c4df98ee12261f62fa637e629b120680a6 Mon Sep 17 00:00:00 2001 +From ac552171a0729e1fae026741e4ec89a415298667 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Date: Mon, 10 Jan 2011 20:09:24 +0100 Subject: [PATCH 13/16] fix -enable-stdcall-fixup usage @@ -1413,10 +1413,10 @@ index ec216aa..2d9833b 100644 QMAKE_LFLAGS_RELEASE = -Wl,-s QMAKE_LFLAGS_DEBUG = -- -1.7.4.1 +1.7.4.2 -From 201fa69318fa3367463bbda1c14857eaa0622dab Mon Sep 17 00:00:00 2001 +From 0e32298cb08ef1168dc6c06dd48bab8ee62c6e5d Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 28 Mar 2011 13:33:58 +0200 Subject: [PATCH 14/16] fix -enable-stdcall-fixup usage @@ -1449,10 +1449,10 @@ index 7e077a1..efc3de2 100644 QMAKE_LFLAGS_RELEASE = -Wl,-s QMAKE_LFLAGS_DEBUG = -- -1.7.4.1 +1.7.4.2 -From fb824ac4fa8cc94269c0f02128f68b473693f3e3 Mon Sep 17 00:00:00 2001 +From 0a9731cad65337c7084791b54db8bfeb0939dc7d Mon Sep 17 00:00:00 2001 From: Jonathan Liu <net147@gmail.com> Date: Mon, 4 Apr 2011 13:01:48 +0200 Subject: [PATCH 15/16] win32-g++: Correct the order of linked Windows libraries @@ -1530,16 +1530,20 @@ index 8f46a2e..3a0ab12 100644 qnx { -- -1.7.4.1 +1.7.4.2 -From aeea4172988bd2963d040128fa3fa3fb568f5482 Mon Sep 17 00:00:00 2001 +From c4a1848f4178fe99daa2c12ad1f14e8de14cc389 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 4 Apr 2011 23:09:58 +0200 +Date: Tue, 5 Apr 2011 10:35:58 +0200 Subject: [PATCH 16/16] win32-g++: Correct the order of linked Windows libraries Commit a6d48ca corrected the problem for win32-g++. Here we do the same for win32-g++-cross. + +Merge-request: 1173 +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> +(cherry picked from commit 63ea4ba0ceb8f625da48ddbe31f96b2148f62146) --- mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) @@ -1558,5 +1562,5 @@ index efc3de2..6eed244 100644 QMAKE_LIBS_NETWORK = -lws2_32 QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 -- -1.7.4.1 +1.7.4.2 @@ -4,8 +4,8 @@ # Qt PKG := qt $(PKG)_IGNORE := -$(PKG)_VERSION := 4.7.2 -$(PKG)_CHECKSUM := 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e +$(PKG)_VERSION := 4.7.3 +$(PKG)_CHECKSUM := 765eb70d9779f93fefddddda5e6ddb33f4c0b71e $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://qt.nokia.com/ |