diff options
| author | Bill King <bking@trolltech.com> | 2010-02-22 06:20:59 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-22 06:20:59 (GMT) |
| commit | 0afed6da3d040814a686b507a981b0fc7eb14c32 (patch) | |
| tree | 1eef631448466654ac845d77d592bef4d7c92c98 /tests | |
| parent | 30ae64eaf42a2d7f80f70fb01c77a6ebcdfd1e98 (diff) | |
| parent | 6f63f4a78090f50f40f2c65af85120a715835dab (diff) | |
| download | Qt-0afed6da3d040814a686b507a981b0fc7eb14c32.zip Qt-0afed6da3d040814a686b507a981b0fc7eb14c32.tar.gz Qt-0afed6da3d040814a686b507a981b0fc7eb14c32.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tests')
| -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 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 \ 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")) |