diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-30 18:52:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-30 18:52:14 (GMT) |
| commit | 3dc9281c6cdc70e87ce1cb4f5c917006a081a1af (patch) | |
| tree | 2359e1a62a7a2ab4d6b5f59df0bd63b198eeded6 /src/corelib | |
| parent | 998569ea293741f16e0a7fb4a7a249e902966bf7 (diff) | |
| parent | dfd489fd06bc4185f8e54c2b988ff2a1ee182731 (diff) | |
| download | Qt-3dc9281c6cdc70e87ce1cb4f5c917006a081a1af.zip Qt-3dc9281c6cdc70e87ce1cb4f5c917006a081a1af.tar.gz Qt-3dc9281c6cdc70e87ce1cb4f5c917006a081a1af.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix #pragma message(), the message must be enclosed in parentheses
preserve non-standard source references
QSslConfiguration: fix crash when accessing null pointer
properly parse ts contexts in obsolete messages
move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
Fix static build on Windows with MinGW.
Reenable the reporting of CPU features.
make qdoc3 boot-strappable again
fix MinGW cross compilation with -debug-and-release
Updated and new Slovenian translations for Qt 4.7
Designer: Fix crash on unsupported Language/Country combination.
Doc: Fixed qdoc warnings and generalized the date and time descriptions.
Doc: Whitespace fixes.
Doc: Fixed snippets in QML introduction broken in an earlier commit.
doc: Fixed numerous qdoc warnings.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a0779c9..957abbf 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -66,6 +66,8 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +extern void qDumpCPUFeatures(); // in qsimd.cpp + #ifndef QT_NO_SETTINGS struct QLibrarySettings @@ -500,7 +502,6 @@ QT_END_NAMESPACE extern const char qt_core_interpreter[] __attribute__((section(".interp"))) = ELF_INTERPRETER; -extern void qDumpCPUFeatures(); // in qsimd.cpp extern "C" void qt_core_boilerplate(); void qt_core_boilerplate() { @@ -526,7 +527,7 @@ void qt_core_boilerplate() qt_configure_libraries_path_str + 12, qt_configure_headers_path_str + 12); -// qDumpCPUFeatures(); + QT_PREPEND_NAMESPACE(qDumpCPUFeatures)(); #ifdef QT_EVAL extern void qt_core_eval_init(uint); |