| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\
| | |
| | |
| | |
| | | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QFileSystemModel provides the same features as QDirModel but in a
efficient way so no need to keep QDirModel around.
This commit mark as obsolete QDirModel. Examples has been ported to
use QFileSystemModel instead. QCompleter also gain the support of
QFileSystemModel to complete nicely a line edit.
This commit also add a new signal in QFileSystemModel when the directory
is loaded, i.e. the thread has finished to read the current dir.
Task-number:QTBUG-3884
Reviewed-by:ogoffart
Reviewed-by:gabi
Reviewed-by:mbm
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| |\ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-5046
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The invalidate connection is made before connecting the source model,
which means it gets called first.
If a second proxy model is used with it, the sourceLayoutAboutToBeChanged
of the second proxy is therefore called before its sourceReset slot, but
after the persistent indexes of the first model have been invalidated.
The invalidate call is not needed because clear_mappings is called
when the source model is reset anyway.
Merge-request: 416
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
|
| |
Commit ecc202c introduced the regression while fixing another
regression (QTBUG-5854)
The selection would not expend to the whole viewport.
Reviewed-by: Robert Griebl
|
|
|
|
| |
Over src/ tools/ examples/ and demos/
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous implementation was scrolling down (number of visible items
in viewport) + 1 and this was leading to one item being skipped while doing
page down (the same also happened for page up). Now we are scrolling (number
of visible items in viewport) - 1 for each page down(up) (the '-1' is for
keeping the context, so the last item will turn into the first in case of
a page down, for example).
Task-number: QTBUG-5877
Reviewed-by: thierry
|
| |
|
|\ |
|
| |\ |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Fixes: QTBUG-5146
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
The mouse wheel event was not being relayed to the parent (supposedly QAbstractScrollArea) widget. Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-5237
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
In commit f44fe888ee82b9e04, we adjusted the item size to the size of the
viewport. It should really be adjusted to the size of the content.
Task-number: QTBUG-5854
Reviewed-by: Gabi
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
everything is selected
The arbitrary number in commit 8a7700ffb5e4959e78 was not big enough.
People still complains
Task-number: QTBUG-5671
Reviewed-by: Thierry
|
|/
|
|
|
|
|
| |
The autotest will follow
Task-number: QTBUG-2844
Reviewed-by: ogoffart
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|\ \
| |/ |
|