qtbase: consolidate patches

2 files changed, 89 insertions, 96 deletions

diff --git a/src/qtbase-1.patch b/src/qtbase-1.patch
index 800d802..b026210 100644
--- a/src/qtbase-1.patch
+++ b/src/qtbase-1.patch
@@ -4,7 +4,7 @@ See index.html for further information.
 From 2a005d22af074aff326d57b25e1cea1abda8ee6e Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 23:35:08 +0200
-Subject: [PATCH 1/5] fix qwindows plugin linking with system-freetype (MXE
+Subject: [PATCH 1/7] fix qwindows plugin linking with system-freetype (MXE
  specific)
 
 Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
@@ -26,7 +26,7 @@ index 39280de..e152b0d 100644
 From 2baad6771338e3c2361f515a4ba6bf0f26812a6b Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 21 Jun 2014 13:12:49 +0200
-Subject: [PATCH 2/5] use pkg-config for harfbuzz (MXE specific)
+Subject: [PATCH 2/7] use pkg-config for harfbuzz (MXE specific)
 
 Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
 
@@ -59,7 +59,7 @@ index 7443368..c24e684 100644
 From c526e9fc734f91d5174399ab539b75dd3de3f8a4 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 8 Dec 2014 14:15:12 +0100
-Subject: [PATCH 3/5] fix oci config test on windows
+Subject: [PATCH 3/7] fix oci config test on windows
 
 Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
 
@@ -79,7 +79,7 @@ index 3ffda1d..39b6f3759 100644
 From 35759dbe5a613f9006190cd135cc8ec994cf71e5 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 6 Aug 2015 13:24:56 +0200
-Subject: [PATCH 4/5] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
+Subject: [PATCH 4/7] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
 
 Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
 
@@ -103,7 +103,7 @@ index 8a4c89e..eb432b5 100755
 From 68f2921bf86ed75488f913458087ef4db571e05d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 6 Oct 2015 09:53:20 +0200
-Subject: [PATCH 5/5] fix building mysql driver under mingw
+Subject: [PATCH 5/7] fix building mysql driver under mingw
 
 Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
 
@@ -123,10 +123,11 @@ index 3cfb614..8b7063f 100644
 -- 
 2.1.4
 
-From 141181ce8062e3a9b405ddd3f918161eb2e8ded2 Mon Sep 17 00:00:00 2001
+
+From 5ee9b60bef32eb8ee8a889f0349c1307750f95c6 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 8 Oct 2015 17:15:46 +1100
-Subject: [PATCH 6/6] Fix build with clang 3.7
+Subject: [PATCH 6/7] Fix build with clang 3.7
 
 _Nullable is a language extension in clang 3.7 (indicating whether or
 not a pointer can be null).
@@ -173,6 +174,86 @@ index 3d0d5de..3d780cd 100644
                      continue;
  
 -- 
-2.3.8 (Apple Git-58)
+2.1.4
+
+
+From a1420344bacb6ea88139300c3e17231c395e5921 Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+Date: Fri, 24 Jul 2015 13:18:29 +0200
+Subject: [PATCH 7/7] fix build with no built-in image handlers
+
+the handlers' .pri files added $$PWD to INCLUDEPATH to make the files
+self-contained when used externally, but this polluted the include path
+of the gui module itself, thus hiding incorrect use of QPA includes.
 
+Task-number: QTBUG-47400
+Change-Id: I576469a71e8ded0b409d62687999c0fa884613f9
+
+diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri
+index 6eb0751..ec33101 100644
+--- a/src/gui/image/qgifhandler.pri
++++ b/src/gui/image/qgifhandler.pri
+@@ -1,4 +1,3 @@
+ # common to plugin and built-in forms
+-INCLUDEPATH *= $$PWD
+ HEADERS += $$PWD/qgifhandler_p.h
+ SOURCES += $$PWD/qgifhandler.cpp
+diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri
+index c8de33d..de40c67 100644
+--- a/src/gui/image/qjpeghandler.pri
++++ b/src/gui/image/qjpeghandler.pri
+@@ -1,5 +1,4 @@
+ # common to plugin and built-in forms
+-INCLUDEPATH *= $$PWD
+ HEADERS += $$PWD/qjpeghandler_p.h
+ SOURCES += $$PWD/qjpeghandler.cpp
+ contains(QT_CONFIG, system-jpeg) {
+diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri
+index aca7e2c..9ab175d 100644
+--- a/src/gui/image/qpnghandler.pri
++++ b/src/gui/image/qpnghandler.pri
+@@ -1,4 +1,3 @@
+-INCLUDEPATH *= $$PWD
+ HEADERS += $$PWD/qpnghandler_p.h
+ SOURCES += $$PWD/qpnghandler.cpp
+ contains(QT_CONFIG, system-png) {
+diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
+index 670717c..c3a0f5c 100644
+--- a/src/gui/painting/qbrush.cpp
++++ b/src/gui/painting/qbrush.cpp
+@@ -35,7 +35,7 @@
+ #include "qpixmap.h"
+ #include "qbitmap.h"
+ #include "qpixmapcache.h"
+-#include "qplatformpixmap.h"
++#include <qpa/qplatformpixmap.h>
+ #include "qdatastream.h"
+ #include "qvariant.h"
+ #include "qline.h"
+diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro
+index 898f06e..2a5048b 100644
+--- a/src/plugins/imageformats/gif/gif.pro
++++ b/src/plugins/imageformats/gif/gif.pro
+@@ -5,6 +5,7 @@ PLUGIN_CLASS_NAME = QGifPlugin
+ load(qt_plugin)
+ 
+ include(../../../gui/image/qgifhandler.pri)
++INCLUDEPATH += ../../../gui/image
+ SOURCES += $$PWD/main.cpp
+ HEADERS += $$PWD/main.h
+ OTHER_FILES += gif.json
+diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
+index 45bf7bb..e33fde1 100644
+--- a/src/plugins/imageformats/jpeg/jpeg.pro
++++ b/src/plugins/imageformats/jpeg/jpeg.pro
+@@ -9,6 +9,7 @@ QT += core-private
+ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"
+ 
+ include(../../../gui/image/qjpeghandler.pri)
++INCLUDEPATH += ../../../gui/image
+ SOURCES += main.cpp
+ HEADERS += main.h
+ OTHER_FILES += jpeg.json
+-- 
+2.1.4
 
diff --git a/src/qtbase-2.patch b/src/qtbase-2.patch
deleted file mode 100644
index 838f38f..0000000
--- a/src/qtbase-2.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 7f282aa9f718389199b95b7f53ecd6401172fcc6 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-Date: Fri, 24 Jul 2015 13:18:29 +0200
-Subject: [PATCH 1/1] fix build with no built-in image handlers
-
-the handlers' .pri files added $$PWD to INCLUDEPATH to make the files
-self-contained when used externally, but this polluted the include path
-of the gui module itself, thus hiding incorrect use of QPA includes.
-
-Task-number: QTBUG-47400
-Change-Id: I576469a71e8ded0b409d62687999c0fa884613f9
----
- src/gui/image/qgifhandler.pri          | 1 -
- src/gui/image/qjpeghandler.pri         | 1 -
- src/gui/image/qpnghandler.pri          | 1 -
- src/gui/painting/qbrush.cpp            | 2 +-
- src/plugins/imageformats/gif/gif.pro   | 1 +
- src/plugins/imageformats/jpeg/jpeg.pro | 1 +
- 6 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri
-index 6eb0751..ec33101 100644
---- a/src/gui/image/qgifhandler.pri
-+++ b/src/gui/image/qgifhandler.pri
-@@ -1,4 +1,3 @@
- # common to plugin and built-in forms
--INCLUDEPATH *= $$PWD
- HEADERS += $$PWD/qgifhandler_p.h
- SOURCES += $$PWD/qgifhandler.cpp
-diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri
-index c8de33d..de40c67 100644
---- a/src/gui/image/qjpeghandler.pri
-+++ b/src/gui/image/qjpeghandler.pri
-@@ -1,5 +1,4 @@
- # common to plugin and built-in forms
--INCLUDEPATH *= $$PWD
- HEADERS += $$PWD/qjpeghandler_p.h
- SOURCES += $$PWD/qjpeghandler.cpp
- contains(QT_CONFIG, system-jpeg) {
-diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri
-index aca7e2c..9ab175d 100644
---- a/src/gui/image/qpnghandler.pri
-+++ b/src/gui/image/qpnghandler.pri
-@@ -1,4 +1,3 @@
--INCLUDEPATH *= $$PWD
- HEADERS += $$PWD/qpnghandler_p.h
- SOURCES += $$PWD/qpnghandler.cpp
- contains(QT_CONFIG, system-png) {
-diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
-index 670717c..c3a0f5c 100644
---- a/src/gui/painting/qbrush.cpp
-+++ b/src/gui/painting/qbrush.cpp
-@@ -35,7 +35,7 @@
- #include "qpixmap.h"
- #include "qbitmap.h"
- #include "qpixmapcache.h"
--#include "qplatformpixmap.h"
-+#include <qpa/qplatformpixmap.h>
- #include "qdatastream.h"
- #include "qvariant.h"
- #include "qline.h"
-diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro
-index 898f06e..2a5048b 100644
---- a/src/plugins/imageformats/gif/gif.pro
-+++ b/src/plugins/imageformats/gif/gif.pro
-@@ -5,6 +5,7 @@ PLUGIN_CLASS_NAME = QGifPlugin
- load(qt_plugin)
- 
- include(../../../gui/image/qgifhandler.pri)
-+INCLUDEPATH += ../../../gui/image
- SOURCES += $$PWD/main.cpp
- HEADERS += $$PWD/main.h
- OTHER_FILES += gif.json
-diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
-index 45bf7bb..e33fde1 100644
---- a/src/plugins/imageformats/jpeg/jpeg.pro
-+++ b/src/plugins/imageformats/jpeg/jpeg.pro
-@@ -9,6 +9,7 @@ QT += core-private
- QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"
- 
- include(../../../gui/image/qjpeghandler.pri)
-+INCLUDEPATH += ../../../gui/image
- SOURCES += main.cpp
- HEADERS += main.h
- OTHER_FILES += jpeg.json
--- 
-2.3.5
-