From 2c924630caf449a26d92f227152bd4e0a19138f3 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Mon, 22 Feb 2010 11:29:28 +1000
Subject: Fixed failure of tst_symbols when Qt is configured with -qtnamespace

Blacklist some symbols which cannot be namespaced when Qt is configured
in a namespace.
---
 tests/auto/symbols/tst_symbols.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp
index e30481a..d6fb65a 100644
--- a/tests/auto/symbols/tst_symbols.cpp
+++ b/tests/auto/symbols/tst_symbols.cpp
@@ -212,6 +212,10 @@ void tst_Symbols::prefix()
                    << "winfnt_driver_class"
                    << "pshinter_module_class"
                    << "psnames_module_class"
+                   // C symbols from Qt
+                   << "qt_addObject"
+                   << "qt_removeObject"
+                   << "qt_startup_hook"
                    ;
 
     QHash<QString,QStringList> excusedPrefixes;
@@ -279,6 +283,10 @@ void tst_Symbols::prefix()
                       << "cti"  // ctiTrampoline and ctiVMThrowTrampoline from the JIT
 #ifdef QT_NAMESPACE
                       << "QWeb" // Webkit is only 'namespace aware'
+                      << "qWeb"
+                      << "qt"
+                      << "QGraphicsWebView"
+                      << "operator"
 #endif
         ;
 
@@ -331,6 +339,8 @@ void tst_Symbols::prefix()
                 symbol = symbol.mid(symbol.indexOf(' ') + 1);
             }
 
+            if (symbol.mid(symbol.indexOf(' ')+1).startsWith("std::"))
+                continue;
             if (symbol.startsWith("_") || symbol.startsWith("std::"))
                 continue;
             if (symbol.startsWith("vtable ") || symbol.startsWith("VTT for ") ||
@@ -342,6 +352,8 @@ void tst_Symbols::prefix()
                 continue;
             if (symbol.startsWith(ns + "operator"))
                 continue;
+            if (symbol.startsWith("operator new") || symbol.startsWith("operator delete"))
+                continue;
             if (symbol.startsWith("guard variable for "))
                 continue;
             if (symbol.contains("(" + ns + "QTextStream"))
-- 
cgit v0.12


From f0c374a107c6f66b9d013fd25a6ba38bda13916d Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Mon, 22 Feb 2010 11:54:06 +1000
Subject: Don't process uic3 subdir if qt3support is disabled.

---
 tests/auto/auto.pro | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index af9832c..3d25656 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -11,7 +11,6 @@ TEMPLATE = subdirs
            maketestselftest \
            moc \
            uic \
-           uic3 \
            guiapplauncher \
            #atwrapper \     # These tests need significant updating,
            #uiloader \      # they have hardcoded machine names etc.
@@ -69,6 +68,9 @@ Q3SUBDIRS += \
            q3uridrag \
            q3widgetstack
 
+!cross_compile:Q3SUBDIRS += \
+           uic3
+
 SUBDIRS += \
 #           exceptionsafety_objects \ shouldn't enable it
            languagechange \
-- 
cgit v0.12