| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Martin Jones
|
| |
|
|
|
|
| |
QTBUG-9799
Reviewed-by: Alexis Menard
|
| |\
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.h
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit add a extension object to bring the anchors property for
a QGraphicsWidget. The actual implement uses a separate object for storing
the anchor pointer. In the future it would be nice if the extension object
is the anchor itself. Also there are two connects extra for QGraphicsWidget
one can perhaps disappear with a later commit. Only baseline case is not
supported because QGraphicsWidget don't have any concept of baseline.
Reviewed-by:akennedy
|
| | |
| |
| |
| | |
Reviewed-by:leo
|
| | |\
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
doc fixes
Don't test XmlListModel examples on platforms without QtXmlPatterns
More error output for QML_IMPORT_TRACE=1
Fix declarative examples autotest, avoid using native separators
Doc: update Rectangle smooth painting screenshot.
Add some TextInput properties and methods
Remove GraphicsObjectContainer from the documentation.
import Qt 4.6 -> import Qt 4.7
Move documentation code to snippet.
Test fix.
Fix test
Fix test on QWS.
Fix PathView crash.
Make bindings dump more useful
Improve font value type documentation.
coding conventions
Doc fixes
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
...
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Cleanup minehunt example
Keep track of the item count to avoid calling model->count() during batched changes
Allow iteration over the Item.children property
Add QListModelInterface::modelReset() signal and emit this in
Compile
Allow MouseArea.Drag.target to be reset.
Document MouseEvent.accepted.
Initialize drag movement correctly if drag.target is set after mouse move.
Expand test.
Honor the startDragThreshold in MouseArea drag.
Don't crash if a target isn't specified for AnchorChanges.
Optimization: Only allocate QScriptValue if we need too
Crash: Assign context in CreateSimpleObject too
Optimization: Minor object allocation speedup
Optimization: Improve allocation strategy for QDeclarativeDeclarativeData
|
| | | |
| | |
| | |
| | | |
QTBUG-9645
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As the documentation mentions, these two events are delivered
respectively after the cursor has changed and after the tooltip has
changed. These two events were previously delivered just before.
This patch is needed for fixing QTBUG-5349 even if it is not directly
related.
Auto-test included.
Reviewed-by: bnilsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Incorrect simple conversion of the exposed rect from QRectF to QRect
when rendering the widget.
Task-number: QTBUG-7296
Reviewed-by: bnilsen
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since the introduction of transform properties in QGraphicsItem,
QGraphicsItem::transform() is no longer enough to get the correct
transform of an item.
No auto-test as it involves mouse dragging.
Reviewed-by: Yoann
Task-number: QTBUG-9295
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (60 commits)
Total makeover of SVG image reader
Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.
Micro optimization after feedback from Jan-Arve.
Show only one dialog when using QFileDialog on Mac.
Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7
Fix bad merge from 4.6.
Doc: Updated the qdoc manual with i18n info. Fixed a code example.
Fix QStaticText test on Mac
Support the pen set on the painter in QStaticText when using rich text
Fix setting font for QStaticText on Linux and Mac
Hack .pro files on windows to define QT_NO_EGL
Fix QDate::isLeapYear() for years < 1
One more test for chinese codecs
QScript: More missing APIShim
QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines
Work-around Symbian 10.1's broken egl.h
Add some #warnings to debug Symbian EGL build failure
Don't detect EGLImage presence by testing function pointers
Implement proper QStaticText support in QPaintBuffer
Make QStaticText layout lazy
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicswidget.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QGraphicsItem is no more lacking a way to notify the input method of a
changed micro focus.
Reviewed-by:denis
Reviewed-by:simon hausmann
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by:janarve
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Revert qgraphicsview.h to its prior 4.7 state and symbian.conf to
the current qt-4.7-from-4.6 (7c613a9ef4610fa2e0e1630eb3cd2b474875631d)
state.
symbian.conf may be bad, needs reviewing.
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (47 commits)
QScript: More missing APIShim
QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines
Work-around Symbian 10.1's broken egl.h
Add some #warnings to debug Symbian EGL build failure
Don't detect EGLImage presence by testing function pointers
Implement proper QStaticText support in QPaintBuffer
Make QStaticText layout lazy
Change QStaticText::setMaximumSize() to setTextWidth()
Respect QPainter::pen() in QPainter::drawStaticText()
QVarLenghtArray: add some API to be consistant to QVector
Don't try to resolve EGLImage function pointers if they are defined
Change ORs to ANDs when checking EGLImage extension defines
Protect EGLImage function definitions in #ifdef
Fix a bug in greek shaping causing infinite loops
Define QT_NO_EGL in configure.exe
improve mingw 64 bit support
Fix build on Windows
Round instead of ceil font metrics when ForceIntegerMetrics is enabled
cetest: remove source file duplicates from cetest.pro
Remove EGLImage create/destroy resolving from VG pixmap data
...
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When changing transformation properties (i.e., setRotation(),
setScale(), setTransformOriginPoint()), itemChange() is now called to
allow notification and change of the values. The flag
ItemSendsGeometryChanges needs to be set to enable this.
Autotest included.
Task-number: QTBUG-8112
Reviewed-by: alexis
|
| |\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits)
Fix bug when adding import paths manually
Update Comment
Optimize QDeclarativeEngine::importExtension
QGraphicsEffect : Don't rely on the exposedArea when rendering the item into the cache.
Fix snapping in listview.
Minor cleanup.
Improve flipable example.
Minor cleanup for visual test framework.
VisibleArea is not a creatable type.
More testing.
Test openUrlExternally
doc
example of WebView onAlert, and of popups in general.
Update examples/declarative.pro
Update mouseX(Y) when clicking on a mouse area
Declarative examples cleanup.
Add test.
doc
Move gitignore to right level, update for Linux.
Cleanup MouseArea visual tests.
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
the cache.
I forgot to change this line during fcb738161efc965e91c3d528c31ac77d3a05ac64
Task-number:QTBUG-9496
Reviewed-by:sroedal
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Commits reverted:
880e4935410769b8337d75f219bef70493c4bb2c
82a306e7dda06909801f576bbbbebb59dc41c563
6cb935dd89a391f792f8ad42012b5c7c38712f17
ebd1c45822aca087be994c898cfb01cd41599429
4e4c0055d59978850796ff8c1b5015e17459e8d2
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | /
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QGraphicsObject"
This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
This drops the support of QML on top of 4.6
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 1d094129c0c3994df4e59cd9eda6981a7b131903.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
This drop the support of QML on top of 4.6
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
changes"
This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
Drop the support of QML on top of 4.6
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311.
This drop the support of QML on top of 4.6
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by:TrustMe
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by:michael brasser
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Apparently structs are not socially acceptable.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Remove Translate.z since Qt cannot sensibly support it yet.
|
| | |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Going back to always blitting the newly painted areas to the cache (and
not blending it like before). To avoid painting artifacts when the item
is rotated and when it uses DeviceCoordinateMode cache mode, the entire
cache is always repainted in that case.
Task-number: QTBUG-7863
Reviewed-by: trustme
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The #include "moc_qgraphicswidget.cpp" is superfluous and caused these
link errors:
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o:(.data.rel.ro+0x0): multiple definition of `QGraphicsWidget::staticMetaObject'
.obj/debug-shared-emb-x86_64/qgraphicswidget.o:(.data.rel.ro+0x0): first defined here
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o: In function `QGraphicsWidget::metaObject() const':
Presumably this only happens when you have a stale moc file sitting
around but it's a bug none-the-less.
Reviewed-by: TrustMe
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
No repaint is triggered anymore when setting the cache mode to
DeviceCoordinateMode when already using that mode.
Also added an autotest for checking repaints when setting cache modes.
Task-number: QTBUG-9391
Reviewed-by: ahanssen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit adds a private property that QML can use to add children for a given
item. This is a custom list that calls a callback which actually reparent
the item instead of just appending in the list (otherwise it will mess up
the state of QGraphicsView). This is needed because childItems() is pretty
useless you get a list but if you append something on it then it adds
that into a copy. Also the children property is the default property
a concept used by QML.
Width and Height private properties has been added in order to support
better the integration with QGraphicsWidget in QML. The actual implementation
is in the private class of QGI and QGraphicsWidget reimplements it to return
the geometry. (In 4.7 QDeclarativeItem reimplements it too).
This change should be harmless everything is private.
Task-number:QT-2757
Reviewed-by:andreas
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The effect might rely on a child to draw itself. So we need to redraw if
a child become visible or invisible.
Task-number:QTBUG-7843
Reviewed-by:janarve
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Before calling addItem we need to invalidate the depth otherwise if
someone call anything relating to sorting when itemChange is called
(because of the scene change for instance) then qt_closestItemFirst
for example can crash because of an invalid state.
Task-number:QTBUG-6932
Reviewed-by:janarve
|
| | |/
|/| |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| | |
We bundle the size and the geometry into the same NOTIFY signal.
Reviewed-by:akennedy
|
