diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 17:08:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 17:08:04 (GMT) |
| commit | 3de2b56245cd95d0097be803ab525a7a5607cf9c (patch) | |
| tree | bbbeb96eff774af576b78ae3b1649ed36011bd9c | |
| parent | dfe0fe190d078ee5b946cfba01734c34cc5cd3ec (diff) | |
| parent | 2977f517f129da3642c43aae7b4f192760956287 (diff) | |
| download | Qt-3de2b56245cd95d0097be803ab525a7a5607cf9c.zip Qt-3de2b56245cd95d0097be803ab525a7a5607cf9c.tar.gz Qt-3de2b56245cd95d0097be803ab525a7a5607cf9c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Group cd, so the entire command fails if cd fails
Remove temporary gdb-index after merging it
Enable QLibrary debugging via QT_DEBUG_PLUGINS
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 5 | ||||
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 7824d93..7c0ca2f 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,9 +1,10 @@ !CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { - QMAKE_GDB_INDEX = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; \ + QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && \ gdb -silent -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\' >/dev/null 2>&1 && \ test -f $(TARGET).gdb-index && \ - $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' || true + $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ + $$QMAKE_DEL_FILE $(TARGET).gdb-index || true !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_GDB_INDEX $$QMAKE_POST_LINK diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 8f82cc4..239509e 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -64,8 +64,6 @@ QT_BEGIN_NAMESPACE -//#define QT_DEBUG_COMPONENT - #ifdef QT_NO_DEBUG # define QLIBRARY_AS_DEBUG false #else @@ -385,8 +383,12 @@ static bool qt_unix_query(const QString &library, uint *version, bool *debug, QB } else { pos = qt_find_pattern(filedata, fdlen, pattern, plen); } - } else if (r != QElfParser::Ok) + } else if (r != QElfParser::Ok) { + if (lib && qt_debug_component()) { + qWarning(qPrintable(lib->errorString)); + } return false; + } #else pos = qt_find_pattern(filedata, fdlen, pattern, plen); #endif // defined(Q_OF_ELF) && defined(Q_CC_GNU) @@ -1275,15 +1277,11 @@ QLibrary::LoadHints QLibrary::loadHints() const /* Internal, for debugging */ bool qt_debug_component() { -#if defined(QT_DEBUG_COMPONENT) - return true; //compatibility? -#else static int debug_env = -1; if (debug_env == -1) debug_env = QT_PREPEND_NAMESPACE(qgetenv)("QT_DEBUG_PLUGINS").toInt(); return debug_env != 0; -#endif } QT_END_NAMESPACE |