1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
Description: Workaround for -fvisibility-inlines-hidden on alpha:
break out the static methods so they're not inlined.
fix FTBFS on alpha.
Bug-Debian: http://bugs.debian.org/368883
Author: Steve Langasek <vorlon@debian.org>
---
src/corelib/global/qlibraryinfo.cpp | 14 ++++++++------
src/corelib/tools/qhash.h | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -85,12 +85,7 @@ class QLibraryInfoPrivate
{
public:
static QSettings *findConfiguration();
- static void cleanup()
- {
- QLibrarySettings *ls = qt_library_settings();
- if (ls)
- ls->settings.reset(0);
- }
+ static void cleanup();
static QSettings *configuration()
{
QLibrarySettings *ls = qt_library_settings();
@@ -98,6 +93,13 @@ public:
}
};
+void QLibraryInfoPrivate::cleanup()
+{
+ QLibrarySettings *ls = qt_library_settings();
+ if (ls)
+ ls->settings.reset(0);
+}
+
QLibrarySettings::QLibrarySettings()
: settings(QLibraryInfoPrivate::findConfiguration())
{
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -521,7 +521,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
}
template <class Key, class T>
-Q_INLINE_TEMPLATE void QHash<Key, T>::duplicateNode(QHashData::Node *node, void *newNode)
+void QHash<Key, T>::duplicateNode(QHashData::Node *node, void *newNode)
{
Node *concreteNode = concrete(node);
if (QTypeInfo<T>::isDummy) {
|
