diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-31 08:43:46 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-31 08:43:46 (GMT) |
| commit | ad229913fd89aa0a33fb9b37ac96ff63c89a05f8 (patch) | |
| tree | feed3678fd98565bb99a159a7e1bdb395df516ea /src/corelib/global | |
| parent | be69c316c56379d2b955491ffc54754018079dec (diff) | |
| parent | cf28f6cacf59d434072656af05466541ba69e8ae (diff) | |
| download | Qt-ad229913fd89aa0a33fb9b37ac96ff63c89a05f8.zip Qt-ad229913fd89aa0a33fb9b37ac96ff63c89a05f8.tar.gz Qt-ad229913fd89aa0a33fb9b37ac96ff63c89a05f8.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into doc-4.7
Diffstat (limited to 'src/corelib/global')
| -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); |