diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-22 06:49:34 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-22 06:49:34 (GMT) |
| commit | 8cec21a14fdc53f3dd147eaf7a807c7b77a2f766 (patch) | |
| tree | f9016be9f8631548a26ea0583423aef2d74a4550 | |
| parent | 0a83a6c571fadb454cb8711aed84258b061d44b5 (diff) | |
| parent | 9d0ec198801ff93c3848320bb28591739077f7b1 (diff) | |
| download | Qt-8cec21a14fdc53f3dd147eaf7a807c7b77a2f766.zip Qt-8cec21a14fdc53f3dd147eaf7a807c7b77a2f766.tar.gz Qt-8cec21a14fdc53f3dd147eaf7a807c7b77a2f766.tar.bz2 | |
Merge remote branch 'origin/4.6' into integration-master-from-4.6
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/auto/symbols/tst_symbols.cpp | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 7ba6243..791d23c 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 \ diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp index 70abc43..28970eb 100644 --- a/tests/auto/symbols/tst_symbols.cpp +++ b/tests/auto/symbols/tst_symbols.cpp @@ -211,6 +211,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; @@ -278,6 +282,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 ; @@ -330,6 +338,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 ") || @@ -341,6 +351,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")) |