| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
- We should not do -1 after erasing, as it is done later on.
- We should consider the 0 height even if it is not the last span.
- Added an assert.
Task-number: QTBUG-9631
Reviewed-by: Gabriel
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In some cases the fileiconprovider has been reported to crash
while accessing icons with overlays. This situation got
worse with change b67bd25be08b54c3e6e49b2b9429e54ff58db268
since these cases were often hidden by broken caching.
The workaround for now is to simply check that the hIcon structure
is non empty before converting the icon.
Task-number: QTBUG-8324
Reviewed-by: ogoffart
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|
|
|
| |
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
|/
|
|
|
|
|
|
|
|
| |
Adding SHGFI_OVERLAYINDEX will append a system overlay identifier
to the hIcon member, giving us a unique cache id for overlayed icons.
Without this we could end up with having random overlays on icons depending
on which one we loaded first.
Task-number: QTBUG-7663
Reviewed-by: prasanth
|
|
|
|
|
|
|
|
|
| |
That rare case when we are deleting the last span was not being taken care
of. Unbelievable but true. Auto-test included.
Reviewed-by: Thierry
Reviewed-by: leo
Task-number: QTBUG-6004
|
|
|
|
|
|
|
|
|
|
|
| |
QIconModeViewBase::filterDropEvent() was only moving the items around in the
view without ever checking whether the cursor was over a drop enabled
item. Now it does and returns false if it's the case. As a consequence,
QAbstractItemView::dropEvent() gets called. No auto-test since it's a drag &
drop related task.
Reviewed-by: janarve
Task-number: QTBUG-6848
|
|\
| |
| |
| |
| | |
Conflicts:
dist/changes-4.6.1
|
| |
| |
| |
| |
| | |
Merge-request: 2077
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some styles such as oxygen, or gtk, require the whole row to be
redrawn in case of mouse hover the items.
There was special code that handle that in the MouseMove event of
the QTreeView, but that did not covered all the case (such as
scrolling with the mouse wheel)
Reviewed-by: Gabriel
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTreeView::selectAll() called QTreeView::select() on the first column, first
and last rows, and rows selection flags. As the first row was hidden, this
range spanned to void. We now pass the upper-left and lower-right indices to
select(). Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-6450
|
|/
|
|
|
|
|
|
| |
when using a treewidget with animations in a splitter and the tree is
collapsed, and then select an item in the tree that requires expanding,
it might end up trying to paint to an invalid pixmap
Reviewed-by: Gabi
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
match its source.
Merge-request: 2266
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| |
| |
| | |
Also move the modeltest related tests to the modeltest subdirectory
Merge-request: 2262
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
|/
|
|
| |
Task-number: QTBUG-5046
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Fixed qstylesheetstyle benchmark for Symbian
Fixed qdiriterator benchmark for Symbian
Fixed events benchmark postEvent function
Fix for QTBUG-4908 SVG transparency rendering problem.
Long informative texts causes messagebox to grow outside of screen area
qreal-ization
qreal-ization
qreal-ization
QS60Style: Remove layouts with mirrored information
Fixed qgraphicsview autotest build for winscw.
Enabled input method update code for all platforms.
(ODBC) Fixes segfault when error string is larger than 256 chars.
Fixed QGraphicsView benchmark for Symbian.
FEP indicator shown in status pane when it should not
Skipped the most memory intensive tests in QByteArray benchmark.
qreal-ization
qreal-ization
QS60Style: Theme graphics for QSlider in 3.1
QS60Style: Groove changes caused build break of S60 3.1
Slow spinbox on N95 when using keys Up/Down
...
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
FEP indicator is shown in few cases in statusbar when it should not be.
Case a)
Application contains item view.
QAbstractItemView is initialized as having WA_InputMethodEnabled on,
irregardless of functionality of each separate cell. So we need
to check the model for the itemview cell about to receive focus,
is it editable. If it isn't then, we'll set the WA_InputMethodEnabled
as false.
This will fix the FEP indicators in a lot of cases: lists with cells,
empty lists, combobox lists, ...
Case b)
Combobox also initializes itself with WA_InputMethodEnabled active.
Even if the fix a) fixed the list inside combobox, the widget itself
when receiving focus needs also fixing. If we check the editable
flag of combobox when initializing the comment, we can set the
flag off.
Task-number: QTBUG-5705
Reviewed-by: axis
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Before commit 88ecc8c8250505129ccff2660c60412996e2fd85, this case was handled
during the mouse release event, but was responsible for selections being made
twice sometimes. We now check whether a selection actually happened during
the mouse press event. If not, we will try to select again during the mouse
release event. Auto-test included.
Reviewed-by: Thierry
Task-number: QTBUG-6753
|
| |
| |
| |
| | |
Reviewed-by: Pierre Rossi
|
|/
|
|
|
| |
Task-number: QTBUG-6565
Reviewed-by: Gabriel
|
|
|
|
|
|
|
| |
Did not honour returned value from beginMoveRows(). Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-6532
|
|
|
|
|
|
|
|
|
|
| |
ItemAt() is in viewport coordinate.
Pressed index is in coordinate relative to the whole view
(regression since Qt 4.5)
Reviewed-by: thierry
Task-number: QTBUG-6407
|
|
|
|
|
| |
Reviewed-by: Olivier
Task-number: QTBUG-6284
|
|
|
|
|
|
|
|
| |
The index mapping to the base model was being cleared before the persistant
model indices.
Reviewed-by: Olivier
Task-number: QTBUG-6237
|
|
|
|
|
|
|
|
|
| |
The problem is that the ChildIndicatorPolicy change the hasChildren
in the model. But this is cached in the QTreeView layout.
We must do a relayout to clear the cache.
Reviewed-by: Thierry
Task-number: QTBUG-3071
|
|
|
|
|
| |
Task-number: QTBUG-1717
Reviewed-by: Thierry
|
|
|
|
|
|
|
|
| |
The logicalIndices and visualIndices array where not clean of the
old sections, resulting in corrupted header.
Task-number: QTBUG-6058
Reviewed-by: Thierry
|
|
|
|
|
| |
Reviewed-by: Olivier
Task-number: QTBUG-6004
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: ogoffart
|
| |
| |
| |
| | |
Reviewed-by: leo
|