summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3169-895/+895
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* QIdentityProxyModel: remove slow bounds-checking, for more performanceDavid Faure2014-12-241-3/+0
| | | | | | | | | | | | | If we're called out of bounds, sourceModel()->index() will take care of returning an invalid model index anyway. So calling rowCount+columnCount every time index() is called can be avoided. These calls can be particularly slow when sitting on top of a stack of proxymodels. And index() itself is called very often, i.e. when a proxymodel on top of us is used by a delegate which calls data() for many different roles. Change-Id: I00dd5cf432c0591f41e6fa6fc86c845f29845cd1 (cherry picked from qtbase/3de0f442b5857915f26be6600bc8e54d1af08208) Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Auto-scroll while selecting entire rows/columns did not workJan Arve Saether2014-12-031-2/+4
| | | | | | | | | | | | | | | | If you press and hold a section in a header view you can extend the selection to more rows by moving the mouse. This worked fine until you moved the mouse outside the geometry of the header view. The expected behavior was then to scroll the view (this is what happens with extended selections on regular table cells). [ChangeLog][QtWidgets][QHeaderView] Auto-scroll the view when making extended row/column selections. Change-Id: Ic65aa34d370e74054b2123ab57edb1add0e8adb9 Task-number: QTBUG-21201 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> (cherry picked from qtbase/f9408317e70bc2e635a2f9baeff35d1c06227734)
* QTreeView: speed up isRowHidden for the case where no rows are hidden.David Faure2014-10-131-0/+2
| | | | | | | | | | isPersistent(index) is a linear search, which we can avoid altogether (as well as the creation of a persistent model index, is idx is indeed persistent) when the row-hiding feature isn't used at all. Change-Id: I55ef204dd9b79a89d51d5d3aacc1c110d37a4ea0 (cherry picked from qtbase/cd824ee79188b889df85d4d648a625589655e15e) Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* QListView: Catch stack overflow on mutual scrollbar calculation.Lars Knoll2014-09-101-2/+32
| | | | | | | | | | Backport of fc4993be1fa7673016b6e5d81134463f163051f6 from Qt 5. Task-number: QTBUG-39902 Task-number: QTBUG-38517 Change-Id: I66b2c7304423dd65d67158ae0dc70ad12e4fa783 Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Don't call virtual methods after the source model is destroyed.Andreas Hartmetz2014-09-032-1/+3
| | | | | | | | | | | | | | | Calling clear_mapping causes the persistent indexes to be queried, and mapped using map_to_source, so that they can be restored later. That is not the appropriate response to the source model being deleted because there won't be anything to restore. Simply clear the stored mapping information instead so that the source model actually exists when mapToSource is called by the framework. Backport of 722798a359761a1eb635d18547b076615f192508 from qt5/qtbase Change-Id: I9c74f97855046b968dfba7a35134c234b974e63b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-071-9/+2
| | | | | | | | | | 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> (cherry picked from qtbase/85aef2dd4b059d2ba9cba4605d9fef87f3e2c4fc)
* Updated year in copyright headerKai Koehne2014-03-2667-67/+67
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Correct wordwrapped text handling in QListView icon modeSamuel Gaist2014-01-151-0/+5
| | | | | | | | | | | | | | Currently a QListView with wordwrapping activated will wrap the text only to the width of the icon even if the grid size is bigger. With this patch the option rect is now updated to match the grid size if valid and the style uses it to determine the correct size when wrapping [ChangeLog][QtWidgets][QTBUG-4714] Use the grid size for wordwrapping when available in icon mode Task-number: QTBUG-4714 Change-Id: I2cb63809d3ee8bd262f38bc11de91df9ff5cf237 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qtbase/a761be2fb2191215426f904cb03df0e966214531)
* Properly paint QListView dragged item in icon modeSamuel Gaist2013-10-182-28/+17
| | | | | | | | | | | | | | | | Currently, when dragging a QListView item in icon mode, only the item is moved and once out of the view port, the visual feedback is lost. This patch updates the QDrag pixmap to have a persistent view of what is moved Based on Qt 5 c3bf3bd8b74187b44ec91582e1cf2be546a73349 Task-number: QTBUG-1180 [ChangeLog][QtGui][QTBUG-1180] Dragging an item outside the QListView in icon mode doesn't lose the icon. Change-Id: I9d7fee4c31a4d3d5467510f16fd573635eb6d6f0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Windows: Introduce QFileDialog::DontUseCustomDirectoryIconsSergio Martins2013-09-093-4/+36
| | | | | | | | | | | | | | | | | | | | | Folders can have a custom icon, set by the user. Some system folders also have one, for example c:\windows\fonts. This option allows you to disable this behavior, you'll get the folder directory icon. As a side-effect, you'll get a very big performance improvement on removable/network media: 2 seconds vs 60 seconds on a SDCard with 10000 folders. Unlike in Qt5, here we didn't add new methods to QFileIconProvider do avoid introducing new symbols. Change-Id: I0b98a180e53c9ee7d583f19b3917fcc9166cb3eb Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from qtbase/46685f755b01288fd53c4483cb97a22c426a57f0) (cherry picked from qtbase/149f3efc39bebbe8fceacf2553836f90d2e1c383) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Cleanup QFileIconProviderPrivate::getWinIcon().Sergio Martins2013-07-251-23/+18
| | | | | | | | | | | | No functionality is changed, just made the code more readable and removed some duplication. Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0. Code in Qt5 is already clean, no commit necessary there. Change-Id: I29fe871eeb0b45b619434e7941cc673033366f63 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Move the declaration of QFileIconProviderPrivate to it's own file.Sérgio Martins2013-07-233-33/+92
| | | | | | | | | | | | | Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0 to Qt4. We can't add new symbols in Qt4 to QFileIconProvider so we will make the private class a friend of the QFileDialog. Change-Id: Ic720d681da14698ecf8557e1223d82bda6b33e23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> (cherry picked from qtbase/f4a0d6d2494d1dd41cd5b854a48b435120714d32)
* Don't bypass overwritten [set]data() methods in the proxy.Volker Krause2013-05-061-4/+2
| | | | | | | | | | | By calling itemData() of the source model directly, the result cannot contain data provided by the proxy model itself. The base class implementation however will call data() on the proxy instead. Cherry-picked from qtbase/96e3c2bcbfedc8b5cb8fc099229a02a1fa335c21. Change-Id: I7e8b65ab045382089c577d9832edc1555b71419e Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QTableView::doItemsLayout()J-P Nurmi2013-04-231-3/+8
| | | | | | | | | | | | 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 (cherry-picked from qtbase commit 00b11ccdead05d77589d4ec5ebb3b376c6ae2ca1) Change-Id: I183145fbd84339e82d2d1d0bc39cea33d9cc9734 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Windows: Fix one of the two file dialog bottlenecks.Sergio Martins2013-03-281-1/+14
| | | | | | | | | | | | | | This patch reduces the number of calls to GetFileAttributesEx() when icon lookup is being done. The second bottleneck is a couple of isSymLink() calls. Will fix that next. Task-number: QTBUG-13182 (cherry picked from commit a7f6f32fadd5024697c16dfcbc07d6d11beb45fa) Change-Id: If42b791d22fe0429a3b43992bad037afad09c448 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fixed QTreeWidgetIterator to work with sorted QTreeWidgetJan Arve Saether2013-03-131-5/+4
| | | | | | | | | | | | | 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> (cherry picked from qtbase/aa2d10750ad8cdb6a86d519063664c2924b2a635) Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1366-66/+66
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix hover handling in QTreeViewMiikka Heikkinen2012-11-242-14/+12
| | | | | | | | | | | | | | | Cached hoverBranch could get invalid if branches were collapsed or expanded programmatically, leading to a crash in some situations. Fixed the logic for updating hovered over branch indicators and also now update hoverBranch when drawing so that it is guaranteed to be up to date there - this fixes issues like hover indicator not updating when the view is programmatically scrolled. Task-number: QTBUG-27158 Change-Id: I5bd1ad76aee512ad78df33959a84ead16886a47c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qt5/qtbase commit fd6a870136ab2fdb3ce8b516abcf8c05d45caba7))
* HeaderView - call invalidateCachedSizeHint() on clearThorbjørn Lund Martsum2012-11-071-0/+1
| | | | | | | | | | | | This calls invalidateCachedSizeHint on clear, which is a logical thing to do. This is a backport of SHA aa2578a1006f17cff50ca39090bae2e1e090b59b Task-number: QTBUG-22528 Change-Id: I725748b314fd9d09441d3bf34c4607a4cc7162ed Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Qt 4 - QHeaderView - correct drop on manual QHeaderView sectionmoveThorbjørn Lund Martsum2012-11-031-1/+1
| | | | | | | | | | | | | | | | | | | This fixes an error in the calculation of the exact drop position when an user is moving a section in QHeaderView. Before we compared a mouse-position local to the widget (pos) with a summed length of sections (posThreshold). However we need to consider/substract the headers offset to make the posThreshold comparable to the local mouse position. This is a backport of SHA d625535728154fc9ca576bf6472c6b5057a96f17 This solves e.g. Task-number: QTBUG-14814 Change-Id: I8e2c820dc9018fb3d14b71f28aa317417c997a44 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - fix minor bug in visualIndexAtThorbjørn Lund Martsum2012-10-311-2/+2
| | | | | | | | | | | | This fixes a minor bug in VisualIndex triggered when calling resizeSection with size 0 (but not hideSection). It is mostly cosmetics - but it is still a bug. This is a backport of SHA 73a5bc2aac7638438dfde260a4246359a06e89ae Change-Id: Ic3e1ce584d8befa501c670c085435248ebaa681b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - length returns wrong value fixThorbjørn Lund Martsum2012-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | setSectionHidden called with (logindex, true) will sometimes not do a (correct) call to resizeSection(logicalIndex, 0) at once. However it does execute d->doDelayedResizeSections(). Therefore the section is going to be hidden later. However it is a problem that the length meanwhile is wrong. (That is a value that is not the sum of the sections) This is fixed by execute updates before returning the length. This is a backport of SHA 125016ad241125176e5bebab94eebcf50fac20bc Task-number: QTBUG-14242 Change-Id: Ia1d2f6db3213792b250a6a37942b56554261cd3a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - no big update work if updates are disabledThorbjørn Lund Martsum2012-10-311-0/+7
| | | | | | | | | | | | | This is not a major boost, but still a nice optimization that can speed up hideSection and resizeSection with about 40% if updates are disabled. It is backport of SHA 3bb0c88de8894fc05ad1558b96ae05ceeff64b78 and a5201007f255a07f7ba07981745eeaec41a14a34 Change-Id: I33b83940003c391e5dae549353a6beb27928f92a Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-0/+1
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2968-1630/+1630
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix crash when invalidating a QSortFilterProxyModelStephen Kelly2012-09-141-6/+22
| | | | | | | | Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase. Task-number: QTBUG-27122 Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fixed the QTreeView expansion/collpasing when animatedThierry Bastian2012-08-311-2/+6
| | | | | | | | | | | | | | | | | | If you had a QTreeView with expandable items, if you tried to expand and while the animation was still running you'd try to collpase the node, the display would be completely broken: the items below that items would not be visible any more except for a fraction of a second when expanding or collapsing it again. The problem is in the fact that when starting an animation the QTreeView stores the state before animating. And it does that even if an animation is already running. So the stateBeforeAnimation becomes AnimatingState and when the animation finishes, AnimatingState is the state that is restored breaking the painting. Unit test is included. qtbase-sha1: 1e97dbaf6ca807397e3ec77a3611763769499d17 Change-Id: I62e16101b70153f78022f6195fd9de6db0cd4878 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Take account of hidden items in QListView when using scrollTo.Stephen Kelly2012-08-271-3/+9
| | | | | | | | | | This is a backport of 799ceebad8a2dbe1ca0e60a11c7d6ca0c2c8b7a9 from qtbase. Task-number: QTBUG-21804 Change-Id: I757b9598f354cdfa62c08d0c2613ded93fe88804 Reviewed-by: Jani Honkonen <jani.honkonen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix a QListViewItem width when spacing is setJani Honkonen2012-08-231-1/+1
| | | | | | | | | | | | | | | | The listitem width was calculated incorrectly because spacing was not considered. This fixes the second part of the reported bug where spacing is set. Added some tests to catch the issue relating to the reported bug. Also added a test to check spacing in general. Backported from Qt5 commit: d2bba5e5535726f277e8dc67b1478168f57b24bd Task-number: QTBUG-21804 Change-Id: I20cae3a2b9d42650052441f9f15b43f72418f58b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QListWidget scrolling with keys when there are hidden itemsJani Honkonen2012-08-221-3/+11
| | | | | | | | | | | | | If the selected item is scrolled with keyboard keys the selected item will go outside the visible area. The scrolling did not take hidden items into account when calculating the amout to be scrolled. Backported from Qt5 commit: d4385e48b8566a5587048a3c6d8b2396ba587ed5 Task-number: QTBUG-21804 Change-Id: I81a82ed56bb0e4c0229fd117784790e1234aacca Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Avoid crashes when invalidating a proxy model filter.Stephen Kelly2012-08-081-3/+4
| | | | | | | | | | Backport of b84e180263d0da3d1e6967fcf759225a778ea6ea from qtbase. Task-number: QTBUG-26107 Change-Id: I8323b19ce7b641165de21ad9a6e6b05bf4d93b1c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0168-136/+136
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Speedup for QAbstractItemViewPrivate::delegateForIndexABBAPOH2012-06-191-4/+11
| | | | | | | | | | | This fix prevents copying of a QPointer on a stack and adding/removing QMetaObject guards Backport of the ed776e367099754af6436f07d72352e6b73124da commit in qtbase Change-Id: Ie92fe1e7ac2c8d15be67404521040bf1a64b9c9a Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* AbstractItemView editorForIndex/indexForEditor speedupABBAPOH2012-06-151-1/+9
| | | | | | | | | | | | Frequent calls to editorForIndex/indexForEditor are very slow because of an implicit conversion from QModelIndex to QPersistentModelIndex. This fix allows to avoid unnecessary conversions when there are no open editors (most common case) Backport of the 1d859ef80540ec3dd64f4f7bda3a8e415965650c commit in qtbase Change-Id: Id4f8c985b824a83019dc8a8543dee69c12004faa Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Eliminate QTreeWidget drag crashJiewen Wang2012-05-311-1/+1
| | | | | | | | | | | | | In QTreeViewPrivate::adjustViewOptionsForIndex() wrong index had been used when referencing to array of viewItems. Variable row is set to the index of the QModelIndex, however it is not as same as the index in viewItems[] when there was hidden item in treeWidget. Index of viewItems[] should be used here. Unit test is added as well. Change-Id: Ie129cb63445bf1239ef7c5b2bc61b04dd9e81982 Task-Id: QTBUG-25333 Backport of <3be6ca3ee8c2c72f85b26a57538fd329ed811261> from Qt5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix define to build without gtk style.Frederik Gladhorn2012-05-081-1/+1
| | | | | Change-Id: I750664ca0c227df4b8792536b2a0beec9c96f845 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-261-32/+9
| | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: I27f9496c2c998de7ea858b943c2f19d979ef18c2 Reviewed-by: David Faure <faure@kde.org>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-142-6/+7
| | | | | | | | | | This is a regression introduced by commit d63910575949106f84dacf04abaa14fc866aa66b. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476 Reviewed-by: David Faure <faure@kde.org>
* Disconnect slots from the old sourcemodel in QIdentityProxyModelk.blammo@gmail.com2012-04-101-40/+40
| | | | | | | | | | | | | | | When setting a new sourcemodel QIdentityProxyModel::setSourceModel tries to disconnect from signals belonging to the NEW model instead of from the existing sourceModel(). QIdentityProxyModel thus receives signals from both the old model(s) and the new model. This results in ASSERTS triggering in various slots, for example: "Q_ASSERT(topLeft.isValid() ? topLeft.model() == model : true);" in QIdentityProxyModelPrivate::_q_sourceDataChanged. Change-Id: Ic6f65a9ee10981d00206335f2edef78272fadc1a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from commit fae4a2555a9402e8cecf67242b29dca624cc61e8) Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Cherry picking qt5 bugfix 437da962c2b486b1a1722aac003bfa00b93ac204 to qt4.Arnt Witteveen2012-03-191-8/+10
| | | | | | | | | | | | | | | | | | | | | Original description for bugfix: Fix bug showing folder icons for files Fix an issue where the cache was updated with the folder icon, even though this is never used from the cache. This caused files to sometimes be shown with a folder icon: If a folder has an extension (e.g. a folder named 'folder.ext'), this means the folder icon will be written to the cache for the 'ext' extension, and from that point on all .ext files will be shown with the folder icon. The fix is to not save an icon in the cache for those cases where it will not be used from the cache anyway, by using the same condition for updating the cache as for reading it (which is in line 8 of the same function). Change-Id: I349526ff017b1a2409e3dcc494b86bb541740790 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fixed compiler warnings about unused q and d pointers.Janne Anttila2012-03-151-1/+1
| | | | | | | | | | The q and d pointers were not used in these functions at all, or they were used only inside some #ifdef quard such as QT_NO_ACCESSIBILITY. Moved the Q_D and Q_Q macros inside the appropriate scope. Task-number: QTBUG-22512 Change-Id: I1624a1d800c7ce21cde4af1678d93e6f615edd45 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix QTreeView header re-ordering bug on Mac OS.Chris Meyer2012-02-281-0/+7
| | | | | | | | | | | | | | | | | | | | When the mouse button is released at the end of a drag, Cocoa may simulate an extra mouse moved event. However, the state of the buttons when this event is generated is already 'no button'. This leads to some failsafe code canceling out of the drag state and when the actual mouse release event is finally processed, the header drag state has already been exited and the header drag fails. This patch disables the failsafe code on Cocoa and makes header dragging work when the mouse goes outside the bounds of the header view. Task-number: QTBUG-14179 Change-Id: Ic2762b77b78ef7b99f97ff9ed1f58254de1eba82 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Andrew Semenenko Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QListView::scrollTo() when there are hidden rowsJani Honkonen2012-02-091-1/+6
| | | | | | | | | | | | | | QListView does not consider hidden rows when scrolling to an item. If there are hidden rows (or columns) before the selected item then the visual index of an item is not the same as the row index from the model. So scrolling will be off by the number of hidden rows before the selected item. Added a autotest for this also. Task-number: QTBUG-21115 Change-Id: I49c39033d83f80d4405b59510617096029ee6d3b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Some small doc fixes, typos and removal of one incorrect paragraphAndy Shaw2012-02-082-5/+5
| | | | | | | | The QTextStream paragraph that is removed referred to something that is incorrect. This was confirmed for Windows, Linux and Mac. Change-Id: Ibac8f82482f2060308b5b8485d6da228bdf52fe6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Reduces compiler warnings when compiling for WEC7jaanttil2012-02-031-2/+2
| | | | | | | | Task-number: QTBUG-22512 Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix crash in QTreeWidgetItem::sortChildren when adding new item.Markku Heikkila2012-02-011-0/+1
| | | | | | | | | | | | | | | | Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and sorting is enbled in QTreeWidget. First call is from user code and second is caused by timer. When timer expires second call is made. This recursion is prevented with QTreeModel::SkipSorting skipSorting() in QTreeWidgetItem::sortChildren(); Task-number: QTBUG-20345 Change-Id: I48af98b03c0291de8da90d1581bc55cc89846b8c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1166-66/+66
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove more "unused variable" warningsGabriel de Dietrich2011-11-301-2/+2
| | | | Reviewed-by: Frederik
* QTreeView: fix crash when starting a drag with hidden columns.David Faure2011-11-301-4/+12
| | | | | | | | | | Crash was introduced by d639105759491 (Qt-4.8 only) Amended to remove "unused variable" warning. Task-number: QTBUG-15834 Merge-request: MR-2725 Reviewed-by: Gabriel
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 18:44:46 +0000