diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-05 16:35:28 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-05 16:35:28 (GMT) |
| commit | 58bac5551cbeed83a99e257226bb7b40d363bab9 (patch) | |
| tree | 4c4f47fc20f53a29e4d5dcfa3e59b8e7d523dee3 /tests/auto/symbols | |
| parent | ebecf192abe56c405409343acc2f97eaf9124fc3 (diff) | |
| parent | 60b09b8915e2095b221eb0a16a76d49e5bb10391 (diff) | |
| download | Qt-58bac5551cbeed83a99e257226bb7b40d363bab9.zip Qt-58bac5551cbeed83a99e257226bb7b40d363bab9.tar.gz Qt-58bac5551cbeed83a99e257226bb7b40d363bab9.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/symbian_building.prf
src/network/access/qhttpnetworkconnectionchannel.cpp
Diffstat (limited to 'tests/auto/symbols')
| -rw-r--r-- | tests/auto/symbols/tst_symbols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/symbols/tst_symbols.cpp b/tests/auto/symbols/tst_symbols.cpp index 28970eb..1572a5f 100644 --- a/tests/auto/symbols/tst_symbols.cpp +++ b/tests/auto/symbols/tst_symbols.cpp @@ -443,7 +443,7 @@ void tst_Symbols::prefix() # if defined(Q_OS_LINUX) && defined(Q_CC_INTEL) QEXPECT_FAIL("", "linux-icc* incorrectly exports some QtWebkit symbols, waiting for a fix from Intel.", Continue); # endif - QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output :)"); + QVERIFY2(!isFailed, "Libraries contain non-prefixed symbols. See Debug output above."); #else QSKIP("Linux-specific test", SkipAll); #endif |