From f2b9a249664349dcf7bda907707023fa5b9a29ba Mon Sep 17 00:00:00 2001
From: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Date: Mon, 6 Sep 2010 14:18:32 +0200
Subject: Enable QLibrary debugging via QT_DEBUG_PLUGINS

Reviewed-by: janarve
---
 src/corelib/plugin/qlibrary.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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
-- 
cgit v0.12


From 8e163729a426c7ddc99edaf2272332f1dbd86a46 Mon Sep 17 00:00:00 2001
From: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Date: Mon, 6 Sep 2010 16:33:51 +0200
Subject: Remove temporary gdb-index after merging it

Reviewed-by: ossi
---
 mkspecs/features/unix/gdb_dwarf_index.prf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf
index 7824d93..80d5505 100644
--- a/mkspecs/features/unix/gdb_dwarf_index.prf
+++ b/mkspecs/features/unix/gdb_dwarf_index.prf
@@ -3,7 +3,8 @@
     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
-- 
cgit v0.12


From 2977f517f129da3642c43aae7b4f192760956287 Mon Sep 17 00:00:00 2001
From: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Date: Mon, 6 Sep 2010 17:49:33 +0200
Subject: Group cd, so the entire command fails if cd fails

Reviewed-by: ossi
---
 mkspecs/features/unix/gdb_dwarf_index.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf
index 80d5505..7c0ca2f 100644
--- a/mkspecs/features/unix/gdb_dwarf_index.prf
+++ b/mkspecs/features/unix/gdb_dwarf_index.prf
@@ -1,6 +1,6 @@
 !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)\' && \
-- 
cgit v0.12