summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-2319-56/+1146
|\ | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-221-0/+22
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent infinite loop in raster engine on zero dash pattern length.
| | * Prevent infinite loop in raster engine on zero dash pattern length.Samuel Rødal2011-02-221-0/+22
| | | | | | | | | | | | | | | Task-number: QTBUG-17053 Reviewed-by: Kim
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-2226-245/+850
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tools/qml/qml.pri
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-206-51/+236
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | | * | Autotest: make at least one update before checking if more are neededThiago Macieira2011-02-201-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer gets started only by making updates. If you try to check if an update is needed without making the first update, the timer won't be started and the function will return false.
| | | * | Autotest: check that the type received is the expected oneThiago Macieira2011-02-201-8/+43
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17476
| | | * | Autotest: don't use the deprecated signal from QDBusConnectionInterfaceThiago Macieira2011-02-171-39/+17
| | | | |
| | | * | Autotest: be nicer to the subprocess and SIGTERM itThiago Macieira2011-02-171-1/+2
| | | | |
| | | * | Autotest: avoid memory leaks if test failsThiago Macieira2011-02-171-24/+41
| | | | |
| | | * | QtDBus: Make sure we can receive unknown typesThiago Macieira2011-02-172-2/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must make sure we advance the receiving iterator, or we end up in an infinite loop. Task-number: QTBUG-17476
| | | * | QtDBus meta object: keep methods, signals and props with unknown typesThiago Macieira2011-02-171-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use VoidStar as the metatype, with an unknown type called "QDBusRawType". The actual D-Bus type is saved as an hex value as a template parameter. D-Bus type Qt type comment h QDBusRawType<0x68>* Unix file descriptors ~ QDBusRawType<0x7e>* invalid type ai QDBusRawType<0x6169>* array of int32 a{i(ssy)} QDBusRawType<0x617b6928737379297d>* Note that the number in the template doesn't have to be valid. The QDBusRawType class doesn't exist anyway. I thought of just leaving the raw D-Bus type there, but who knows what kind of things can appear there, like other '>' (which may cause problems for anything trying to parse the meta object later). Task-number: QTBUG-17476
| | | * | Autotest: add a new test for parsing an introspection with unknown typesThiago Macieira2011-02-171-2/+33
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17476
| | | * | Make the QtDBus parser not complain about unknown thingsThiago Macieira2011-02-171-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep only the warnings about application errors. If the unknown things come from the outside, it's not our job to make noise. Task-number: QTBUG-17476
| | | * | Add a mutex to protect the access to the QSet.Thiago Macieira2011-02-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In theory, there should be no problems with doing this unlocked, as the test should only run one thread at a time in this particular code section. In practice, if the test is failing, multiple threads would be modifying the QSet. So the mutex is necessary to detect the test failing. Reviewed-By: Morten Sørvig
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-186-5/+329
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit auto test failure on windows. Fix FocusScope example. Fix compilation on old Symbian platforms Export symbols from qtestlib required for QtQuickTest Allow MouseArea to prevent mouse grab begin stolen by Flickable. Fix QTBUG-17008 XmlListModel blocks Windows system events Fix TextInput, TextEdit auto test failure on windows and mac. QDeclarativeDebug: Fix crash when serializing list of QObjects Update the input context when the pre-edit cursor position changes.
| * | | | | Fix animations with alwaysRunToEnd that are frequently stopped/started.Michael Brasser2011-02-221-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous refactoring of the animation logic introduced a regression -- 'restart' rather than 'continue' behavior. Change-Id: I8ade2286298fad48f5e268793a0b2571884bc5d0 Task-number: QTBUG-16736 Reviewed-by: Martin Jones
| * | | | | Fix auto test failure on mac.Andrew den Exter2011-02-222-61/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for some error in the cursor position due to plaform specific offsets and the like. Change-Id: I2bef793596ab2a5e38cf77aee624bd9fdd5ca38c
| * | | | | Prevent an animation from being registered to run twice.Michael Brasser2011-02-223-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could cause animations to start running that could not later be stopped. Change-Id: I320f50121f3566619f08181664d049b02e2848e5 Reviewed-by: Martin Jones
| * | | | | Add missing test file.Martin Jones2011-02-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed in 1bcddaaf318fc37c71c5191913f3487c49444ec6 Change-Id: I4f71e5fb2b0e67a6e64ee64ae03b9d9cfc7a244f Task-number: QTBUG-17361
| * | | | | Prevent recursion due to nested Flickables with pressDelayMartin Jones2011-02-212-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The outermost Flickable handles pressDelay for all descendents, rather than having it cascade up and replayed multiple times. Change-Id: Id294862469f3ce56b0940fbbb0e041d4c9f64f28 Task-number: QTBUG-17361 Reviewed-by: Michael Brasser
| * | | | | Ensure animations start correctly when running is bound to a value.Michael Brasser2011-02-212-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animations register to be started when the component is finalized, but in the case of a binding, the registration doesn't happen until we are already working with a copy of the finalization list. With this patch, we no longer work with a copy, but with the actual list. Change-Id: If460c250d2403590907e9ac854d277db68ba8b2a Task-number: QTBUG-14042 Reviewed-by: Aaron Kennedy
| * | | | | Hide the TextInput/Edit cursor when the view doesn't have focus.Andrew den Exter2011-02-212-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display a cursor if both the item and its scene have focus. Change-Id: I0c91ab4d533cd7d773ffc2489633e12c0d399ad9 Task-number: QTBUG-17365 Reviewed-by: Martin Jones
| * | | | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-212-3/+279
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings TextInput in line with QLineEdit. The fix for TextEdit applies equally to QTextEdit. Change-Id: I5c47e5c8e951ee53cb1fe45d9c302050cd19deef Task-number: QTBUG-15705 Reviewed-by: axis
| * | | | Fix TextEdit auto test failure on windows.Andrew den Exter2011-02-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | A leaked window from a previous test held focus meaning events weren't being delivered to the expected widget. Delete the offending widget.
| * | | | Allow MouseArea to prevent mouse grab begin stolen by Flickable.Martin Jones2011-02-172-0/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Placing a MouseArea in a Flickable (or PinchArea, or PathView) allows the Flickable to steal mouse events when it detects a flick/drag event. In some cases this is not desireable and MouseArea should be able to retain its grab. Added a 'preventStealing' property to prevent an ancestor item from stealing the MouseArea's grab. Change-Id: I6277fbb76919b2b35d4e32a247b38a90e305dbdf Task-number: QTBUG-17285 Reviewed-by: Joona Petrell
| * | | | Fix QTBUG-17008 XmlListModel blocks Windows system eventsCharles Yin2011-02-171-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XmlListModel uses a worker thread to process XML query, however the worker thread doesn't use it's own event loop. So after processing the query, the worker thread just blocks on a wait condition and then blocks all posted system events. Change-Id: Icdd9ddd1f3f26fd632726f7200c2a81b0877d2d1 Task-number:QTBUG-17008 Reviewed-by:Martin Jones
| * | | | Fix TextInput, TextEdit auto test failure on windows and mac.Andrew den Exter2011-02-162-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Micro focus is only updated on X11, QWS and Symbian platforms. Change-Id: Id02655cba79429e91022593ff0d1d6b8068c84ec Reviewed-by: Martin Jones
| * | | | QDeclarativeDebug: Fix crash when serializing list of QObjectsKai Koehne2011-02-161-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17444 Reviewed-by: Aaron Kennedy
| * | | | Update the input context when the pre-edit cursor position changes.Andrew den Exter2011-02-162-2/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The micro focus rect changes both when the regular cursor position and the pre-edit cursor positions change. Ensure updateMicroFocus is called TextInput in both cases. Change-Id: I6822a710b841e106ce2462f74fea398250596913 Task-number: QTBUG-17396 Reviewed-by: Martin Jones
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-183-0/+35
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-183-0/+35
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added test case for corrupt pixel count in XPM image. QImage crash when invalid XPM is read. Fix an issue with removing rows in a table model.
| | * | | Added test case for corrupt pixel count in XPM image.Samuel Rødal2011-02-182-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by merge request 1080. Task-number: QTBUG-17254
| | * | | Fix an issue with removing rows in a table model.Michael Goddard2011-02-181-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tables with nulls in a row were not being deleted properly in some cases. Made sure the responsible function no longer has default parameters so this doesn't happen again. Change-Id: I479121172d5ac172ca49da78638b9353d7a67548 Task-number: QTBUG-16007, QTBUG-15979 Reviewed-by: Charles Yin
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1723-2/+449
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf mkspecs/symbian-gcce/qmake.conf src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/plugins/plugins.pro tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+32
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix inheritance of widget input contexts.
| | * | | Fix inheritance of widget input contexts.Andrew den Exter2011-02-151-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a parent widget has an input context assigned return that from QWidget::inputContext() before returning QApplication::inputContext(). Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e Task-number: QTBUG-17390 Reviewed-by: axis
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-141-0/+19
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
| | * | | QStyleSheetStyle: dont crash in PE_WIDGET when widget is nullOlivier Goffart2011-02-141-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gabriel Task-number: QTBUG-15910
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-1421-2/+399
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't leak ScopeChainNode's Rename 'plugins\qmldebugging' (work around qmake issues) Correct the "module not installed" error handling Flickable uses the flick velocity to determine whether to retain grab Make addImportPath() work for windows paths starting with lower case Report any exceptions occurring in WorkerScript javascript code MouseArea docs - link to onCanceled() from onReleased()
| | * | Don't leak ScopeChainNode'sAaron Kennedy2011-02-141-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a sub-scope of the global scope chain, rather than a completely new scope chain. Leaks are difficult to autotest, but an autotest for QScriptDeclarativeClass::pushCleanContext() was added to ensure its behavior doesn't regress. To reproduce the leak (prior to this change) use: while (true) { QScriptDeclarativeClass::pushCleanContext(&engine); engine.popContext(); } Change-Id: I41ac61ea1664da569eb329c8276f2a0bb6d2f1f7 Task-number: QTBUG-17166 Reviewed-by: Martin Jones
| | * | Correct the "module not installed" error handlingAaron Kennedy2011-02-1115-1/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The not installed error will be issued if, after loading plugins and considering the contents of qmldir, there are no elements in the particular minor version. For example, if a plugin/qmldir provides the following types (either from C++ or as QML files specified in the qmldir file): Foo 1.1 Bar 1.3 importing versions 1.0, 1.2, or 1.4 will fail with the not installed error. Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8 Task-number: QTBUG-17324 Reviewed-by: Martin Jones
| | * | Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was causing assert failure on windows if the 'c:' was lower case, since it was being added to the import path database with a lower case and thus later lookups with an upper case 'c:' would fail. This change fixes the check for whether the path refers to a local path or not. Task-number: QTBUG-16885 Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877 Reviewed-by: Martin Jones
| | * | Report any exceptions occurring in WorkerScript javascript codeBea Lam2011-02-115-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17183 Change-Id: I709cca0bdce247ca9250c4f334654e2ff57b0b32 Reviewed-by: Aaron Kennedy
* | | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-165-12/+246
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * | | | Fix race condition between QEventLoop::exec and QThread::exitOlivier Goffart2011-02-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As also mentioned in QTBUG-16692 Reviewed-by: brad Task-number: QTBUG-17257
| * | | | tst_qnetworkreply: Use proper test server hostnameMarkus Goetz2011-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Petersson
| * | | | tst_qnetworkreply: Some additionsMarkus Goetz2011-02-041-1/+15
| | | | |
| * | | | tst_qnetworkreply: Relax a conditionMarkus Goetz2011-02-041-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | With the different buffers in Qt and the OS, we relax a condition for now.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-311676-4991/+3659
| |\ \ \ \