diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 10:13:28 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 10:13:28 (GMT) |
| commit | 8f9d38ed63a2c568596febe5ea59a55fe03d7ba9 (patch) | |
| tree | aed0951fc53191a24c3f64862554976c57a708c9 /src/corelib/global | |
| parent | 0bf1b83cd7d972a69388cdbd759dbba8b1baffd2 (diff) | |
| parent | 72cc21e597f2d77ea1be3c1a3f7df36d8909d2fc (diff) | |
| download | Qt-8f9d38ed63a2c568596febe5ea59a55fe03d7ba9.zip Qt-8f9d38ed63a2c568596febe5ea59a55fe03d7ba9.tar.gz Qt-8f9d38ed63a2c568596febe5ea59a55fe03d7ba9.tar.bz2 | |
Merge branch 'qt-4.7' into lighthouse-4.7
Conflicts:
configure
src/corelib/tools/qsimd.cpp
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/global.pri | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 758c5ee..dbbabf4 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -23,7 +23,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = global/qt_pch.h -linux*-g++*:!static { +linux*:!static:!linux-armcc:!linux-gcce { QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 65699f6..ec7eef2 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1837,6 +1837,7 @@ QSysInfo::S60Version QSysInfo::s60Version() CDir* contents; TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_S60SystemInstallDir, contents); if (err == KErrNone) { + QScopedPointer<CDir> contentsDeleter(contents); err = contents->Sort(EDescending|ESortByName); if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 12) { TInt major = (*contents)[0].iName[9] - '0'; @@ -1859,7 +1860,6 @@ QSysInfo::S60Version QSysInfo::s60Version() } } } - delete contents; } # ifdef Q_CC_NOKIAX86 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index ea7e2e4..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 @@ -508,6 +510,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 +527,8 @@ void qt_core_boilerplate() qt_configure_libraries_path_str + 12, qt_configure_headers_path_str + 12); + QT_PREPEND_NAMESPACE(qDumpCPUFeatures)(); + #ifdef QT_EVAL extern void qt_core_eval_init(uint); qt_core_eval_init(1); |