summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵J-P Nurmi2014-06-076-28/+61
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-056-28/+61
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
| | * Do not clear default button in QMessageBox::setDetailedText().Friedemann Kleint2014-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the value of QMessageBoxPrivate::autoAddOkButton temporarily when automatically adding the "Show Details..." button. Task-number: QTBUG-39334 Change-Id: I173c83893548ee83b3d8ea2743f87686c32657e7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Move native subwidgets in QWidget::scroll().Friedemann Kleint2014-05-281-1/+25
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-38999 Change-Id: Ie22dcf61895bbfc575eaae4d1929516a8749de39 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| | * Replace hard-coded qWait() by QTRY_COMPARE/VERIFY in widget tests.Friedemann Kleint2014-05-262-15/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-38890 Change-Id: I9a729430fcd30b782c100bb76d5e287a3b4c1238 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| | * Mark tst_qfiledialog2 as insignificant due to failing testsTony Sarajärvi2014-05-231-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-39183 Change-Id: I6663d0e4c49e904ffe5d5fdc990073abd4188d9d Reviewed-by: Simo Fält <simo.falt@digia.com>
| | * Stabilize and speed up tst_QGraphicsItem::cursor().Friedemann Kleint2014-05-221-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | Use QTRY_COMPARE instead of hard-coded timeouts, ensure window is shown. Change-Id: I4f23144ee14150c4fba9c6fbd8c4ee2da472cc75 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | Fix key navigation through cells with spans in QTableView.Mitch Curtis2014-06-061-4/+159
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When navigating with the directional keys or tab/backtab, there are certain situations where the cell that is edited is incorrect. For example, consider the table below. '^' represents the starting cell and the direction of navigation. 'c' represents the index that is arrived at as the currentIndex prior to this patch as reported by view.selectionModel()->currentIndex(). 'x' is the cell that should be edited: +---+---+---+---+ | | | e | | +---+---+---+---+ | | x | | +---+ +---+ | | c | | +---+---+---+---+ | | | ^ | | +---+---+---+---+ Before this patch, the cell that will actually be edited is c, rather than x, so after editing the cell and pressing enter, the previous contents of the cell will still be shown. With this patch, currentIndex() will be changed after every call to cursorMove(). Navigation into and out of cells is not affected because the visualCursor member in the QTableViewPrivate tracks the keyboard navigation entry point. If after the up navigation into the span, the user presses up, the cell entered is 'e', not the cell above 'x'. Task-number: QTBUG-29239 [ChangeLog][QtWidgets][QTableView][QTableWidget] currentIndex() now reflects the top left cell when in a span. Change-Id: I3dc3db46ebba340102860fc4ad98fcaf91484983 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-224-1/+131
|\| | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| * Fix broken QPlainTextDocumentLayout after removing charsAxel Rasmussen2014-05-211-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where, if characters were removed from several blocks in a single edit, the document layout would end up being corrupted since the document layout manager wouldn't re-layout the proper number of text blocks. Task-number: QTBUG-30051 Change-Id: Idf3a6f567120e6a5dbebf1f65f685d374219328a Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Cocoa: Do not process ampersands in menus twice.Christoph Schleifenbaum2014-05-213-1/+86
| | | | | | | | | | | | | | | | | | | | When syncing between QAction and native NSMenuItems, the ampersands (mnemonics) were removed twice. This lead to double ampersands being removed instead of replace with single ones. Task-number: QTBUG-37933 Change-Id: If1d9cd247b467472647b22b38460b44b03f13d82 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | qpa: Rename qwidgetwindow_qpa_p.h to qwidgetwindow_p.hTor Arne Vestbø2014-05-201-2/+1
| | | | | | | | | | Change-Id: I24835b86194653e89c0bacefd22ddbff06b6e97b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-131-20/+16
|\| | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85
| * tst_QWidget::windowMoveResize(): Fix QEXPECT_FAIL / QTRY_COMPARE .Friedemann Kleint2014-05-091-20/+16
| | | | | | | | | | | | | | | | | | QEXPECT_FAIL followed by QTRY_COMPARE considerably slows down tests due to the check timing out. Task-number: QTBUG-38890 Change-Id: I7f90f2627fc6ce149d159a6d13355ca1a8181d54 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-134-43/+181
|\| | | | | | | | | | | | | Manually changed enum to LibGL in src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
| * Fix tst_QStyleSheetStyle::toolTip().Friedemann Kleint2014-05-081-1/+17
| | | | | | | | | | | | | | | | | | Use the correct palette and enforce Fusion style to prevent the Vista style from clobbering the tooltip palette in polish(). Task-number: QTBUG-38183 Change-Id: Id19d548f818d801c4914a343e08207195c343888 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * Revive tst_qstylesheetstyle on Desktop platforms.Friedemann Kleint2014-05-082-32/+91
| | | | | | | | | | | | Task-number: QTBUG-21468 Change-Id: I37f741d9709b17ad31b01078e10538f0f6bff01a Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Fix visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-061-1/+28
| | | | | | | | | | | | | | | | | | Determine the visual index by looking up the column of the QModelIndex in the logicalIndices array instead of looping. Task-number: QTBUG-37813 Change-Id: I5c3c73c67537877b03cdc2c36a52041d99f7f49d Reviewed-by: David Faure <david.faure@kdab.com>
| * QFileDialog: Return empty QUrl from the static get..FileUrl() functions.Friedemann Kleint2014-05-061-0/+45
| | | | | | | | | | | | Task-number: QTBUG-38672 Change-Id: Idf554cd93d1a79db7c82f3165bd128fb31ead3e5 Reviewed-by: David Faure <david.faure@kdab.com>
| * Revert "Ignore tst_QStyleSheetStyle::hoverColors() failures on Mac OS X"Liang Qi2014-05-061-9/+0
| | | | | | | | | | | | | | | | | | | | | | This test doesn't fail on Mac any more. This reverts commit 36493a7a41b7ce38af429a943a73d791100c6c13. Task-number: QTBUG-23685 Change-Id: Ib7c56494b07de9839b3287758fe228f799bc343c Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-0614-70/+145
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
| * QNX: Fix QLineEdit autotestFabian Bumberger2014-05-021-2/+2
| | | | | | | | | | | | Change-Id: I84c386a146dd484db844fa93165b28e19e4cefd7 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
| * Ignore the fullscreen state of a QMdiSubWindowFabian Bumberger2014-05-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | On some platforms all windows are by default forced into fullscreen mode when show() is executed. In QMdiSubWindow we cannot handle the fullscreen state and should ignore it. Otherwise the window will be forced in "normal" state and ignore any previously executed geometry changes. Change-Id: I09ce6507a1eac6a0adb3405ca3f423642d30f801 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-011-1/+1
| |\ | | | | | | | | | | | | | | | This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
| | * Rename new QOpenGLContext APIsLaszlo Agocs2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isES() becomes isOpenGLES(). The library type enums are changed DesktopGL -> LibGL and GLES2 -> LibGLES. This removes the now unnecessary version number, the confusing "desktop" term and provides better readability. The old function/values are kept until the related qtdeclarative changes are integrated. Task-number: QTBUG-38564 Change-Id: Ibb0a1209985f1ce4bb9451f9b7b093c2b68a6505 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Stabilize tst_QAbstractItemView::task250754_fontChange().Friedemann Kleint2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Increase window size when verifying that the scrollbar disappears when using a small font on Windows 8.1 Change-Id: I7d4520bc5882d8ccd59db3f5bff7e9d6d68a4827 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * | Observe case insensitive file systems in QFileDialog::selectFile().Friedemann Kleint2014-04-291-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stripping the root path from a file name that cannot be found in the model, use case sensitive comparison depending on file system. Task-number: QTBUG-38162 Change-Id: I28e28973fca2da35a5768fdd00cc258b9669a15a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Fix crash when accessing QFileDialog::selectedFiles() before widgets exist.Friedemann Kleint2014-04-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Discovered while investigating: Task-number: QTBUG-38414 Change-Id: I764195254ba4b54c86079c6e8ef750d6249960d9 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Jani Heikkinen2014-04-252-4/+8
| |\ \ | | | | | | | | | | | | refs/staging/stable
| | * | Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-232-4/+8
| | |\| | | | | | | | | | | | | Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567
| | | * Restore Qt 4 behavior in default double click handlerLaszlo Agocs2014-04-172-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert 3bb902495291c50a2f06e8e03a62a647db3e5cd4. That fix was an attempt to handle the issue that has been fixed in 5.3 by 9063edef796ad10eb9ac2229627f36d60168f0e2 and should have been reverted when the new approach, that restores Qt 4 behavior for widgets, was introduced. Task-number: QTBUG-38242 Task-number: QTBUG-36423 Change-Id: I8f8a82da22605fac90543492e9b2cd2b568544e7 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | | Stabilize tst_qfilesystemmodel::rowsInserted() on Windows.Friedemann Kleint2014-04-251-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce QTRY_COMPARE to let the sorting finish instead of a hard-coded time-out. Task-number: QTBUG-29403 Change-Id: I813bf6bcfe7110f49a5b95db589ed8a3f559db89 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Stabilize tst_qfiledialog.Friedemann Kleint2014-04-251-27/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selectFile(): Ensure dialog is destroyed before the temporary file to prevent leak. selectFiles(): Introduce scopes to prevent co-existence of 2 instances of QFileDialog, which causes warnings from file watchers and occasional crashes in accessibility. Discovered while investigating: Task-number: QTBUG-38414 Change-Id: I94d2bb3e05538416286641cb08a88d8b3837a8a6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Fix crash when deleting top level windows embedded into QGraphicsProxyWidget.Friedemann Kleint2014-04-141-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear proxyWidget pointer in slot QGraphicsProxyWidgetPrivate::_q_removeWidgetSlot(). Task-number: QTBUG-29684 Task-number: QTBUG-33213 Change-Id: Ibdbd52aa810ca908e3d98daa00954345e7a93a48 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * | QNX: Fix QDockWidget autotestFabian Bumberger2014-04-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show translates to showFullScreen on some platforms. This patch replaces show with showNormal in the "task248604_infiniteResize" test. On BlackBerry the test is skipped because all top level windows are forced fullscreen by the platform. Change-Id: Ia974c3fcbd0c71c107f4cc3f8405b8ef79ffb5b7 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * | BlackBerry: Fix QDoubleSpinBox autotestsFabian Bumberger2014-04-141-0/+2
| | | | | | | | | | | | | | | Change-Id: I380e983294c4467ad79f0835c05387a0ee155eb5 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * | QNX: Fix QComboBox autotestFabian Bumberger2014-04-141-7/+7
| | | | | | | | | | | | | | | Change-Id: I9fe4da6e02921c0474bf7ef31a2ba14e751584bf Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * | QNX: Fix QMdiArea autotestsFabian Bumberger2014-04-141-3/+6
| | | | | | | | | | | | | | | | | | Change-Id: I1c4b0bbe4984182c217ee97957e2f21f43caf116 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
| * | QNX: Fix QWizard autotestFabian Bumberger2014-04-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In "task177022_setFixedSize" show was replaced with showNormal because on QNX and some other platforms show translates to a showFullScreen. For BlackBerry the test is skipped because the first top level window is always forced into fullscreen mode. Change-Id: I9df37c6bc47b47cbad4a1623b3eafa723abc6714 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * | QNX: Fix QTreeView autotestFabian Bumberger2014-04-141-2/+2
| |/ | | | | | | | | | | | | | | | | The style is dpi dependent. I.e. on high dpi displays the pixel size of sections and rows of a QTreeView will be larger. Change-Id: I7477bfdd641d4db67973cafef5147f026f72c111 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1114-58/+118
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
| * Fix tst_QListWidget::task217070_scrollbarsAdjusted()J-P Nurmi2014-04-091-1/+1
| | | | | | | | | | | | | | | | QMacStyle::styleHint(SH_ScrollBar_Transient) wants either a style object or the widget argument in order to return correct values. Change-Id: I2fdef0820334fa66e076a4734eb2a30c722c841c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * QNX: Fix QCompleter autotestFabian Bumberger2014-04-091-2/+2
| | | | | | | | | | | | | | The tests expect a home folder which usually is not present on QNX Change-Id: I44f548a95f14414c0db6f752fd115696069a7b90 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * QNX: Fix QHeaderView autotestFabian Bumberger2014-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | Some margines and sizeHints are DPI dependent on QNX and BlackBerry. This patch skips two test that expect the section size to be of a certain pixel size. Change-Id: I7869f77fc2b623e091f53e420d1a4fdb3ec30724 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * Stabilize tst_QListWidgetJ-P Nurmi2014-04-091-16/+3
| | | | | | | | | | | | | | | | Replace weird QEventLoop hacks by sending all posted deferred delete events. Change-Id: I6da743f2b3fb6ef5dfc960dd3d752973cd511037 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * QNX: Fix QGraphicsView autotestsBernd Weimer2014-04-081-9/+26
| | | | | | | | | | | | | | | | | | On BlackBerry first window is always shown full screen. However, many tests rely on a specific window size. A dummy full screen window is created so subsequent windows have correct size. Change-Id: Id8bd0212b6eca677953e78505459e3cd69bc6328 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * tst_QTreeView: fix use of uninited variableMarc Mutz2014-04-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | Valgrind complained: ==13941== Conditional jump or move depends on uninitialised value(s) ==13941== at 0x4206FC: tst_QTreeView::styleOptionViewItem()::MyDelegate::paint(QPainter*, QStyleOptionViewItem const&, QModelIndex const&) const (tst_qtreeview.cpp:3062) [...] Change-Id: I76da01c191415ba0a00b4b85312f2fe08e4ee2d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * QTextLayout: Fix visual cursor movement in some casesKonstantin Ritt2014-04-042-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To guarantee proper positioning at the end of the last line in a bidirectional text we have to insert the eol position into the insertion points vector, accordingly to the visual ordering. Detection of the last *logical* item in a *visual* line is unrelaed to the text direction, it is simply `iterator.item == iterator.lastItem`. [ChangeLog][QtGui][QTextLayout] Fixed visual cursor movement in bidirectional text. Task-number: QTBUG-18060 (partially related) Change-Id: I53b6ab889ef580ab0560b620b808b1e09efc0fbd Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Ahmed Saidi <justroftest@gmail.com>
| * BlackBerry: Fix QListView autotestFabian Bumberger2014-04-041-9/+22
| | | | | | | | | | Change-Id: Id4967911d82cff86214665cc9ca3dbbefa69da11 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * Fix QTreeWidget autotestFabian Bumberger2014-04-041-2/+6
| | | | | | | | | | Change-Id: I94b4d9d2f0ef013691faedc4cd12050aa49e98f2 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>