Merge branch 'master' into master

patches/PyQt4_gpl_x11-4.12-00-exe-file.patch

@@ -0,0 +1,29 @@
+diff --git a/configure.py b/configure.py
+index 6118d39..d595e35 100644
+--- a/configure.py
++++ b/configure.py
+@@ -1441,10 +1441,10 @@ def set_sip_flags(pyqt):
+     if sys.platform == 'win32':
+         plattag = "WS_WIN"
+     elif sys.platform == "darwin":
+-        if "__USE_WS_X11__" in sipcfg.build_macros()["DEFINES"]:
++#        if "__USE_WS_X11__" in sipcfg.build_macros()["DEFINES"]:
+             plattag = "WS_X11"
+-        else:
+-            plattag = "WS_MACX"
++#        else:
++#            plattag = "WS_MACX"
+     else:
+         plattag = "WS_X11"
+
+@@ -1946,8 +1946,8 @@ def get_qt_configuration():
+         else:
+             exe_file = os.path.join("release", app + ".exe")
+             make_target = " release"
+-    elif sys.platform == "darwin":
+-        exe_file = os.path.join(app + ".app", "Contents", "MacOS", app)
++#    elif sys.platform == "darwin":
++#        exe_file = os.path.join(app + ".app", "Contents", "MacOS", app)
+     else:
+         exe_file = os.path.join(".", app)
+

patches/PyQt4_gpl_x11-4.12-01-PrintCurrentPage.patch

@@ -0,0 +1,22 @@
+diff --git a/sip/QtGui/qabstractprintdialog.sip b/sip/QtGui/qabstractprintdialog.sip
+index 4389370..90eb98a 100644
+--- a/sip/QtGui/qabstractprintdialog.sip
++++ b/sip/QtGui/qabstractprintdialog.sip
+@@ -54,9 +54,6 @@ public:
+ %If (Qt_4_4_0 -)
+         DontUseSheet,
+ %End
+-%If (Qt_4_7_0 -)
+-        PrintCurrentPage,
+-%End
+     };
+
+ %End
+@@ -73,7 +70,6 @@ enum PrintDialogOption {
+     PrintPageRange,
+     PrintCollateCopies,
+     PrintShowPageSize,
+-    PrintCurrentPage
+ };
+ %End
+     typedef QFlags<QAbstractPrintDialog::PrintDialogOption> PrintDialogOptions;

patches/qt-everywhere-opensource-src-4.8.7-00-correct-qglobal.patch

@@ -0,0 +1,24 @@
+diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
+index 20d8832..d31ad57 100644
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -991,6 +991,8 @@ namespace QT_NAMESPACE {}
+      WIN16    - unsupported
+ */
+
++#define Q_WS_X11
++
+ #if defined(Q_OS_MSDOS)
+ #  define Q_WS_WIN16
+ #  error "Qt requires Win32 and does not work with Windows 3.x"
+@@ -1032,6 +1034,10 @@ namespace QT_NAMESPACE {}
+ #  define Q_WS_WIN
+ #endif
+
++#undef Q_WS_MAC
++#undef Q_WS_MAC32
++#undef Q_WS_MAC64
++
+ QT_BEGIN_HEADER
+ QT_BEGIN_NAMESPACE
+