diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 20:16:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 20:16:34 (GMT) |
| commit | 917e4e3284a568eecfca26365cc0a545d0f4eb70 (patch) | |
| tree | 247bbe996467199c011a348658d62844206336e0 /tests/auto/selftests/expected_skipglobal.xml | |
| parent | 0599478b270ae277121a55c6040acc15edd4d6eb (diff) | |
| parent | 8d84ef130ca8dc3d6a7c0b6e7408ad2db6874e75 (diff) | |
| download | Qt-917e4e3284a568eecfca26365cc0a545d0f4eb70.zip Qt-917e4e3284a568eecfca26365cc0a545d0f4eb70.tar.gz Qt-917e4e3284a568eecfca26365cc0a545d0f4eb70.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (73 commits)
Apply Rhys's fix to qpaintengine_vg.cpp to make it compile
Attempt again at fixing the OpenVG paint engine build
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
Fixing the wrong QUrl usage
When on Symbian use smaller files.
correctly position glyphs for complex languages
Removed inneccessary QGlyphLayout::offsets initialization.
Fix mirrored characters for RTL text in Symbian
QNAM: Add a code comment related to the cache
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
QtScript: regression with instanceof operator for QMetaObject wrappers
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
QNAM HTTP: Fixed a bug when getting empty files with pipelining
Fix window transparency on Symbian.
...
Diffstat (limited to 'tests/auto/selftests/expected_skipglobal.xml')
| -rw-r--r-- | tests/auto/selftests/expected_skipglobal.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/selftests/expected_skipglobal.xml b/tests/auto/selftests/expected_skipglobal.xml new file mode 100644 index 0000000..54a5671 --- /dev/null +++ b/tests/auto/selftests/expected_skipglobal.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<TestCase name="tst_SkipGlobal"> +<Environment> + <QtVersion>4.6.3</QtVersion> + <QTestVersion>4.6.3</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skipglobal/tst_skipglobal.cpp" line="72"> + <Description><![CDATA[Skippy Skippy]]></Description> +</Message> +</TestFunction> +</TestCase> |