update package qt

1 files changed, 61 insertions, 140 deletions

diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch
index 5d23e24..337d681 100644
--- a/src/qt-1-cherrypicks.patch
+++ b/src/qt-1-cherrypicks.patch
@@ -5,10 +5,10 @@ Commits backported (cherry-picked) from upstream branch or merge requests.
 http://qt.gitorious.org/qt
 Also contains MXE specific fixes.
 
-From 16a4f14e8e879a14ae5db47d0731c9199c01a816 Mon Sep 17 00:00:00 2001
+From c9337a775daa3a53426403fdc6984656c0e08c29 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:17:48 +0100
-Subject: [PATCH 01/17] remove trailing whitespace
+Subject: [PATCH 01/15] remove trailing whitespace
 
 backported from qt5/qtbase
 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
@@ -19,7 +19,7 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
-index 6bc2fa6..9b7967d 100644
+index 9090773..859ec8d 100644
 --- a/src/corelib/codecs/codecs.pri
 +++ b/src/corelib/codecs/codecs.pri
 @@ -42,7 +42,7 @@ unix {
@@ -35,10 +35,10 @@ index 6bc2fa6..9b7967d 100644
 1.7.9.2
 
 
-From 162708efc51e40ed59d4e3397d399920c21d03a6 Mon Sep 17 00:00:00 2001
+From 2afee6408f010376ede9f58aaee1fe4e23aa116d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 30 Jun 2011 10:22:33 +0200
-Subject: [PATCH 02/17] do not detect or configure iconv for Windows
+Subject: [PATCH 02/15] do not detect or configure iconv for Windows
 
 Qt doesn't use iconv on Windows, but configuring it will appear to
 work and the build will complete. The result is that character
@@ -56,10 +56,10 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index a706908..0690822 100755
+index c1667b6..862aad5 100755
 --- a/configure
 +++ b/configure
-@@ -5600,7 +5600,7 @@ fi
+@@ -5627,7 +5627,7 @@ fi
  
  # auto-detect iconv(3) support
  if [ "$CFG_ICONV" != "no" ]; then
@@ -72,10 +72,10 @@ index a706908..0690822 100755
 1.7.9.2
 
 
-From dd34e052a555203b2bfb415bd0ce348ef232aa7e Mon Sep 17 00:00:00 2001
+From f66200e240a3664dd62beb9eb8aa38efdecfddb1 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 11:43:10 +0100
-Subject: [PATCH 03/17] fix whitespace
+Subject: [PATCH 03/15] fix whitespace
 
 backported from qt5/qtbase
 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
@@ -86,7 +86,7 @@ Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
  1 file changed, 16 insertions(+), 17 deletions(-)
 
 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
-index 9b7967d..836cc34 100644
+index 859ec8d..70cd890 100644
 --- a/src/corelib/codecs/codecs.pri
 +++ b/src/corelib/codecs/codecs.pri
 @@ -1,23 +1,23 @@
@@ -149,10 +149,10 @@ index 9b7967d..836cc34 100644
 1.7.9.2
 
 
-From 7f2e5f5e4bc740446f0160ae3246907fa4f6dc2f Mon Sep 17 00:00:00 2001
+From a82277bac5c8ac6fa43577bcc9642534714c91fb Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Jul 2011 00:42:24 +0200
-Subject: [PATCH 04/17] build and load text codecs regardless of iconv and
+Subject: [PATCH 04/15] build and load text codecs regardless of iconv and
  platform
 
 Otherwise applications linking to static Qt may have to import
@@ -174,7 +174,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
  2 files changed, 24 insertions(+), 28 deletions(-)
 
 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
-index 836cc34..8ff9070 100644
+index 70cd890..c847264 100644
 --- a/src/corelib/codecs/codecs.pri
 +++ b/src/corelib/codecs/codecs.pri
 @@ -10,6 +10,15 @@ HEADERS += \
@@ -237,10 +237,10 @@ index 836cc34..8ff9070 100644
  }
  symbian:LIBS += -lcharconv
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 74e5e90..2b3100a 100644
+index ea8a5fd..7966df2 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
-@@ -65,15 +65,14 @@
+@@ -66,15 +66,14 @@
  #  include "qtsciicodec_p.h"
  #  include "qisciicodec_p.h"
  #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY)
