summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
Commit message (Collapse)AuthorAgeFilesLines
* Add IAccessible2 table2 implementation.Frederik Gladhorn2011-07-139-18/+174
| | | | | | | | Implement the IAccessible table2 interface for itemviews. This is simpler than what we have in complexwidgets. For now it is only used on Linux. Reviewed-by: Gabi
* Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+9
|
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2468-1210/+1156
|\ | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-183-54/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-163-54/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1368-1156/+1156
| |/ | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Doc: Fixed qdoc warnings.David Boddie2011-05-111-1/+1
|/
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-031-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits) Fixing potential js hole in the js function for the feedback channel. Fix tst_Q3ProgressBar::setProgress, again Disable tst_Q3ComboBox::task231724_clear on Mac Fix tst_Q3ProgressBar::setProgress() Revert "Fix double painting when adding an item into a linear layout" Add missing license headers Revert "Fixed a crash in QListView" qdoc: Completed task QTBUG-18790 qdoc: Completed task QTBUG-18733 Benchmark for layout hierarchies Manual test for layout flickering Improve invalidate() testcase. Avoid flicker when invalidate is propagated in a widget/layout hierarchy Do not call setSizePolicy from ctor, it might call a virtual function qdoc: Last commit before merge into master. Fixed a crash in QListView Doc: Fixed reference to a name in a table. qdoc: Fixed license comment. Ensured that incomplete downloads are removed. qdoc: Added missing copyright notice ...
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-031-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicslayout.cpp src/gui/graphicsview/qgraphicslayout_p.cpp
| | * Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-18679
* | | Merge earth-team into origin/4.8Olivier Goffart2011-05-039-33/+734
|\ \ \ | |/ / | | | | | | | | | Conflicts: configure
| * | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-262-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier
| * | Merge branch 'master-upstream'Thierry Bastian2011-04-194-5/+21
| |\ \
| * | | Fix licence headers again for MR 900Sergio Ahumada2011-04-142-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Gabriel de Dietrich
| * | | Fix licence headers again for MR 900Gabriel de Dietrich2011-04-142-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Trust me
| * | | Add the QIdentityProxyModel.Stephen Kelly2011-04-124-1/+700
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| * | | QTableView: prevent QTableView from hanging when removing rows.Pierre Rossi2011-04-042-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was introduced in cd2afafb where we removed some code that was meant to adjust the header's offset upon row removal. The problem with this is that visualIndexAt() is likely to return -1 in QHeaderView::paintEvent, which in turn will lead to calling paintSection for each and every section. Task-number: QTBUG-18551 Reviewed-by: Thierry
| * | | Merge branch 'master-upstream'Thierry Bastian2011-03-242-0/+7
| |\ \ \
| * | | | Use the virtual API to clear a selection.Stephen Kelly2011-03-151-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Merge-request: 980
* | | | | Fixes warnings about unused variablesOlivier Goffart2011-04-281-1/+0
| |_|/ / |/| | | | | | | | | | | Reviewed-by: Samuel
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-0/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * | | Doc: Update to QStyledItemDelegate::displayText()Geir Vattekar2011-03-251-0/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-7567
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-313-5/+16
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-282-7/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| * \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-5/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * | | | Doc: itemAt for QTreeWidget/QListWidget are relative to the viewportGeir Vattekar2011-02-172-3/+10
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17516
| * | | | Doc: Work on QHeaderView::sectionPosition()Geir Vattekar2011-02-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17119 Reviewed-by: David Boddie
* | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+7
| |_|_|/ |/| | | | | | | | | | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Merge branch 'master-upstream'Thierry Bastian2011-03-103-12/+15
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-012-7/+9
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/opengl/qpixmapdata_gl.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/qtextlayout/tst_qtextlayout.cpp
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-252-7/+9
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSortFilterProxyModel::reset() should invalidate.
| | | * | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-252-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by: d149a3faca9b97ce806249bc7ef73fe2f59589d5 The connection was removed in that commit because we did not want the layoutChanged signal to be emitted. So instead of calling invalidate(), we call clearMapping() directly. In order to do that, clear_mapping has been turned into a private slot Task-number: QTBUG-17812 Reviewed-by: Gabriel
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-5/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| | * | | Fix crash in KPackageKitGabriel de Dietrich2011-02-151-5/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex after calling QTreeView::indexRowSizeHint(). Same thing inside QTreeView::indexRowSizeHint(), since QHeaderView::count() will call QAbstractItemViewPrivate::executePostedLayout() which may invalidate all the QModelIndex. Reviewed-by: Olivier Task-number: QTBUG-16292
* | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-151-2/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * | Doc: Fixed confusing wording of a sentence.David Boddie2011-01-271-2/+2
| | |/ | | | | | | | | | | | | Task-number: QTBUG-16875 Reviewed-by: Takumi ASAKI
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-2066-68/+75
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1766-68/+75
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| | * Update copyright year to 2011.Jason McDonald2011-01-1066-66/+66
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
| | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-16175
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-221-0/+2
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| | * Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The timer was active, but it got killed by ~QObject. The QObject d-pointer is deleted after the timers (as is expected), which means that the QBasicTimer destructors in QAbstractItemViewPrivate are run after the timers are already gone. Reviewed-by: Trust Me
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-151-2/+2
|\ \ \ | |/ /
| * | Merge branch 'qt-master-from-4.7' of ↵Olivier Goffart2010-12-131-1/+1
| |\ \ | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into qt-master-from-4.7
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-272-3/+3
| | |\ \
| | * | | Fix filtering of columns in QSFPM.Stephen Kelly2010-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a crash introduced in 315c09c3873f7c5d8b785443372bf975bae47ee7 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Reviewed-by: Olivier
* | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-141-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
generated by cgit v0.12 at 2025-01-16 18:57:00 (GMT)