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 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -83,12 +83,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(); @@ -96,6 +91,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 @@ -520,7 +520,7 @@ Q_INLINE_TEMPLATE void QHash::de } template -Q_INLINE_TEMPLATE void QHash::duplicateNode(QHashData::Node *node, void *newNode) +void QHash::duplicateNode(QHashData::Node *node, void *newNode) { Node *concreteNode = concrete(node); if (QTypeInfo::isDummy) {