rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)

Browse Source
This commit is contained in:
Rex Dieter 2016-12-08 12:25:26 -06:00
parent 16b653ffe1
commit 15b5003df8
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qt5-qtbase.spec
View File

@ -66,7 +66,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.7.1 Version: 5.7.1
Release: 5%{?dist} Release: 6%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -94,6 +94,8 @@ Patch2: qtbase-multilib_optflags.patch
Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
# upstreamable patches # upstreamable patches
# namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
Patch50: qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch
# Workaround moc/multilib issues # Workaround moc/multilib issues
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020 # https://bugzilla.redhat.com/show_bug.cgi?id=1290020
@ -956,6 +958,9 @@ fi
%changelog %changelog
* Thu Dec 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-6
- namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
* Thu Dec 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-5 * Thu Dec 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-5
- 5.7.1 dec5 snapshot - 5.7.1 dec5 snapshot

12
qtbase-opensource-src-5.7.1-QT_VERSION_CHECK.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h.QT_VERSION_CHECK qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h
--- qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h.QT_VERSION_CHECK 2016-12-01 02:17:04.000000000 -0600
+++ qtbase-opensource-src-5.7.1/src/corelib/global/qglobal.h 2016-12-08 12:19:41.165310158 -0600
@@ -54,7 +54,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))
#if !defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_CONFIGURE)
#include <QtCore/qconfig.h>