diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 08:14:13 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-30 13:28:07 (GMT) |
| commit | f6020903ee0caea34b84e6660c3fbd1545e21249 (patch) | |
| tree | 86291dc05cab7d56590514a0a1185f2b289bcb2f /src/corelib/global | |
| parent | 794ca0afac9ac77350bf0697ccb9af82cd253cc6 (diff) | |
| download | Qt-f6020903ee0caea34b84e6660c3fbd1545e21249.zip Qt-f6020903ee0caea34b84e6660c3fbd1545e21249.tar.gz Qt-f6020903ee0caea34b84e6660c3fbd1545e21249.tar.bz2 | |
Reenable the reporting of CPU features.
The linking error before was most likely namespace issue
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); |