summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/itemviews
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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 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>
* 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>
* 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>
* QNX: Fix QAbstractItemView autotestFabian Bumberger2014-04-041-4/+10
| | | | | | | | | One problem was that tests expect the top-level window to have a certain size, which is not possible on BlackBerry. Another problem was that certain elements have a dpi dependent size which the task250754_fontChange test did not consider. Change-Id: I465ebe234a74d6150cdcbb7fc7e458a62155e0d0 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Item views: respect selection mode when closing an editorJ-P Nurmi2014-04-011-0/+42
| | | | | | Task-number: QTBUG-31411 Change-Id: I1a52eb739e0bc2afa7227f006461916df8ecaf48 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Item views: respect focus policy when closing an editorJ-P Nurmi2014-04-011-0/+54
| | | | | | Task-number: QTBUG-31411 Change-Id: Ib0a72755c35a553653ea014672d59979a550b7ae Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Do not run tst_qcolumnview in parallelFriedemann Kleint2014-03-191-1/+0
| | | | | | | | | Task-number: QTBUG-36395 Change-Id: Id1f5cfeca3f18d6d7d1f2354211e15d349dd7b8f Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix tst_QColumnView::scrollTo()J-P Nurmi2014-03-191-0/+3
| | | | | | | | | | The test relies on active focus, so activate the test window in the beginning of the test to avoid undesired focus widget changes by QApplication::setActiveWindow() during the test. Task-number: QTBUG-36395 Change-Id: I6febec7d552224b1754aaf57520ed6d435d29563 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not run tst_qabstractitemview in parallelFrederik Gladhorn2014-03-191-1/+0
| | | | | | | | | | This test waits for window activation and gets disturbed by mouse movements. The test duration is not long enough to justify the flakyness (around 10 seconds on my laptop). Change-Id: I985044f954c09442220db3ca318045c04ef6bb77 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Merge remote-tracking branch 'origin/dev' into stableOswald Buddenhagen2014-02-1912-141/+127
|\ | | | | | | Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-072-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
| * | tst_qcolumnview: Set layout direction on widgets instead of application.Friedemann Kleint2014-01-281-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | Most of the test is executed in RTL mode since it is never restored. Task-number: QTBUG-36395 Change-Id: I110966085a5a265f093fc4479eebc1f1bf0614c1 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Use a fake directory model instead of QDirModel in item view tests.Friedemann Kleint2014-01-274-82/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests then have a predictable, stable environment and do not depend on file system operations. Task-number: QTBUG-23697 Change-Id: Ibbd356f8bd7419ec4a3a88d2c0b5cd0830049790 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | expand tabs and related whitespace fixes in *.{cpp,h,qdoc}Oswald Buddenhagen2014-01-134-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | the diff -w for this commit is empty. Started-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-162-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qplatformtheme.h tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5
| * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-263-46/+140
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
| * | | | Compare QIcon QVariants by their cache keyAlbert Astals Cid2013-10-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it so that two QVariants created from the same QIcon (or from QIcons that were assigned one from eachother) compare to true. Unfortunately creating two QIcons with the same path and comparing them still gives false as they have different cacheKeys Change-Id: Iafe2bc4082a830f9c6469f083c26a7abbe4b35c5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | | WinRT: Fix various test compilationsAndrew Knight2013-10-024-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove irrelevant test subdirs via .pro files - Follow WinCE codepaths where applicable - Replace unsupported Win32 APIs with WinRT equivalents This does not aim to fix any failures in the tests themselves; it only makes them compile. Change-Id: Ia82bc0cc402891f8f6238d4c261ee9152b51be80 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | | Remove qSort usages from widgets testsSergio Ahumada2014-02-181-2/+4
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: Ica7639d16f52b4ffcd2c00cc806fed1378a7948b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | Stabilize tst_QAbstractItemView::task200665_itemEntered()Gabriel de Dietrich2014-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that sometimes QCursor::setPos() will not get the opportunity to run the event loop before scrolling the list view unless we do it explicitly. Task-number: QTBUG-35060 Change-Id: Ic635bd8d1a4e3dbcadf9605e88197df6a0f69fc7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | Revert "QAIV - Fix scollbars with ScrollPerPixel to scroll 1 pixel."Thorbjørn Martsum2014-01-141-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c. The patch needs to be modified a bit. Many users considers not having the old feature as a big regression. The feature needs to be improved with a variable that is only set when the user uses setSingleStep. Task-number: QTBUG-33906 Change-Id: I35e5d3e9d3d7a3ebd01807b03a0e7a424185d483 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Stabilize tst_qabstractitemviewMarc Mutz2013-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix FAIL! : tst_QAbstractItemView::task200665_itemEntered() Compared values are not the same Actual (spy.count()): 0 Expected (1) : 1 Loc: [tst_qabstractitemview.cpp(1292)] which might have been introduced by removing the absolute qWait(200) in favor of qWaitForWindowExposed() in afe8e368, so trying to compensate with a QTRY_COMPARE. Change-Id: Id437acd810b54e005daaf66ffffd4dd586075ab6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-051-2/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
| * | Stabilize tst_QColumnView::dynamicModelChanges().Friedemann Kleint2013-12-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use QTest::qWaitForWindowExposed() and QTRY_COMPARE() instead of hardcoded timeout. Task-number: QTBUG-35308 Change-Id: I27eee9932dd3b6087db4ad13b1a4fb184a487f57 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-181-0/+30
|\| | | | | | | | | | | Change-Id: Ie6d44caf1d630cb029178a1af40c637f24a25ee7
| * | Crash fix in QTreeView::sizeHintForColumn().Martin Pley2013-11-161-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vertical scrollbar may get out of sync. When this happens, the calculation of firstVisibleItem will retrun "-1". This must be handled in ::sizeHintForColumn(). Added an auto-test for the crashes. Task-number: QTBUG-34717 Change-Id: I867fd144ef3ce45e382337c5eafe345f573cd944 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* | | QHeaderView - do not ignore -1 as minimum section sizeThorbjørn Martsum2013-11-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We claim that -1 is a special automatic value, but calling setMinimumSectionSize with -1 is unfortunately ignored due a regression in 524c3e05e811d81fbcd71eedb377b7eaa0a21ef3 Change-Id: I7d7e5dbbf78e561849d2f2352c9edb2df36aa181 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | | Stabilize tst_qabstractitemview.Friedemann Kleint2013-11-161-33/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Center windows on screen to avoid conflicts with Unity taskbars, observe minimum geometry for Windows, move cursor out of the way for Mac. Introduce QScopedPointer to ensure cleanup in case of failures. Change-Id: Ic169e015e795597457b8e85a28ff7fcb7b9b9430 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | Remove QTRY_ macro from tst_qabstractitemview.Friedemann Kleint2013-11-151-13/+2
|/ / | | | | | | | | Change-Id: Ic8b8e5c242b640581aa735a3716666d4e7ff44eb Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Revert "Fix setVisible() of QWidget has no effect in QTreeWidgetItem"Friedemann Kleint2013-11-081-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | It introduces QTBUG-34653 (Qt Designer widget box no longer repainted after collapsing items or using the filter). This reverts commit 04de24c6449422d29a0d4760375aa94f59222fa3. Task-number: QTBUG-13522 Task-number: QTBUG-34653 Change-Id: Ieb9766e7f15acea901fce4ad7142aa72557b9957 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Fix setVisible() of QWidget has no effect in QTreeWidgetItemChengyong Xie2013-10-311-0/+34
|/ | | | | | | | | | Check if the item is hidden before show the item(QWidget) Task-number: QTBUG-13522 Change-Id: I1c605d5cb8a80f340e9b7601612d3760f51cb4a7 Reviewed-by: Liang Qi <liang.qi@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 devSergio Ahumada2013-09-071-0/+8
|\ | | | | | | Change-Id: I9ee4176f0a0078908d49896508826154c9f71530
| * Center the QColumnView on-screen, in case that helps avoid the test failure.Stephen Kelly2013-09-051-0/+8
| | | | | | | | | | | | Task-number: QTBUG-32927 Change-Id: Icf0301d583b2ca6e2e099a19eb1f91feac1fb975 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | QHeaderView - add maximum section sizeThorbjørn Martsum2013-09-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we auto resize it is handy to be able to limit the maximum size (just like the minimum size). [ChangeLog][QtWidgets][QHeaderView]A maximumSize for sections has been introduced. The maximum section size is by default the largest possible section size which in Qt 5.2 has been limited to 1048575 pixels. Task-number: QTBUG-4346 Change-Id: Ida9cbcc11bd5c4498e319df2e6379c69a7033c04 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | item delegates: fix clicking on tristate checkboxes.David Faure2013-09-021-0/+51
| | | | | | | | | | | | | | | | | | QCheckBox cycles through the 3 states, but item delegates didn't do that. Change-Id: Iad1e464341033ca357925fe8064f53bb584459f4 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-09-021-3/+4
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-271-3/+4
| |\| | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
| | * Add more comparisons to narrow down error case.Stephen Kelly2013-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32927 Change-Id: I83d6def83c37febd8cd83676bff9d74f364ecfad Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
| | * Add debugging output to randomly failing test.Stephen Kelly2013-08-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result at http://thread.gmane.org/gmane.comp.lib.qt.ci-reports/12118 shows an unusual value. The expected output is QDEBUG : tst_QColumnView::scrollTo() last= 0 ; HorizontalOffset= -256 QDEBUG : tst_QColumnView::scrollTo() last= -256 ; HorizontalOffset= -512 QDEBUG : tst_QColumnView::scrollTo() last= -512 ; HorizontalOffset= -768 QDEBUG : tst_QColumnView::scrollTo() last= -768 ; HorizontalOffset= -1024 Change-Id: I8db091f4390cb1a41547d44ca966d172ac278e1a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | QTreeView - fix next focus when there is no current indexThorbjørn Martsum2013-08-301-0/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we went through non hidden indexes, but we never considered the visual order. This patch fixes that issue. Though it was wrong before, it probably never was a big problem since it was unlikely that the tree (on logical index 0) was swapped or hidden, but 658e42e77a00596b63823482c9b77644556b647c makes it more likely that problems with wrong focus could occur. Change-Id: Ic7b6cd2df1f8638be1a7c9e6df27f428685869fc Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | QAIV - Fix scollbars with ScrollPerPixel to scroll 1 pixel.Thorbjørn Lund Martsum2013-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation says that we scroll one pixel Quote: "QAbstractItemView::ScrollPerPixel (value 1)" "The view will scroll the contents one pixel at a time." However until now Qt has tried to be smarter than the documentation, but is actually getting in the way of the user, where a manual set value to setSingleStep will continuingly be overwritten (on e.g resize). This patch ensures the behavior described in the documentation for the vertical headers - and leaves the control to the user. [ChangeLog][QtWidgets][QAbstractItemView] QTBUG-7232 - In ItemViews scrollbars will now by default only scroll 1 pixel when scrollMode is set to scrollPerPixel. That is it will (when scrollMode is scrollPerPixel) do what is stated in the documentation, and no longer automatically adjust the scrollbars singleStep. The user can now control that value. Task-number: QTBUG-7232 Change-Id: I8a61d3100be65d0c4ee32aad58caed019aa2669c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-211-0/+65
|\| | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| * QHeaderView::paintSection(): fix visible index handlingJ-P Nurmi2013-08-151-0/+65
| | | | | | | | | | | | | | | | | | | | | | Sections may be hidden => QStyleOptionHeader::position must reflect the state seen on the screen. Otherwise styles will give wrong visual results. Task-number: QTBUG-32203 Change-Id: I7ef86496be092bf6f52ec45f757b501f38c3a431 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-161-2/+11
|\ \ | | | | | | | | | refs/staging/dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 02:47:31 +0000