| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
When in QTreeView::dataChanged(), we didn't check for the actual
change in the value before setting
QTreeViewPrivate::defaultItemHeight. Hence, if uniformRowHeights is
true, we completely miss any resizing of the items.
Reviewed-by: Thierry
Task-number: QTBUG-9216
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Comparing the first character before calling strcmp gives big
speedup, as it avoid the overhead of calling the strcmp function
in many cases.
In indexOfMethodRelative, fix the normalize case. The computation
of the normalized string was put outside of the for loop, but it should
have been inside. This was not detected by the test because the wrong
string is at the end.
In IndexOfMethodRelative, we do not need to check if the method is a signal
or a slot, because we only iterate over the right interval.
This is only true for code generated by moc since Qt 4.6.
Which means that in application compiled with Qt 4.5 and older,
indexOfSignal could now return a slot with the same name (and vice-versa),
but I this it is safe to ignore that "problem".
Reviewed-by: Roberto Raggi
Reviewed-by: Kent Hansen
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add a function to QTextLine which returns the accumulated advance of
the glyphs in the text. Previously QTextLine::naturalTextWidth() was
used for both this purpose and for calculating the pixel width of the
text. Since these two metrics are not the same, either of the two
usages would be wrong. QTextLine::naturalTextWidth() has been changed
to do what its documentation claims it does, and horizontalAdvance()
should now be used for laying out text horizontally.
Reviewed-by: Simon Hausmann
|
| |
|
|
|
|
|
|
| |
we need to define WIN32_LEAN_AND_MEAN to include both windows.h
and winsock2.h
(http://msdn.microsoft.com/en-us/library/ms737629(VS.85).aspx)
|
|
|
|
| |
Task-number: QTBUG-2804
|
|
|
|
|
|
|
|
| |
We can't rely on the exposed rect since the item can be outside the view
so we need to regenerate the complete pixmap.
Task-number:QTBUG-8750
Reviewed-by:sroedal
|
|
|
|
|
|
|
|
|
| |
SetX and setY were calling setPosHelper directly therefore events for
itemSendGeometryChange and itemSendScenePositionChange were not sent
properly.
Task-number:QTBUG-9093
Reviewed-by:janarve
|
|
|
|
|
|
|
|
| |
Use GLuint for bufferId(), not uint. Replace the raw bind()
function with a raw release(), because that's the only useful
case for being able to do a raw glBindBuffer().
Reviewed-by: Daniel Pope
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
The introduction of QScopedPointer already broke source
compat for this one, not compiling is better than
crashing at runtime.
Reviewed-by: Trond
|
|
|
|
| |
Reviewed-by: Rhys Weatherley
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed performance issues when falling back to raster for sub-pixmaps.
Dragging headers in item views done right
|
| |
| |
| |
| |
| |
| |
| | |
Copy the sub-pixmap so that we don't need to convert the entire pixmap
to a QImage each time.
Reviewed-by: Gunnar Sletta
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (36 commits)
Fixed updating the VKB display when inputting into QGraphicsWebView.
Switched out QT_SOURCE_TREE, which is not defined for user apps.
QS60Style: All itemviews should indicate selection with tick mark
QS60Style assert fails to detect an index failure
QScriptClass-implemented constructors lead to application crash
Improve test coverage of QScriptClass::Callable extension
Change fromSymbianRSgImage() to use the newer version of RSgImage
Removed extra space from the command line passed to QProcess in Symbian
installTranslatorFunctions doesn't work for custom global object
fix QTabBar scroll button arrow position in Windows mobile style
Revert "Optimize getting bearings of a glyph on Windows for true type fonts"
stabilize tst_QAccessibility::comboBoxTest
Enable s60main.rsc infixing.
Improved qt_x11_wait_for_window_manager
Virtual Keyboard and double tap for Symbian support
Whitespace
Better handling for NOTIFY in QGraphicsWidget regarding geometry changes
Add NOTIFY to size property so QML bindings are working fine.
Implement Q_PRIVATE_PROPERTY that allows you to declare properties
Don't assert in QScriptValue::call()
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: QT-2990
Task: https://bugs.webkit.org/show_bug.cgi?id=36292
RevBy: Simon Hausmann
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In QS60Style, all itemviews should indicate selection/multiselection
with tick mark. Unfortunately it now uses object casting to QListView
currently to check the viability of widget to have tick mark. Thus,
it fails for QTreeViews and QTableViews.
Changing object casting to QAbstractItemView to support all item views.
Task-number: QTBUG-9212
Reviewed-by: Alessandro Portale
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style assert fails to detect an index failure
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QS60Style asserts that a given index is correct when setting theme
colors. Unfortunately it uses less-and-equal-to operator ('<='), which
is incorrect. It should use less-than ('<')operator, otherwise the
assert fails when index is equal to number of items in the color
table.
Task-number: QT-3078
Reviewed-by: Alessandro Portale
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QScriptClass-implemented constructors lead to application crash
Improve test coverage of QScriptClass::Callable extension
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QScriptClass-implemented constructors lead to application crash
Improve test coverage of QScriptClass::Callable extension
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add missing popContext() to balance the pushContext().
Task-number: QTBUG-8364
Reviewed-by: Olivier Goffart
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | |/ / / /
| | |/| | / /
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Change fromSymbianRSgImage() to use the newer version of RSgImage
Removed extra space from the command line passed to QProcess in Symbian
|
| | | |\ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Change fromSymbianRSgImage() to use the newer version of RSgImage
Removed extra space from the command line passed to QProcess in Symbian
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Symbian have changed the implementation of RSgImage to be more
lightweight and have moved it to a new library. This patch changes Qt's
usage of RSgImage to the new version and fixes some minor code style
issues.
Reviewed-by: Aleksandar Sasha Babic
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-8906
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix QTabBar scroll button arrow position in Windows mobile style
Revert "Optimize getting bearings of a glyph on Windows for true type fonts"
stabilize tst_QAccessibility::comboBoxTest
Better handling for NOTIFY in QGraphicsWidget regarding geometry changes
Add NOTIFY to size property so QML bindings are working fine.
Implement Q_PRIVATE_PROPERTY that allows you to declare properties
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix QTabBar scroll button arrow position in Windows mobile style
Revert "Optimize getting bearings of a glyph on Windows for true type fonts"
stabilize tst_QAccessibility::comboBoxTest
Better handling for NOTIFY in QGraphicsWidget regarding geometry changes
Add NOTIFY to size property so QML bindings are working fine.
Implement Q_PRIVATE_PROPERTY that allows you to declare properties
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-8757
Reviewed-by: thartman
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 1ebeb971d3382aec0fff927ce2d6ea7b0452584f.
This broke tst_qlistview::wordWrap in QWS
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We bundle the size and the geometry into the same NOTIFY signal.
Reviewed-by:akennedy
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Just add the notify + the signal.
Task-number:QTBUG-8277
Reviewed-by:yoann
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
where the read/write are in the d pointer. Works like Q_PRIVATE_SLOT.
Reviewed-by:olivier
Reviewed-by:akennedy
Reviewed-by:warwick allison
|
| | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-8757
Reviewed-by: thartman
|
| | | | | | |\ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | | | | | | |
|
| | | | | | | |\ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | | | | |\ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| | | | | | | | | |\ \ \ |
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
In most cases when partially updating an item, the old content of the
cache needs to be replaced with the new content
(CompositionMode_Source). But in a specific case when using
DeviceCoordinateCache and when the item is transformed, the new content
needs to be blended (CompositionMode_SourceAtop) with the old one to
avoid incorrect fully transparent background.
Autotest included.
Task-number: QTBUG-7863
Reviewed-by: bnilsen
|