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

drop el6 qdoc patch (qdoc moved to qttools)

Browse Source
This commit is contained in:
Rex Dieter 2016-01-15 12:27:05 -06:00
parent 81cc5836ad
commit e13793651a
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qt5-qtbase.spec
View File

@ -79,9 +79,6 @@ Patch50: qt5-poll.patch
Patch52: qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch
## upstream patches
# workaround https://bugreports.qt-project.org/browse/QTBUG-43057
# 'make docs' crash on el6, use qSort instead of std::sort
Patch100: qtbase-opensource-src-5.4.0-QTBUG-43057.patch
# recently passed code review, not integrated yet
# https://codereview.qt-project.org/126102/
@ -328,10 +325,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch52 -p1 -b .moc_WORDSIZE
%if 0%{?rhel} == 6
%patch100 -p1 -b .QTBUG-43057
%endif
%patch150 -p1 -b .moc_system_defines
%patch184 -p1 -b .0084

12
qtbase-opensource-src-5.4.0-QTBUG-43057.patch
View File

@ -1,12 +0,0 @@
diff -up qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp.QTBUG-43057 qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp
--- qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp.QTBUG-43057 2014-12-05 10:24:31.000000000 -0600
+++ qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp 2014-12-17 14:47:19.393037164 -0600
@@ -1327,7 +1327,7 @@ void QDocIndexFiles::generateIndexSectio
const InnerNode* inner = static_cast<const InnerNode*>(node);
NodeList cnodes = inner->childNodes();
- std::sort(cnodes.begin(), cnodes.end(), compareNodes);
+ qSort(cnodes.begin(), cnodes.end(), compareNodes);
foreach (Node* child, cnodes) {
generateIndexSections(writer, child, generateInternalNodes);