summarylogtreecommitdiffstats
path: root/qt4-glibc-2.25.patch
diff options
context:
space:
mode:
authorLlewelyn Trahaearn2017-03-13 12:11:59 -0700
committerLlewelyn Trahaearn2017-03-13 12:11:59 -0700
commita37409066481332fb94095305f138967117d551c (patch)
tree8a0172de8b9ee32bcc82163b54821c1bd9e0bfda /qt4-glibc-2.25.patch
parent90c8e6bde2065eb82a04268aafa4d08290b0dbb1 (diff)
downloadaur-a37409066481332fb94095305f138967117d551c.tar.gz
Include new patch from [Extra].
Diffstat (limited to 'qt4-glibc-2.25.patch')
-rw-r--r--qt4-glibc-2.25.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/qt4-glibc-2.25.patch b/qt4-glibc-2.25.patch
new file mode 100644
index 000000000000..d7e41f292609
--- /dev/null
+++ b/qt4-glibc-2.25.patch
@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin
+qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin 2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h 2016-12-08 12:10:29.677359701 -0600
+@@ -52,7 +52,7 @@
+ /*
+ can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
++#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+
+ #define QT_PACKAGEDATE_STR "2015-05-07"
+