summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/itemviews
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-161-2/+11
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-141-2/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| | * Add some debugging information to diagnose bug.Stephen Kelly2013-08-121-2/+11
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32927 Change-Id: I7d0a1ad9eeb63ac0ec28483106f42109ed1a834c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | QHeaderView - reduce memory usageThorbjørn Martsum2013-08-161-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Though the worst case memory usage was improved in b800d8b94a7861ecf8853621f6556fca186fb5b7 the best case usage changed. Since best case is the same as worst case in Qt5, we should use as little as possible, which this patch ensures. We reduce the memory usage from 3 to 2 ints per section - which is half of worst case in Qt4. There seems to be no bigger cost in performance doing that. The recalcSectionStartPos is still very fast. This patch limits the maximum section size to (2^20) ~ 1.000.000 pixels. This alleviates Task-number: QTBUG-32325 Change-Id: I9b7530030a31b4e35cf1ca9e32c6b936f5ea9790 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-201-3/+11
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| * BlackBerry: fix tst_qlistviewRafael Roquetto2013-06-181-0/+8
| | | | | | | | | | | | | | | | Because fonts are bigger on BlackBerry than those assumed when the test was written, explicitly adjust the font size on this platform. Change-Id: I6a23c28c2d32edf744dd5de09ea0a97fd5f9b6d6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Fix tst_qlistview for full screen platformsRafael Roquetto2013-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | Some test cases rely on the fact that show() is not fullscreen, which may not be true for some platforms. Explicitly make use of showNormal() to avoid full-screen show on these platforms. Change-Id: Ie62fe21bf0f466c561a27cffda99d0201b4a45af Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-232-1/+131
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
| * Disabling some concurrency in widget testsSimo Fält2013-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | There has been frequent failures with CI, especially with OSX 10.7. These seems to work ok in CI node when ran alone but CI is running those in parallel with some other tests, and this is causing errors, most likely due to lost focus. Change-Id: Ic4151099c27a4b5d91778c9b13e88d2d661e8a0d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Fixed applying invalid data from QLineEdit to modelIvan Komissarov2013-05-071-0/+131
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-2216 Change-Id: I5d1c18aadb380667dedc2bb9f9b7e3dd8178a24c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: David Faure <david.faure@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-291-0/+34
|\| | | | | | | Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c
| * Fix QTableView::doItemsLayout()J-P Nurmi2013-04-221-0/+34
| | | | | | | | | | | | | | | | | | | | | | Keep the content aligned to the bottom when the view has been scrolled to the bottom and the content is relayouted (for example due to sorting). Task-number: QTBUG-30653 Change-Id: I9513e295e276d25ff2068036cd80dbf91314fe84 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | When doing a PageDown or PageUp it should show the next set of cellsAndy Shaw2013-04-091-2/+30
| | | | | | | | | | | | | | | | | | Before it would skip out a row depending on the size of the tableview. Now it will show the next set of cells for the direction it is going in. Change-Id: I02926d0b2187ffafffb63f7fff43c233b4d7d6af Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Add missing wait for window shown.Stephen Kelly2013-04-091-0/+2
|/ | | | | | Change-Id: I746a12dfa1b87a0d1393341ca3d641f73bcaee0a Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0Debao Zhang2013-03-2814-14/+0
| | | | | Change-Id: I1264784d6984edc70bf07e58ed763e1d1b001d7d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtWidgets tests: Replace qFindChild{ren} with QObject::findChild{ren}Debao Zhang2013-03-275-20/+20
| | | | | Change-Id: I79a26387bcce0d7f79f4f9f70293e97dae52f949 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtWidgets tests: Don't use the deprecated QTest::qWaitForWindowShown()Debao Zhang2013-03-272-3/+3
| | | | | Change-Id: I2dd5a54f9485591ca2dab65f7a352ef453c185e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtWidgets tests: Don't call the empty function QApplication::syncX()Debao Zhang2013-03-271-1/+0
| | | | | Change-Id: I2c732afd43586209cf5a2b72caac53e34abb9090 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* tst_qtreeview: Use QRect::intersected instead of QRect::intersectDebao Zhang2013-03-261-1/+1
| | | | | Change-Id: I4579929473a408b73f3ad9014ea30ce5a602259c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix warnings about overloaded virtuals in tests (CLANG).Friedemann Kleint2013-03-126-21/+25
| | | | | | Change-Id: I2f96073c4aaf4b11221b98cc6c7031b253a3b45c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fixed QTreeWidgetIterator to work with sorted QTreeWidgetJan Arve Saether2013-03-061-0/+27
| | | | | | | | | | | We cannot access children directly, since that won't ensure that the pending sort is executed. However, the functions we need are there already and actually makes the code nicer. Task-number: QTBUG-29903 Change-Id: I6899284275dd79b991896a5f08486b58d95f819d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QTreeView::expandToDepth - add missing emit of expanded and collapsedThorbjørn Lund Martsum2013-02-021-0/+9
| | | | | | | | | | | Just like other functions this function should emit expanded and collapsed. A part of fixing Task-number: QTBUG-8176 Change-Id: I6d801f61e6f0cb8836634cc52f0be2b610f6c728 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QTreeView - emit collapsed in collapseAll()Thorbjørn Lund Martsum2013-01-311-2/+12
| | | | | | | | | | | When we call call collapase we emit collapsed. Therefore it should also be emitted on collapseAll() This partly solves: Task-number: QTBUG-8176 Change-Id: I20c1388fcbbb60d12debb4a0b3b0d9fed41e2563 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QTreeView - emit expanded on expandAllThorbjørn Lund Martsum2013-01-311-4/+23
| | | | | | | | | | | | When we call QTreeView::expand expanded is emitted. For the same reason we should emit expanded on expandAll() This partly solves: Task-number: QTBUG-8176 Change-Id: Ie85e724eec50980c68f626ec47dec5c1e08cc085 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add the Qt::ItemNeverHasChildren flag and use it in QTreeView.Stephen Kelly2013-01-291-0/+40
| | | | | | | | | It can be used to determine whether expand() should really expand. Change-Id: If79d8c295a4ca1356e60051682b227524a065126 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Don't emit activated on clicking disabled itemview item.Mitch Curtis2013-01-261-0/+24
| | | | | | | | | | | A itemview item with its flags set to Qt::NoItemFlags is considered disabled, and therefore should not cause the activated signal to be emitted. Task-number: QTBUG-20490 Change-Id: If824505c46f4fcadb9265ad6d1e9337f0cee32cf Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-2217-17/+17
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1817-17/+17
| | | | | | | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-01-094-0/+48
|\| | | | | | | Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
| * Fix warnings about not being able to set Window geometry on Windows.Friedemann Kleint2013-01-084-0/+48
| | | | | | | | | | | | | | | | | | | | Fully decorated windows cannot be smaller than 160x30 (Large fonts). Enlarge Windows or remove Window frame to get rid of decorations. Task-number: QTBUG-28611 Change-Id: Idb6ee94fb8d0760d5f97042b3084557f11e9fdf9 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-0710-30/+0
|\| | | | | | | | | | | | | Conflicts: tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
| * Widgets: Remove declaration of built-in and automatic metatypes.Stephen Kelly2013-01-049-23/+0
| | | | | | | | | | | | | | | | These types are either built-in or 'automatically declared' and so don't need to be explicitly declared as metatypes. Change-Id: Ibe8e2ec867afb4051a3c7eef806d9cd86945928b Reviewed-by: David Faure <david.faure@kdab.com>
| * Remove metatype registration of built-in types.Stephen Kelly2013-01-036-7/+0
| | | | | | | | | | | | | | | | As they are built-in, they are effectively registered at compile-time already. Change-Id: I7ae6ba16088eab5d19213fa7b07c2a7760988a86 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | QAbstractItemView - allow deselect in single selection mode.Thorbjørn Lund Martsum2013-01-021-0/+43
|/ | | | | | | | | This patch allows single selection to be cleared with the normal control modifier. This affects e.g QTreeView and QListView. Task-number: QTBUG-8836 Change-Id: I7fd50b987acc3552b36657409568192763257536 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* tst_qlistview: remove redundant includeJ-P Nurmi2012-11-231-4/+0
| | | | | Change-Id: If33518159feb202fa041ac2809817dff5616249f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Account for the item spacing when using QListView::scrollTo()Pierre Rossi2012-11-231-5/+0
| | | | | | | | | Somehow this bug managed to stay hidden until the introduction of QFusionStyle. Task-number: QTBUG-27675 Change-Id: I86b049b869e9f2951426dc67a485ad7c60ef1403 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Remove warnings from qtbase.Mitch Curtis2012-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geometryengine.cpp: In member function 'void GeometryEngine::drawCubeGeometry(QGLShaderProgram*)': geometryengine.cpp:159:93: warning: cast to pointer from integer of different sie [-Wint-to-pointer-cast] geometryengine.cpp:167:95: warning: cast to pointer f rom integer ofdifferent size [-Wint-to-pointer-cast] benchmarking.cpp: In member function 'void TestBenchmark::multiple()': benchmarking.cpp:85:9: warning: variable 'result' set but not used [-Wunused-but-set-variable] benchmarking.cpp: In member function 'void TestBenchmark::series()': benchmarking.cpp:120:9: warning: variable 'result' set but not used [-Wunused-but-set-variable] qstandarditemmodel.cpp:2717:45: warning: unused variable 'd' [-Wunused-variable] qxcbconnection.cpp: In member function 'xcb_timestamp_t QXcbConnection::getTimestamp()': qxcbconnection.cpp:930:40: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qguiapplication.cpp: In constructor 'BlockableWindow::BlockableWindow()': tst_qguiapplication.cpp:340:9: warning:'BlockableWindow::enters' will be initialized after [-Wreorder] tst_qguia pplication.cpp:339:9: warning 'int BlockableWindow::leaves' [-Wreorder] tst_qguiapplication.cpp:342:12: waring: when initialized here [-Wreorder] tst_qsqltablemodel.cpp:570:10: warning: unused parameter 'value' [-Wunused-parameter] tst_qabstractitemview.cpp:1546:8: warning: unused parameter 'index' [-Wunused-parameter] Change-Id: I49c88547182e4669cfde2c2536403fc5573ca2da Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Regression fix to QHeaderView::setDefaultSectionSizeThorbjørn Lund Martsum2012-11-151-1/+7
| | | | | | | | | | | | When the sections has been resized we need to calculate new values for the section start-positions. Otherwise we break visualIndexAt and sectionPosition. This fixes a regression introduced in b800d8b94a7861ecf8853621f6556fca186fb5b7 Change-Id: I148dbf44f742208787ed59b70d82b8048d721e90 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Mac: refactor scrollbar animationsJ-P Nurmi2012-11-022-6/+9
| | | | | | | | | Get rid of QWidget-centric QMacStyle::eventFilter() and implement the fade out animations for scrollbars using QNumberStyleAnimation-based QFadeOutAnimation. Change-Id: I2000fa50d46b153e981ceafc12a53932a196382e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Strip trailing whitespace in itemviews.Stephen Kelly2012-11-013-11/+11
| | | | | | | | | | | Using git ls-files -z | xargs -0 sed -i 's/ \+$//' in the relevant directories. Change-Id: I861ef9952fb32ed2db9ec8b67864ec7d0d61f0f2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Remove QSKIP from tst_QListView::setCurrentIndexAfterAppendRowCrashSergio Ahumada2012-10-301-4/+5
| | | | | Change-Id: I8d48722b412895e43aa8a522354c5d67d83c19dd Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* QComboBox: fix use in QDataWidgetMapper/QItemDelegateMark Brand2012-10-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | QItemDelegate and QDataWidgetMapper use the WRITE method on the USER property to set a value in a widget. This did not work for QComboBox whose USER property currentText lacked a WRITE method. This change adds the missing setter and flags it as the WRITE method. The setter setCurrentText() simply calls setEditText() if the combo box is editable. Otherwise, if there is a matching text in the list, currentIndex is set to the corresponding index. Test included. Follow-up to 816c5540179362500dfc175b77f05abf3ef25233 which restored currentText as the USER property. Task-number: QTBUG-26501 Change-Id: I5f2f999e60b09728ca03ead4e28fe36d1f3ee189 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* correct spelling in commentMark Brand2012-10-251-1/+1
| | | | | Change-Id: I6ffa96ac9cda0701c99f839804f400a167fcf9a7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Implement viewOptions logic in QTableViewPrivate.Stephen Kelly2012-10-251-0/+12
| | | | | | | | | | | This is similar to the patch 05aa8c6c12509cce87d1a3811c5ea1dd83fa0898 which was applied to QListView. Task-number: QTBUG-26548 Change-Id: I38ff07230673a93a32b01a7f1951d0378d94185b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove Cleanlooks and PlastiqueJens Bache-Wiig2012-10-221-0/+10
| | | | | | | | | We have a new style Fusion that will replace these styles. They will be moved to a separate module rather than included in platforms that do not need them. Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Make sure uints remain uints when editing in itemviews.Stephen Kelly2012-10-192-0/+80
| | | | | | Task-number: QTBUG-22974 Change-Id: I07428862c4dffc629f868f3010f663eb655922d0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* normalise signal/slot signatures [QtWidgets tests]Marc Mutz2012-10-199-53/+53
| | | | | Change-Id: Iffab60f0911a55e4be09faeb29df0bae1ea2eb19 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Exclude a QCOMPARE in tst_QListWidget instead of excluding the whole class.Stephen Kelly2012-10-162-2/+5
| | | | | | | | | | | | | | | | The original bug was reported as a different test failing. Looking through the CI logs, that test now always passes, but fastScroll fails unstably. The fastScroll test is already excluded on Mac, but the patch and reason for that predates the public git history. This is a regression since marking the entire test as insignificant, and shows why insignification of tests should be as narrow as possible. Narrow this one now. Task-number: QTBUG-21098 Change-Id: I0d6c22e422af190c9e6331e123db38022af28e4b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Mark QTreeView test as significant.Stephen Kelly2012-10-121-1/+0
| | | | | | | | | | | | I can't find any failures in the CI logs, as reported by the bug. Even if there is still an unstable test here, it is not appropriate to mark the entire test as insignificant, as that hides regressions in the entire class. Task-number: QTBUG-23638 Change-Id: I1aeaf6e725bf28e9ac03c9330a67e51241b9272b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>