]> git.pld-linux.org Git - packages/qt4.git/blame - cxx11.patch
projects / packages / qt4.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
bump icu abi to 72
[packages/qt4.git] / cxx11.patch
CommitLineData
b42b0c7f
JR		 1--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h~ 2015-05-07 16:14:48.000000000 +0200
2+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h 2019-09-14 17:24:05.875744690 +0200
3@@ -170,8 +170,8 @@
4
5 // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
6 // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.
7- template<typename T> struct HasTrivialConstructor : public std::tr1::has_trivial_constructor<T> { };
8- template<typename T> struct HasTrivialDestructor : public std::tr1::has_trivial_destructor<T> { };
9+ template<typename T> struct HasTrivialConstructor : public std::is_trivially_constructible<T> { };
10+ template<typename T> struct HasTrivialDestructor : public std::is_trivially_destructible<T> { };
11
12 #else
13
14--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h~ 2015-05-07 16:14:48.000000000 +0200
15+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h 2019-09-14 20:25:57.045375344 +0200
16@@ -257,7 +257,7 @@
17
18 using std::swap;
19
20-#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION)
21+#if 0 && !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION)
22 // The Dinkumware C++ library (used by MSVC and QNX) and clang's libc++ have a swap for pairs defined.
23
24 // swap pairs by component, in case of pair members that specialize swap
25--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h~ 2015-05-07 16:14:48.000000000 +0200
26+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h 2019-09-14 18:06:14.575659781 +0200
27@@ -317,7 +317,7 @@
28 TransitionTable* transitionTable = new TransitionTable;
29 setTransitionTable(transitionTable);
30 if (existingTransition)
31- add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), existingTransition, existingTransition->m_specificValueInPrevious);
32+ add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), +existingTransition->m_attributesInPrevious), existingTransition, existingTransition->m_specificValueInPrevious);
33 }
34 } // namespace JSC
35
36--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp~ 2015-05-07 16:14:48.000000000 +0200
37+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp 2019-09-14 18:05:24.248994834 +0200
38@@ -157,7 +157,7 @@
39 {
40 if (m_previous) {
41 if (m_nameInPrevious)
42- m_previous->table.remove(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(m_nameInPrevious.get()), m_attributesInPrevious), m_specificValueInPrevious);
43+ m_previous->table.remove(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(m_nameInPrevious.get()), +m_attributesInPrevious), m_specificValueInPrevious);
44 else
45 m_previous->table.removeAnonymousSlotTransition(m_anonymousSlotsInPrevious);
46
47@@ -280,7 +280,7 @@
48 continue;
49 }
50 structure->m_nameInPrevious->ref();
51- PropertyMapEntry entry(structure->m_nameInPrevious.get(), structure->m_offset, structure->m_attributesInPrevious, structure->m_specificValueInPrevious, ++m_propertyTable->lastIndexUsed);
52+ PropertyMapEntry entry(structure->m_nameInPrevious.get(), structure->m_offset, +structure->m_attributesInPrevious, structure->m_specificValueInPrevious, ++m_propertyTable->lastIndexUsed);
53 insertIntoPropertyMapHashTable(entry);
54 }
55 }
56--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp~ 2015-05-07 16:14:47.000000000 +0200
57+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp 2019-09-14 18:26:54.518951294 +0200
58@@ -719,7 +719,7 @@
59
60 constructor.setupOffsets();
61
62- return false;
5d0d7089 63+ return NULL;
b42b0c7f
JR		 64 };
65
66
67--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h~ 2015-05-07 16:14:45.000000000 +0200
68+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h 2019-09-14 18:23:03.718959093 +0200
69@@ -183,8 +183,8 @@
70
71 // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
72 // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.
73- template<typename T> struct HasTrivialConstructor : public std::tr1::has_trivial_constructor<T> { };
74- template<typename T> struct HasTrivialDestructor : public std::tr1::has_trivial_destructor<T> { };
75+ template<typename T> struct HasTrivialConstructor : public std::is_trivially_constructible<T> { };
76+ template<typename T> struct HasTrivialDestructor : public std::is_trivially_destructible<T> { };
77
78 #else
79
80--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/HashSet.h~ 2015-05-07 16:14:45.000000000 +0200
81+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/HashSet.h 2019-09-14 18:32:15.168940587 +0200
82@@ -188,7 +188,8 @@
83 #if COMPILER(MSVC) && _MSC_VER >= 1700
84 return iterator_const_cast(m_impl.add(value));
85 #else
86- return m_impl.add(value);
87+ pair<typename HashTableType::iterator, bool> p = m_impl.add(value);
88+ return pair<iterator, bool>(iterator(p.first), p.second);
89 #endif
90 }
91
92@@ -201,7 +202,8 @@
93 #if COMPILER(MSVC) && _MSC_VER >= 1700
94 return iterator_const_cast(m_impl.template addPassingHashCode<T, T, Adapter>(value, value));
95 #else
96- return m_impl.template addPassingHashCode<T, T, Adapter>(value, value);
97+ pair<typename HashTableType::iterator, bool> p = m_impl.template addPassingHashCode<T, T, Adapter>(value, value);
98+ return pair<iterator, bool>(iterator(p.first), p.second);
99 #endif
100 }
101
102--- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp~ 2015-05-07 16:14:47.000000000 +0200
103+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2019-09-14 18:39:17.915592915 +0200
104@@ -1080,7 +1080,7 @@
105 {
106 // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
107 RefPtr<RenderStyle> currentStyle(renderStyle());
108- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
109+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? bool(parentNodeForRenderingAndStyle()->renderStyle()) : false;
110 bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
111 bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
112
113--- qt-everywhere-opensource-src-4.8.7/src/plugins/accessible/widgets/itemviews.cpp~ 2015-05-07 16:14:48.000000000 +0200
114+++ qt-everywhere-opensource-src-4.8.7/src/plugins/accessible/widgets/itemviews.cpp 2019-09-14 18:37:01.048930870 +0200
115@@ -393,7 +393,7 @@
116 QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
117 if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
118 return false;
119- view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect);
120+ view()->selectionModel()->select(index, QItemSelectionModel::Columns | QItemSelectionModel::Deselect);
121 return true;
122 }
123
The Qt GUI application framework
This page took 0.07618 seconds and 4 git commands to generate.