diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 22:06:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-16 22:06:42 (GMT) |
| commit | ec3dc06b5fbf7ef37e0836992f6d7a3fd49c5891 (patch) | |
| tree | 195c66ded290b2ebb4b2398c8967666eb0e7c2aa /tests/auto/selftests/expected_maxwarnings.txt | |
| parent | 95d3bd3fc993d7c8c1fe92960c617a3392d87f66 (diff) | |
| parent | 9e5e97f3b5eaa9cda471be44a5c59b51561393b6 (diff) | |
| download | Qt-ec3dc06b5fbf7ef37e0836992f6d7a3fd49c5891.zip Qt-ec3dc06b5fbf7ef37e0836992f6d7a3fd49c5891.tar.gz Qt-ec3dc06b5fbf7ef37e0836992f6d7a3fd49c5891.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
QLocalSocket::isValid on Windows must check for broken connection
fix pipe handle leak in qlocalsocket_win.cpp
GraphicsViewBenchmark: Run app in full screen mode on small desktops.
Fix Thai text on Windows 7
Fix License headers.
QTextCodec::codecForName. Insert in the cache in all cases.
Prevented calling the pixmap filter implementations with null pixmaps.
Make it possible to run benchmarks with the "-graphicssystem" switch.
Add support for running the GraphicsViewBenchmark application manually.
Bump version to 4.6.3.
Fixed a GLX warning that occured with some Intel chipsets under X11.
Fixed compile for maemo6.
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
...
Diffstat (limited to 'tests/auto/selftests/expected_maxwarnings.txt')
| -rw-r--r-- | tests/auto/selftests/expected_maxwarnings.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt index 8bafeff..0da1799 100644 --- a/tests/auto/selftests/expected_maxwarnings.txt +++ b/tests/auto/selftests/expected_maxwarnings.txt @@ -1,5 +1,5 @@ ********* Start testing of MaxWarnings ********* -Config: Using QTest library 4.6.2, Qt 4.6.2 +Config: Using QTest library 4.6.3, Qt 4.6.3 PASS : MaxWarnings::initTestCase() QWARN : MaxWarnings::warn() 0 QWARN : MaxWarnings::warn() 1 |