diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:49 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:49 (GMT) |
| commit | 3ca305cf25033477b73121aa6622f8c9115285ec (patch) | |
| tree | 59edd09384ffca0b5e68a777a032a9aa3f65a9df /src/corelib/global/qlibraryinfo.cpp | |
| parent | 2cac8ca88c9b5b2f9d3040b1543d88ecee52da99 (diff) | |
| parent | d3b898e973662707f9644b4fe5f8d18849929723 (diff) | |
| download | Qt-3ca305cf25033477b73121aa6622f8c9115285ec.zip Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.gz Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.bz2 | |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index ea7e2e4..a0779c9 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -500,6 +500,7 @@ 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() { @@ -508,6 +509,14 @@ void qt_core_boilerplate() "Contact: Nokia Corporation (qt-info@nokia.com)\n" "\n" "Build key: " QT_BUILD_KEY "\n" + "Compat build key: " +#ifdef QT_BUILD_KEY_COMPAT + "| " QT_BUILD_KEY_COMPAT " " +#endif +#ifdef QT_BUILD_KEY_COMPAT2 + "| " QT_BUILD_KEY_COMPAT2 " " +#endif + "|\n" "Build date: %s\n" "Installation prefix: %s\n" "Library path: %s\n" @@ -517,6 +526,8 @@ void qt_core_boilerplate() qt_configure_libraries_path_str + 12, qt_configure_headers_path_str + 12); +// qDumpCPUFeatures(); + #ifdef QT_EVAL extern void qt_core_eval_init(uint); qt_core_eval_init(1); |