summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-151-22/+77
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes tooltips for QGraphicsProxyWidget.
| * Fixes tooltips for QGraphicsProxyWidget.Yoann Lopes2010-04-151-22/+77
| | | | | | | | | | | | | | | | | | Help event was not propagated to the widget. Also fixes tooltip value propagation when setting it on the proxy or on the widget. Autotest included. Task-number: QTBUG-5349 Reviewed-by: bnilsen
* | Phonon MMF: calling pause() when in StoppedState triggers stateChanged()Gareth Stockwell2010-04-151-1/+1
| | | | | | | | | | | | | | | | Previously, the MMF backend simply swallowed a call to pause() when in StoppedState. However, the stopToPause step in tst_mediaobject requires the backend to emit a stateChanged signal when this happens. Reviewed-by: Frans Englich
* | tst_mediaobject: ensure MediaObject is in StoppedState before each stepGareth Stockwell2010-04-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the steps in the tst_mediaobject suite (a) check that the MediaObject is in StoppedState at the start of the step and (b) call stopPlayback() at the end. If, however, a QTest check fails during the test, stopPlayback may not be called. This patch adds a call to MediaObject::stop() in the suite's init() function. This is a symptom of a wider problem with this test suite, namely that it re-uses a single instance of Phonon::MediaObject for all steps. Given the highly stateful nature of MediaObject, this can lead to test steps failing due to some state which was erroneously carried forward from an earlier step. While this test suite design may more faithfully represent real-world usage of Phonon, it makes tracking down the root causes of test failures needlessly difficult. Reviewed-by: Frans Englich
* | tst_mediaobject: Removed non-portable escape codes from outputGareth Stockwell2010-04-151-8/+2
| | | | | | | | | | | | | | | | Test step was outputting ANSI escape codes in order to highlight certain text. These codes are not natively supported by Windows consoles, resulting in raw escape codes appearing in the output. Reviewed-by: Frans Englich
* | tst_mediaobject: Ensure playSDP step cleanup is runGareth Stockwell2010-04-151-5/+10
| | | | | | | | | | | | | | | | | | This step previously did not guarantee that the m_media object would be left in StoppedState, which in turn meant that following test steps could fail. Task-number: QTBUG-9339 Reviewed-by: Frans Englich
* | tst_mediaobject: Removed compiler warningsGareth Stockwell2010-04-152-4/+2
| | | | | | | | | | | | Compiler warnings concerned unreachable code. Reviewed-by: Frans Englich
* | tst_mediaobject: Removed compiler warningsGareth Stockwell2010-04-151-6/+0
| | | | | | | | | | | | Removed declaration of variables which are subsequently unused. Reviewed-by: Frans Englich
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-145-0/+91
|\ \ | |/ |/| | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be2489a618c909c4a82d927f9fff9d12feafeb30 ) QtScript: Add tests for translation of multiple scripts QtScript: Add test for translation disambiguation QtScript: Fix call stack issue with qsTr() when JIT is enabled
| * QtScript: Add tests for translation of multiple scriptsKent Hansen2010-04-144-0/+81
| | | | | | | | Suggested by Olivier.
| * QtScript: Add test for translation disambiguationKent Hansen2010-04-144-0/+10
| |
* | merge commit c638ddc70f6a8196f2c8b11808ab01510233a0ee from harfbuzz:Lars Knoll2010-04-141-0/+2
|/ | | | | | | | | | | | | | | | | | | commit c638ddc70f6a8196f2c8b11808ab01510233a0ee Author: Lars Knoll <lars.knoll@nokia.com> Date: Wed Apr 14 17:01:49 2010 +0200 Fix a bug in malayalam shaping See http://bugreports.qt.nokia.com/browse/QTBUG-1887. We were not finding the base character correctly in the case where the syllable contained a ZWJ. In addition, the indic OT specs require us to also apply the 'loca', 'cjct' and 'calt' features. They seem to be mostly unused by todays fonts, but we should better apply them anyways. Task-number: QTBUG-1887 Reviewed-by: Eskil
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-141-6/+8
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
| * QAbstractScrollArea StyleSheet: fix drawing of border with ↵Olivier Goffart2010-04-141-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SH_ScrollView_FrameOnlyAroundContents - Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents is true. - We also reserved too much space for the border, as we included the native border as well in the computation, so do not reserve additional space by setting PM_ScrollView_ScrollBarSpacing to 0 Task-number: QTBUG-9821 Reviewed-by: jbache
* | Improve test coverage of QtScript translation functionsKent Hansen2010-04-141-0/+42
| | | | | | | | And fix two silly typos in the error messages.
* | tst_qftp: Attempting to reproduce a crashMarkus Goetz2010-04-131-0/+26
| | | | | | | | Task-number: QTBUG-7359
* | Autotest: update path location on the test serverThiago Macieira2010-04-133-3/+3
| |
* | Autotest: update location of fluke.gif on test serverThiago Macieira2010-04-131-1/+1
| |
* | Make qsTr work in global scopeKent Hansen2010-04-136-0/+87
|/ | | | | | | | | | | Search up the call stack to find the first non-empty source URL. Also and add an autotest for the QtScript translator functions since there was none (their presence was checked, but not their behavior...). Task-number: QTBUG-9775 Reviewed-by: Olivier Goffart
* CSS: fixes border only affecting the first widget.Olivier Goffart2010-04-121-0/+13
| | | | | | | | | | | | | | Rules like "Foo { border: 2px solid; }" does not specify the border color. When the border color is not specified, it is assumed to be black. When reading the brush value from the cache, we should take that into account. Note that this logic cannot be moved into brushFromData() as it is different for the background. (when no color is specified, it is assumed to be transparent) Reviewed-by: jbache Task-number: QTBUG-9674 (part one)
* Autotest: Use the file in the non-writeable areaThiago Macieira2010-04-111-3/+3
|
* Autotest: moved these to the qtest/ dirThiago Macieira2010-04-112-4/+3
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-092-2/+4
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Autotest: same as previous commit Autotest: fix network test failure
| * Autotest: same as previous commitThiago Macieira2010-04-091-1/+2
| |
| * Autotest: fix network test failureThiago Macieira2010-04-091-1/+2
| |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-091-0/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable preserved swap behavior when surface is created due to resize. Generate triggered signal even the action launches menu in Symbian. Symbian emulator: unload file server so apps can be recompiled. Clear QFontCache TLS content before nullifying TLS pointer. Fixed focus and window activation events on Symbian when opening menu. QTBUG-4887 and other exception safety fixes
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-071-0/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QTBUG-4887 and other exception safety fixes
| | * | QTBUG-4887 and other exception safety fixesmread2010-04-071-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes a fix for QTBUG-4887 and other exception safety problems found while testing it. The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on failure like a proper class should, instead it tries to fail "nice". What happens here is that setAlphaChannel would crash on OOM as after the convertToFormat call, d could be NULL. This new version checks the result of the conversion before using it. The other fixes are all cases where exceptions were thrown from destructors. I added code to the test app to help debug these cases, and I fixed all the problems I found. With these changes, tst_exceptionsafety_objects runs and passes on the Symbian emulator. Reviewed-by: Shane Kearns
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-093-1/+99
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: we don't ship a qconfig executable in the Windows CE packages Fixed possible data corruption in the triangulating stroker. Fixed caching of QPainter patterns in the GL 2 engine. Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget QTableView: fix spans corruption when removing spans. Fixes painting artifacts when scaling a QGraphicsProxyWidget. Fix <MemLeak> valgrind report shows memory leak for QImage::save(). Fix test sql for sql server.
| * | | Fixes CursorChange and TooltipChange events delivery for QGraphicsWidgetYoann Lopes2010-04-071-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the documentation mentions, these two events are delivered respectively after the cursor has changed and after the tooltip has changed. These two events were previously delivered just before. This patch is needed for fixing QTBUG-5349 even if it is not directly related. Auto-test included. Reviewed-by: bnilsen
| * | | QTableView: fix spans corruption when removing spans.Olivier Goffart2010-04-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We should not do -1 after erasing, as it is done later on. - We should consider the 0 height even if it is not the last span. - Added an assert. Task-number: QTBUG-9631 Reviewed-by: Gabriel
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-071-1/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix test sql for sql server.
| | * | Fix test sql for sql server.Bill King2010-04-071-1/+5
| | |/ | | | | | | | | | Sql server requires explicitly setting fields to be nullable.
* | | Regressions in Global Object prototype accessKent Hansen2010-04-091-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.5, changing the prototype of the (custom) global object used to "Just Work"(tm). In the JSC-based back-end, the built-in global object acts as a proxy if a custom global object is set, because JSC doesn't (yet, anyway) provide a way to replace the global object. To complicate this further, we also have a proxy to the original global object (that bypasses the custom global object proxying (!)). This is so that properties of the original global object can still be accessed with the QtScript C++ API when a custom global object has been set. Unfortunately, JSObject::prototype()/setPrototype() are not virtual, meaning that a change of prototype in the source object is not reflected in the proxy or vice versa. Work around this for now by syncing the prototype at the appropriate places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()). This fixes all except the case when a prototype is set from JS, since such a write doesn't go through our public C++ API. But this case can be detected and handled by the global object's JSObject::put() reimplementation. Created a separate report for that issue: QTBUG-9737. Task-number: QTBUG-7066 Reviewed-by: Jedrzej Nowacki
* | | Autotest: fix paths on the test server after update.Thiago Macieira2010-04-094-13/+14
|/ / | | | | | | Reviewed-by: Trust Me
* | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-073-52/+25
|/ | | | Reviewed-by: jason mcdonald
* Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | | | Reviewed-by: rohan mcgovern
* Did not include updated repaint number for parent item in revert.Toby Tomkins2010-04-061-1/+1
|
* Partially revert "Remove qWait functions as it is used in QTRY_* macros."Toby Tomkins2010-04-011-172/+314
| | | | | | | | | | Needs investigation of autotest failures on QWS, osx, win platforms. This reverts commit 741b75b8e595a26944ba8fca8835463787b02676. Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
* Merge commit 'origin/4.6' into 4.6-multimediaToby Tomkins2010-04-0110-149/+210
|\ | | | | | | | | Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.David Faure2010-03-311-1/+12
| | | | | | | | | | Merge-request: 541 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Revert "Add a children private property needed for QML to support ↵Alexis Menard2010-03-311-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | QGraphicsObject" This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drops the support of QML on top of 4.6
| * Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-311-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp This drop the support of QML on top of 4.6
| * Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry ↵Alexis Menard2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | changes" This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2. Conflicts: src/gui/graphicsview/qgraphicswidget.cpp Drop the support of QML on top of 4.6
| * Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-311-2/+1
| | | | | | | | | | | | This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311. This drop the support of QML on top of 4.6
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-301-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs. Compile on MingW struct -> class, it's better. Add a a layout property in QGraphicsWidget. Fix QFileSystemModel to not install useless watchers on the filesystem
| | * Add a a layout property in QGraphicsWidget.Alexis Menard2010-03-301-1/+2
| | | | | | | | | | | | Reviewed-by:michael brasser
| * | Autotest: don't allow choosing between debug/release mode.Thiago Macieira2010-03-303-18/+4
| |/ | | | | | | | | | | | | You can't build for debug mode on Windows if Qt wasn't built in debug mode. So force the selection to be exactly what Qt was built. Reviewed-by: Trust Me
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-291-0/+3
| |\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use QSKIP rather than commenting a failure.
| | * Use QSKIP rather than commenting a failure.Alexis Menard2010-03-291-0/+3
| | | | | | | | | | | | Reviewed-by:TrustMe