@@ -258,7 +258,7 @@ index 74e5e90..2b3100a 100644
  #  if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED)
  #    include "qfontlaocodec_p.h"
  #    include "../../plugins/codecs/jp/qfontjpcodec.h"
-@@ -759,8 +758,6 @@ static void setup()
+@@ -751,8 +750,6 @@ static void setup()
  #  if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED)
      // no font codecs when bootstrapping
      (void)new QFontLaoCodec;
@@ -267,7 +267,7 @@ index 74e5e90..2b3100a 100644
      (void)new QFontGb2312Codec;
      (void)new QFontGbkCodec;
      (void)new QFontGb18030_0Codec;
-@@ -769,12 +766,11 @@ static void setup()
+@@ -761,12 +758,11 @@ static void setup()
      (void)new QFontKsc5601Codec;
      (void)new QFontBig5hkscsCodec;
      (void)new QFontBig5Codec;
@@ -282,7 +282,7 @@ index 74e5e90..2b3100a 100644
      // no asian codecs when bootstrapping, sorry
      (void)new QGb18030Codec;
      (void)new QGbkCodec;
-@@ -786,7 +782,7 @@ static void setup()
+@@ -778,7 +774,7 @@ static void setup()
      (void)new QCP949Codec;
      (void)new QBig5Codec;
      (void)new QBig5hkscsCodec;
@@ -295,10 +295,10 @@ index 74e5e90..2b3100a 100644
 1.7.9.2
 
 
-From 00db0d7b9b99b18fd08463f86102f1b63eb3a527 Mon Sep 17 00:00:00 2001
+From 1ec39e28f1790723df212eb158a6695c355a304a Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:24:13 +0100
-Subject: [PATCH 05/17] move plugin text codecs to QtCore
+Subject: [PATCH 05/15] move plugin text codecs to QtCore
 
 Having plugin text codecs adds considerable complexity to
 configuring Qt. The plugin interface is designed for optional
@@ -416,7 +416,7 @@ Conflicts:
  delete mode 100644 src/plugins/codecs/tw/tw.pro
 
 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
-index 8ff9070..02f30f5 100644
+index c847264..a1271b9 100644
 --- a/src/corelib/codecs/codecs.pri
 +++ b/src/corelib/codecs/codecs.pri
 @@ -11,13 +11,14 @@ HEADERS += \
@@ -39528,10 +39528,10 @@ index 0000000..c56a103
 +
 +#endif // QSJISCODEC_H
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 2b3100a..3399034 100644
+index 7966df2..3a2a60e 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
-@@ -66,16 +66,16 @@
+@@ -67,16 +67,16 @@
  #  include "qisciicodec_p.h"
  #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY)
  #  if !defined(QT_BOOTSTRAPPED)
@@ -79337,10 +79337,10 @@ index 94ce675..c4af49b 100644
 1.7.9.2
 
 
-From 0332650cdfb4c5847a4678a1aebfbe146c850b87 Mon Sep 17 00:00:00 2001
+From 71aff51d79b2b92edbf40d642903b5114548cc42 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 21:01:26 +0100
-Subject: [PATCH 06/17] update private header references
+Subject: [PATCH 06/15] update private header references
 
 backported from qt5/qtbase
 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
@@ -79513,10 +79513,10 @@ index c56a103..df1449b 100644
 1.7.9.2
 
 
-From e76298384079852d9cc1e0138a10b0637f34687f Mon Sep 17 00:00:00 2001
+From 4cc7d919207633377a3afc52f750d551bc7a90bd Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 3 Jul 2011 21:53:27 +0200
-Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs
+Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs
 
 -update old reference to 'plugin'
 -rename multiple inclusion guards
