upgrade to Qt 5.6.0

removed modules:
    qtquick1
    qtwebkit

new modules:
    qtquickcontrols2
    qtwebview

1 files changed, 56 insertions, 30 deletions

diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch
index e720936..e754135 100644
--- a/src/qtbase-1-fixes.patch
+++ b/src/qtbase-1-fixes.patch
@@ -3,16 +3,16 @@ See index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 23:35:08 +0200
-Subject: [PATCH] fix qwindows plugin linking with system-freetype (MXE
+Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
  specific)
 
 Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
 
 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
-index 1111111..2222222 100644
+index 39280de..e152b0d 100644
 --- a/src/3rdparty/freetype_dependency.pri
 +++ b/src/3rdparty/freetype_dependency.pri
 @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
@@ -21,16 +21,19 @@ index 1111111..2222222 100644
      include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
 +    win32:shared:LIBS_PRIVATE += -lfreetype
  }
+-- 
+2.5.0
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+
+From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 21 Jun 2014 13:12:49 +0200
-Subject: [PATCH] use pkg-config for harfbuzz (MXE specific)
+Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
 
 Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
 
 diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
-index 1111111..2222222 100644
+index 32edd6e..a7f2c28 100644
 --- a/config.tests/unix/harfbuzz/harfbuzz.pro
 +++ b/config.tests/unix/harfbuzz/harfbuzz.pro
 @@ -1,3 +1,4 @@
@@ -40,7 +43,7 @@ index 1111111..2222222 100644
 +CONFIG += link_pkgconfig
 +PKGCONFIG += harfbuzz
 diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
-index 1111111..2222222 100644
+index 7443368..c24e684 100644
 --- a/src/3rdparty/harfbuzz_dependency.pri
 +++ b/src/3rdparty/harfbuzz_dependency.pri
 @@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) {
@@ -51,16 +54,19 @@ index 1111111..2222222 100644
 +    CONFIG += link_pkgconfig
 +    PKGCONFIG += harfbuzz
  }
+-- 
+2.5.0
+
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 8 Dec 2014 14:15:12 +0100
-Subject: [PATCH] fix oci config test on windows
+Subject: [PATCH 3/8] fix oci config test on windows
 
 Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
 
 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
-index 1111111..2222222 100644
+index 3ffda1d..39b6f3759 100644
 --- a/config.tests/unix/oci/oci.pro
 +++ b/config.tests/unix/oci/oci.pro
 @@ -1,3 +1,3 @@
@@ -68,19 +74,22 @@ index 1111111..2222222 100644
  CONFIG -= qt dylib
 -LIBS += -lclntsh
 +!win32:LIBS += -lclntsh
+-- 
+2.5.0
+
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 13:24:56 +0200
-Subject: [PATCH] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
+Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
 
 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
 
 diff --git a/configure b/configure
-index 1111111..2222222 100755
+index 7651e29..4a4b478 100755
 --- a/configure
 +++ b/configure
-@@ -4464,7 +4464,7 @@ fi
+@@ -4575,7 +4575,7 @@ fi
  [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android"
  
  # check IPC support
@@ -89,16 +98,19 @@ index 1111111..2222222 100755
      # SYSV IPC is not supported - check POSIX IPC
      if compileTest unix/ipc_posix "ipc_posix" ; then
          QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
+-- 
+2.5.0
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+
+From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 6 Oct 2015 09:53:20 +0200
-Subject: [PATCH] fix building mysql driver under mingw
+Subject: [PATCH 5/8] fix building mysql driver under mingw
 
 Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
 
 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
-index 1111111..2222222 100644
+index 3cfb614..8b7063f 100644
 --- a/src/sql/drivers/mysql/qsql_mysql.pri
 +++ b/src/sql/drivers/mysql/qsql_mysql.pri
 @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
@@ -110,11 +122,14 @@ index 1111111..2222222 100644
      isEmpty(QT_LFLAGS_MYSQL) {
          !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
              use_libmysqlclient_r:LIBS += -lmysqlclient_r
+-- 
+2.5.0
+
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001
 From: Boris Nagaev <bnagaev@gmail.com>
 Date: Sun, 18 Oct 2015 23:11:28 +0300
-Subject: [PATCH] configure: fix log corruption with option -v
+Subject: [PATCH 6/8] configure: fix log corruption with option -v
 
 This bug occurs if ./configure is called with -v on systems on
 which fd proc entries point to the files/devices they are open
@@ -150,10 +165,10 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 (cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36)
 
 diff --git a/configure b/configure
-index 1111111..2222222 100755
+index 4a4b478..a5c0fd5 100755
 --- a/configure
 +++ b/configure
-@@ -3571,10 +3571,9 @@ END {
+@@ -3639,10 +3639,9 @@ END {
          print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n";
  }'
  
@@ -165,13 +180,16 @@ index 1111111..2222222 100755
 +eval "$awkprog_result"
 +[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result"
  
- #setup the build parts
- if [ -z "$CFG_BUILD_PARTS" ]; then
+ echo "Done running configuration tests."
+ 
+-- 
+2.5.0
+
 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 26 Aug 2015 12:45:43 +0100
-Subject: [PATCH] cmake: Rearrange STATIC vs INTERFACE targets
+Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets
 
 Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
 for header-only modules when building Qt5 statically.
@@ -180,7 +198,7 @@ Source: https://git.io/vzWJz
 See also: https://github.com/mxe/mxe/issues/1185
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 1111111..2222222 100644
+index d2358ca..6b1dc95 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -200,17 +218,22 @@ index 1111111..2222222 100644
      add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
  !!ENDIF
  !!ENDIF
+-- 
+2.5.0
+
 
-From 3ebc085c4d7488df899f35e9ac63da819dffc1b9 Mon Sep 17 00:00:00 2001
+From e74803bac8aa2fd2106f678b2b11584fdb582bc3 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')
+Subject: [PATCH 8/8] 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
+index 61963c7..25cf750 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
-@@ -94,7 +94,7 @@
+@@ -104,7 +104,7 @@ QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2
  QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
  
  QMAKE_IDL               = midl
@@ -219,3 +242,6 @@ index 1111111..2222222 100644
  QMAKE_RC                = $${CROSS_COMPILE}windres
  
  QMAKE_STRIP             = $${CROSS_COMPILE}strip
+-- 
+2.5.0
+