blob: 45a0a9d0fa8fc4f9cda8e9458bc62c69ef8d6927 (
plain)
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
|
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -71,14 +71,7 @@ class QLibraryInfoPrivate
{
public:
static QSettings *findConfiguration();
- static void cleanup()
- {
- QLibrarySettings *ls = qt_library_settings();
- if (ls) {
- delete static_cast<QSettings *>(ls->settings);
- ls->settings = 0;
- }
- }
+ static void cleanup();
static QSettings *configuration()
{
#ifdef QT_NO_THREAD
@@ -97,6 +90,15 @@ public:
}
};
+void QLibraryInfoPrivate::cleanup()
+{
+ QLibrarySettings *ls = qt_library_settings();
+ if (ls) {
+ delete static_cast<QSettings *>(ls->settings);
+ ls->settings = 0;
+ }
+}
+
QLibrarySettings::QLibrarySettings()
{
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -492,7 +492,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) {
|