@@ -80024,10 +80024,10 @@ index df1449b..f8efcae 100644
 1.7.9.2
 
 
-From 16ea320980842c9c16d380f3bdd84c5a413dbd21 Mon Sep 17 00:00:00 2001
+From e57ad0b10f420f62db94ba3ed3367d34ad2825ca Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 12 Jan 2012 10:43:29 +0100
-Subject: [PATCH 08/17] remove obsolete codec plugin loading code
+Subject: [PATCH 08/15] remove obsolete codec plugin loading code
 
 backported from qt5/qtbase
 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
@@ -80053,7 +80053,7 @@ Conflicts:
  delete mode 100644 src/corelib/codecs/qtextcodecplugin.h
 
 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
-index 02f30f5..76e8d5e 100644
+index a1271b9..9274eda 100644
 --- a/src/corelib/codecs/codecs.pri
 +++ b/src/corelib/codecs/codecs.pri
 @@ -7,11 +7,9 @@ HEADERS += \
@@ -80083,13 +80083,13 @@ index 02f30f5..76e8d5e 100644
      codecs/qjpunicode.cpp \
      codecs/qeucjpcodec.cpp \
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 3399034..552a195 100644
+index 3a2a60e..3cd5a5e 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
-@@ -47,11 +47,6 @@
- 
+@@ -48,11 +48,6 @@
  #include "qlist.h"
  #include "qfile.h"
+ #include "qvarlengtharray.h"
 -#ifndef QT_NO_LIBRARY
 -# include "qcoreapplication.h"
 -# include "qtextcodecplugin.h"
@@ -80098,7 +80098,7 @@ index 3399034..552a195 100644
  #include "qstringlist.h"
  
  #ifdef Q_OS_UNIX
-@@ -104,11 +99,6 @@
+@@ -105,11 +100,6 @@
  
  QT_BEGIN_NAMESPACE
  
@@ -80110,7 +80110,7 @@ index 3399034..552a195 100644
  //Cache for QTextCodec::codecForName and codecForMib.
  typedef QHash<QByteArray, QTextCodec *> QTextCodecCache;
  Q_GLOBAL_STATIC(QTextCodecCache, qTextCodecCache)
-@@ -150,39 +140,6 @@ static bool nameMatch(const QByteArray &name, const QByteArray &test)
+@@ -151,39 +141,6 @@ static bool nameMatch(const QByteArray &name, const QByteArray &test)
  }
  
  
@@ -80150,7 +80150,7 @@ index 3399034..552a195 100644
  static QList<QTextCodec*> *all = 0;
  #ifdef Q_DEBUG_TEXTCODEC
  static bool destroying_is_ok = false;
-@@ -967,10 +924,6 @@ QTextCodec::ConverterState::~ConverterState()
+@@ -959,10 +916,6 @@ QTextCodec::ConverterState::~ConverterState()
           \o Converts a Unicode string to an 8-bit character string.
      \endtable
  
@@ -80161,7 +80161,7 @@ index 3399034..552a195 100644
      \sa QTextStream, QTextDecoder, QTextEncoder, {Codecs Example}
  */
  
-@@ -1063,10 +1016,7 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
+@@ -1055,10 +1008,7 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
              }
      }
  
@@ -80173,7 +80173,7 @@ index 3399034..552a195 100644
  }
  
  
-@@ -1103,16 +1053,7 @@ QTextCodec* QTextCodec::codecForMib(int mib)
+@@ -1095,16 +1045,7 @@ QTextCodec* QTextCodec::codecForMib(int mib)
          }
      }
  
