| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-7479
Reviewed-by: Alexis Menard
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-2804
Reviewed-by: ogoffart
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Ther was duplicated code and useless disconnections in the destructor
|
|/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
we don't need to calldoDelayedItemLayout, setting the flag that the
widget needs the item layout is enough
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Until now, the dropped position depended on the position of the middle
of the dragged header w.r.t. the hovered header. Now, it only depends
on the mouse cursor position and the middle of the hovered header,
closer to what happens on Windows or Mac OS.
Reviewed-by: Thierry
Task-number: QTBUG-6968
|
| |_|_|_|/ /
|/| | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-8086
Reviewed-by: gabi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If multiple proxies are connected to one source model which gets reset,
the order of execution of the sourceModelAboutToBeReset slots could cause
QPersistentModelIndexes to be invalidated in one proxy model before the
same slot is executed in the other proxy model.
Additionally, the persistent indexes in the QSFPM are invalidated before
the persistent indexes in the source model. This patch makes them
invalidated afterward now, which makes more sense.
Merge-request: 503
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It could beseen that not a full row was updated when moving the mouse
from the decoration to its attached item.
Reviewed-by: gabi
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the number of selected items is large (a few thousands), the
computation of visualRegionForSelection can take a long time (up to a
few seconds). Analysis with valgrind shows that most of the time is
spent in miRegionOp (in qregion.cpp), which is being called by
QRegion::operator+=. The visualRegionForSelection virtual method being
called only to update the view after selection, we can safely ignore
those item's rectangles outside the viewport, thus both reducing the
number of calls to miRegionOp and the actual cost of each call.
This, however, introduces a behaviour change in
visualRegionForSelection, as the returned region will *not* contain
any rectangle *not* intersecting the viewport.
Reviewed-by: Thierry
Task-number: QTBUG-884
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since commit cd2afafbc9c29393a80d415145c49eb5f439da55, we are always
doing full relayout when adding or removing rows. So there is no point
of doing the expensive incremental update of the viewItems.
This has also the nice side effect to fix QTCREATORBUG-886
(see comment in the task)
Reviewed-by: Thierry
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
This could happen if a section was moved andthen hidden
Task-number: QTBUG-8650
Reviewed-by: Andy Shaw
|
|/ /
| |
| |
| |
| |
| |
| | |
That makes it consistent with the other models.
Task-number: QTBUG-8766
Reviewed-by: gabi
|
| |
| |
| |
| |
| |
| | |
Fix typo in qabstractitemview.cpp
Reviewed-by: Thierry
|
| |
| |
| |
| | |
This reverts commit 8e98c4c159c38ea48b6321674105762b2d3f517b.
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8270
Reviewed-by: gabi
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a crash in QSortFilterProxyModel when deleting a row
small cleanup regarding delayed layout in itemviews
Fixed wasted space in the texture cache.
Get debug code compiling since function signature changes
--warn;
That file was forgotten when adding SSE support under mingw
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
...while changing data.
Reviewed-By: gabi
Task-Number: QTBUG-8841
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
We cannot use isIndexHidden in ScrollTo because that would return
true if the index is in a span.
Task-number: QTBUG-8777
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... by first looking around the last find item.
This was already done, but only for the 4 closest item. Now start
searching from the last index and continue.
Reviewed-by: Gabriel
Task-number: QTBUG-8886
|
| |
| |
| |
| |
| |
| |
| | |
- use QHash instead of QMap
- use QVector::reserve when the size is known
Reviewed-by: Gabriel
|
| |
| |
| |
| |
| |
| | |
Specially when called from expandAll
Reviewed-by: Gabriel
|
| |
| |
| |
| |
| |
| |
| |
| | |
QVector::operator[] calls detach. and we should avoid calling it
in a loop.
QVector::at() cannot be used here because we need a non const reference.
Reviewed-by: Gabriel
|
| |
| |
| |
| | |
Reviewed-by: Trust me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When updating the QTreeViewItem::total field in layout(), we used to
call QTreeViewPrivate::viewIndex() to get the parent item, which is
O(n). We have now introduced 'parentItem' in QTreeViewItem wich makes
this O(1), with a small penality when inserting and removing elements
in QTreeViewPrivate::viewItems.
The QTreeViewPrivate::checkViewItems() is left inside the code for
further debugging.
Reviewed-by: Olivier
Task-number: QTBUG-8885
|
| |
| |
| |
| |
| |
| |
| | |
That is required for the Locals & Watchers view in Creator.
Task-number: QTBUG-7115
Reviewed-by: Thierry
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When computing the region from the selection range, we didn't take
care of the actual position of the cells, which is reverted when in
RtoL mode. Also gets fixed a 2-pixel error introduced in commit
718905c097a7f3bbf9805a2561cd855a0b2d8f59, and that was responsible for
(potentialy) painting more cells than needed.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7774
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
child
While setting the hasChildren property of QTreeViewItem, "collapsed" and
"not visible" were being mistaken.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7443
(cherry picked from commit 77670c3c0fdc3021356e212e94042a0b5a4f4f8c)
|
| |
| |
| |
| |
| |
| | |
After a mess-up by git rebase...
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| | |
This reverts commit 435bbd4be73768f617e4a4083a345d1d8d62daa3.
Reviewed-By: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Hiding widget might result in focus changes that will modify the list
of editors while iterating over it.
Same fixe as in commit 386726f7184cc77f0692e2ba24d85ebc53a39569
The test comes from the Task
Task-number: QTBUG-8585
Reviewed-by: Thierry
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors
Fixed qgl autotest failures on Maemo.
Skip complex FBO tests if combined depth-stencil isn't supported
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
persistent editors
Task-number: QTBUG-8422
Reviewed-by: Thierry
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This was particularly unusable when combining a QSortFilterProxyModel
with resize mode ResizeToContents.
Task-number: QTBUG-8540
Reviewed-by: Thierry
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
RVCT does not like static inline, and variables should not be defined
in case statement without braces. In this case the temp variable was
actually unnecessary.
Reviewed-By: TrustMe
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Crash in QGraphicsScenePrivate::setFocusItemHelper
Improvements to itemview keypad navigation in S60.
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Misc fixes to FLM files
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The logic used in this commit is partially taken from sliders.
This commit makes it possible to interact (change row or column)
in itemview even itemview does not have editFocus. Interacting without
editFocus is enabled when it is not possible to keypad navigate to
reuqested direction. In addition if keypad navigation to any direction is
not possible (i.e there is only one listwidget on screen), there is no
sense to add "done" softkey to get out of edit focus.
Task-number: QTBUG-4802
Reviewed-by: Alessandro Portale
|
| |/
| |
| |
| |
| |
| |
| | |
This simplifies the use of model view with qml and proxies.
Merge-request: 2315
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
child
While setting the hasChildren property of QTreeViewItem, "collapsed" and
"not visible" were being mistaken.
Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7443
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The header section was in a moving state before the drag actually started. That
is, before we moved more than QApplication::startDragDistance(). This could
cause a click to be considered as a move in some cases.
No auto-test as it would involve dragging.
Task-number: QTBUG-7327
Reviewed-by: Olivier
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
dynamicSortFilter is turned off
We should not sort when inserting items if the dinamicSortFilter flag
is set to false.
Note that some of the test used to rely on the fact that it was sorted.
Those test have been fixed.
The patch has been contributed to us in the task.
Task-number: QTBUG-7716
Reviewed-by: Thierry
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| |
| |
| |
| | |
Reviewed-by: Olivier Goffart
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/corelib/codecs/qtextcodec.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit adds support for dynamic i.e. runtime localization of S60
softkeys. Note that translations are not provided yet with qt.sis
(QTBUG-4919), meaning that localization does not actually happen unless
application developer provides its own translation (including translation
for softkeys).
Task-number: QTBUG-6785
Reviewed-by: Jason Barron
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Since 6c1388ee5a3c4796d hidden items are not taken in account when
counting the scrollbar position, and so the vector may be smaller.
Reviewed-by: Gabriel
Task-number: QTBUG-7929
|