Annotation of /trunk/qt4/patches/qt-4.8.7-glibc225.patch
Parent Directory | Revision Log
Revision 2917 -
(hide annotations)
(download)
Wed May 17 09:04:25 2017 UTC (7 years ago) by niro
File size: 1689 byte(s)
Wed May 17 09:04:25 2017 UTC (7 years ago) by niro
File size: 1689 byte(s)
-fixed patches
1 | niro | 2917 | diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin |
2 | niro | 2911 | qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h |
3 | niro | 2917 | --- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin 2015-05-07 09:14:48.000000000 -0500 |
4 | +++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h 2016-12-08 12:10:29.677359701 -0600 | ||
5 | @@ -52,7 +52,7 @@ | ||
6 | niro | 2911 | /* |
7 | niro | 2917 | can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) |
8 | niro | 2911 | */ |
9 | niro | 2917 | -#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) |
10 | +#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)) | ||
11 | niro | 2911 | |
12 | niro | 2917 | #define QT_PACKAGEDATE_STR "2015-05-07" |
13 | niro | 2911 | |
14 | diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp | ||
15 | niro | 2917 | --- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 2015-05-07 09:14:44.000000000 -0500 |
16 | +++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-12-08 12:32:46.638962448 -0600 | ||
17 | @@ -188,10 +188,12 @@ int runMoc(int _argc, char **_argv) | ||
18 | pp.macros["Q_MOC_RUN"]; | ||
19 | pp.macros["__cplusplus"]; | ||
20 | niro | 2911 | |
21 | niro | 2917 | - // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 |
22 | + // Workaround a bugs while parsing some boost headers. See QTBUG-22829 | ||
23 | pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; | ||
24 | pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; | ||
25 | pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; | ||
26 | + pp.macros["BOOST_TYPE_TRAITS_HPP"]; | ||
27 | + pp.macros["_SYS_SYSMACROS_H_OUTER"]; | ||
28 | niro | 2911 | |
29 | QByteArray filename; | ||
30 | QByteArray output; |