@@ -80191,7 +80191,7 @@ index 3399034..552a195 100644
  }
  
  /*!
-@@ -1145,18 +1086,6 @@ QList<QByteArray> QTextCodec::availableCodecs()
+@@ -1137,18 +1078,6 @@ QList<QByteArray> QTextCodec::availableCodecs()
      locker.unlock();
  #endif
  
@@ -80210,7 +80210,7 @@ index 3399034..552a195 100644
      return codecs;
  }
  
-@@ -1185,18 +1114,6 @@ QList<int> QTextCodec::availableMibs()
+@@ -1177,18 +1106,6 @@ QList<int> QTextCodec::availableMibs()
      locker.unlock();
  #endif
  
@@ -80574,10 +80574,10 @@ index 844101a..4ea4227 100644
 1.7.9.2
 
 
-From 5a5ae1066dbcf8a663e7f292d8679aae2ccd7b73 Mon Sep 17 00:00:00 2001
+From ea246a109c1ebc2cfaad6e92ac87c4a1cc18ec7e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 23 Jan 2012 23:12:46 +0100
-Subject: [PATCH 09/17] remove vestiges of text codec plugins
+Subject: [PATCH 09/15] remove vestiges of text codec plugins
 
 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
 
@@ -80611,10 +80611,10 @@ index dea05e0..12cd8ea 100644
 1.7.9.2
 
 
-From 90daa3f753c91a3efde3dfdc9151f9a639c653d0 Mon Sep 17 00:00:00 2001
+From 6fa42258f48a5e03ad9faa708202a1c53e1e5e20 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 15:10:26 +0100
-Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific)
+Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific)
 
 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
 ---
@@ -80640,10 +80640,10 @@ index ffb98de..6aab68f 100644
 1.7.9.2
 
 
-From 1d4c3643de6eea011e74ed73dc2290c58f41d865 Mon Sep 17 00:00:00 2001
+From 94cbc5be38cb1386ec6acd6045615abb9b370874 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 14:11:02 +0100
-Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific)
+Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific)
 
 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
 ---
@@ -80669,10 +80669,10 @@ index e1cc3ee..71cbab1 100644
 1.7.9.2
 
 
-From a3c87e93fd4aa06163eb157b060e155c44fbbe14 Mon Sep 17 00:00:00 2001
+From 2faf7d28bd1aa3b8b889ad68268700403ccba4d0 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 5 Jun 2010 23:41:04 +0200
-Subject: [PATCH 12/17] restore support for static linking of QtWebKit (MXE
+Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE
  specific)
 
 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
@@ -80693,10 +80693,10 @@ Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da
  5 files changed, 26 insertions(+), 8 deletions(-)
 
 diff --git a/configure b/configure
-index 0690822..2837eec 100755
+index 862aad5..f679fa4 100755
 --- a/configure
 +++ b/configure
-@@ -7599,12 +7599,6 @@ if [ "$CFG_GUI" = "no" ]; then
+@@ -7626,12 +7626,6 @@ if [ "$CFG_GUI" = "no" ]; then
      canBuildWebKit="no"
  fi
  
@@ -80779,10 +80779,10 @@ index 9be0f4a..6744f58 100644
 1.7.9.2
 
 
-From 0f6cab5fff9eb2e0cfc173eaf71e068f9b82e9d3 Mon Sep 17 00:00:00 2001
+From e2187b030e2d7bd0fc9f51190737d5d45d693197 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:47:10 +0200
-Subject: [PATCH 13/17] fix building on GNU/kFreeBSD (MXE specific)
+Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific)
 
 This patch has been taken from:
 
@@ -80797,7 +80797,7 @@ Last-Update: 2010-10-06
  1 file changed, 2 insertions(+)
 
 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
-index ed8f9eb..e571c4e 100644
+index 15b6afb..55f7df3 100644
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {}
@@ -80813,10 +80813,10 @@ index ed8f9eb..e571c4e 100644
 1.7.9.2
 
 
-From 3b9839cc26fc7997b043a74c7d30fc3b0b81ad83 Mon Sep 17 00:00:00 2001
+From edc8e5747312fb0dbc61ae4a1c432440cb70ad94 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:49:47 +0200
-Subject: [PATCH 14/17] fix missing platform when building on GNU/kFreeBSD
+Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD
  (MXE specific)
 
 This patch is inspired by:
@@ -80830,10 +80830,10 @@ Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95
  1 file changed, 3 insertions(+)
 
 diff --git a/configure b/configure
-index 2837eec..8b4e5e8 100755
+index f679fa4..bb563fe 100755
 --- a/configure
 +++ b/configure
-@@ -2749,6 +2749,9 @@ if [ -z "$PLATFORM" ]; then
+@@ -2809,6 +2809,9 @@ if [ -z "$PLATFORM" ]; then
       GNU:*)
          PLATFORM=hurd-g++
          ;;
@@ -80847,10 +80847,10 @@ index 2837eec..8b4e5e8 100755
 1.7.9.2
 
 
-From e15286869c4e9b5714209ec38686f63c8b2ff44c Mon Sep 17 00:00:00 2001
+From 9e5f8124bdb183e115d742d45acb00fd7a8250c3 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:51:50 +0200
-Subject: [PATCH 15/17] fix building on dragonfly (MXE specific)
+Subject: [PATCH 15/15] fix building on dragonfly (MXE specific)
 
 This patch is inspired by:
 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
@@ -80861,10 +80861,10 @@ Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 8b4e5e8..99948d1 100755
+index bb563fe..79ca8d3 100755
 --- a/configure
 +++ b/configure
-@@ -2761,7 +2761,7 @@ if [ -z "$PLATFORM" ]; then
+@@ -2821,7 +2821,7 @@ if [ -z "$PLATFORM" ]; then
       ULTRIX:*)
          PLATFORM=ultrix-g++
          ;;
@@ -80876,82 +80876,3 @@ index 8b4e5e8..99948d1 100755
 -- 
 1.7.9.2
 
-
-From 87952077f0d192d2ce15ea111be3f320bc03be40 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Fri, 23 Mar 2012 16:29:57 +0100
-Subject: [PATCH 16/17] gcc 4.7.0 compatibility fix for javascript
-
-taken from http://qt-project.org/forums/viewthread/15071
-
-Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d
----
- .../JavaScriptCore/runtime/JSGlobalObject.h        |    2 +-
- .../JavaScriptCore/runtime/JSStaticScopeObject.h   |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-index 7c20272..9eb86e7 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
-@@ -59,7 +59,7 @@ namespace JSC {
-     protected:
-         using JSVariableObject::JSVariableObjectData;
- 
--        struct JSGlobalObjectData : public JSVariableObjectData {
-+        struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
-             // We use an explicit destructor function pointer instead of a
-             // virtual destructor because we want to avoid adding a vtable
-             // pointer to this struct. Adding a vtable pointer would force the
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-index 2542878..3cb66a0 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
-@@ -33,7 +33,7 @@ namespace JSC{
-     class JSStaticScopeObject : public JSVariableObject {
-     protected:
-         using JSVariableObject::JSVariableObjectData;
--        struct JSStaticScopeObjectData : public JSVariableObjectData {
-+        struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
-             JSStaticScopeObjectData()
-                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
-             {
--- 
-1.7.9.2
-
-
-From 4de5298ed5b06dea106f054ef110146a45f06b6f Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 19 Apr 2012 14:48:34 +0200
-Subject: [PATCH 17/17] fix static library names when generating .pc files for
- pkgconfig
-
-c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension
-which only occurs on the DLL import library.
-
-cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61
-Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
-Reviewed-by: Mark Brand <mabrand@mabrand.nl>
-Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
-(cherry picked from commit 51a2b0fde9bf635482fd2463b901139c82ed0dc4)
----
- qmake/generators/makefile.cpp |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 66c6d49..447943a 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3258,7 +3258,8 @@ MakefileGenerator::writePkgConfigFile()
-     } else {
-         pkgConfiglibDir = "-L${libdir}";
-         pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
--        pkgConfiglibName += project->first("TARGET_VERSION_EXT");
-+        if (project->isActiveConfig("shared"))
-+            pkgConfiglibName += project->first("TARGET_VERSION_EXT");
-     }
-     t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
- 
--- 
-1.7.9.2
-