| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlViewer: Remove trailing whitespace
QmlViewer: Remove trailing whitespace
QmlViewer: Fix crash on exit
PathView: removing the currentIndex could make it invalid.
Fix broken database creation caused by previous fix
Improvements to anchoring docs
QDeclarativeProperty doc improvements
Update QtGui bwins def file for QTBUG-15615
highlightFollowsCurrentItem: false was not always honored
ListView: Fix calculation of currentItem position when out of view.
Update QtGui def files
Fix openDatabaseSync() to not create unused directory
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Removing the currentIndex could result in currentIndex being > than
the number of items in the model.
Task-number: QTBUG-15926
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| |
| |
| |
| | |
16447b1193fedf5fdcf1f3d270fa73c5036a1ba0 removed unused directory but
the fix meant that the base Databases directory was no longer
automatically created.
Task-number: QTBUG-15909
|
| |
| |
| |
| |
| | |
Make it clear that anchor margins only apply to anchors. Also
document that anchor and absolute positioning cannot be mixed.
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update QtGui bwins def file for QTBUG-15615
highlightFollowsCurrentItem: false was not always honored
ListView: Fix calculation of currentItem position when out of view.
Update QtGui def files
Fix openDatabaseSync() to not create unused directory
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/s60installs/eabi/QtGuiu.def
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In some cases ListView and GridView would position the highlight
despite highlightFollowsCurrentItem: false being specified.
Task-number: QTBUG-15972
Reviewed-by: Michael Brasser
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The calculation of position of currentItem when it is out of the
visible area was bogus.
Task-number: QTBUG-15525
Reviewed-by: Bea Lam
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15909
Reviewed-by: Warwick Allison
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A function resetCursorBlinkerTimer was introduced to QLineControl.
Each time the cursor position in a textInput is updated, the blinker
timer is reset.
Task-number: QTBUG-15815
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This moves the Qt.include() docs to qdeclarativeengine.cpp and
also documents it in the "Integrating JavaScript" page.
Task-number: QTBUG-15855
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15802
|
|/ / / |
|
| |/
|/|
| |
| |
| | |
Task-number: QTBUG-14736
Reviewed-by: Alessandro Portale
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We would previously call subFocusItemChanged(0) on the item as part of
clearing the subfocus, even if the item in question would recieve a new
subfocus item as part of setting the new subfocus.
This resulted in the declarative item emitting activeFocusChanged(false)
and then activeFocusChanged(true), which was affecting any animation or
state bound to the activeFocus property of the item.
We now stop clearing the subfocus when encountering an item that we know
will get subfocus during the set-subfocus pass. We then set subfocus all
the way to the root item, since the subfocus item itself might change.
The effect of this is that the declarative item will only get one call
to subFocusItemChanged(), passing the new subfocus item, instead of two.
This means the declarative item can keep track of wherther ot not it had
a subfocus item previously, and only emit activeFocusChanged() when the
active focus goes from true to false or false to true.
Task-number: QTBUG-15615
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-15405
Reviewed-by: Jason Barron
|
|
|
|
|
| |
Task-number: QTBUG-15779
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
| |
The margins could overlap, which caused overpainting. Ensure the
margins are always <= width or height /2.
Task-number: QTBUG-14657
Reviewed-by: Yann Bodson
|
|
|
|
|
| |
Task-number: QTBUG-15250
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
|
| |
If the header size was not set explicitly, but determined implicitly
from Text height, the view was not positioned so that the header
was visible when first shown.
Task-number: QTBUG-15599
Reviewed-by: Bea Lam
|
|\
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Change pen correctly when drawing cached text
Fix BorderImage painting at sizes less than margin size.
|
| |
| |
| |
| | |
Task-number: QTBUG-14568
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the width < left+right margins or height < top+bottom margins the
image was painted with the complete margins, resulting in an ugle
pattern. This change reduces the size of the margins proportionately,
which gives a much better appearance.
Task-number: QTBUG-15736
Reviewed-by: Yann Bodson
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix resource leak in QEgl::getCompatibleVisualld()
Fixed OpenGL state getting out of sync.
Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a
Declarative: Fix compiler warnings (Linux/g++)
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativepropertycache.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed OpenGL state getting out of sync.
Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a
Declarative: Fix compiler warnings (Linux/g++)
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When snapping is enabled the header was ignored and content would be
aligned with the first item rather than the header, when at the top of
the view.
Task-number: QTBUG-15710
Reviewed-by: Bea Lam
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15694
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15697
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15695
|
| |_|/
|/| |
| | |
| | |
| | | |
Task-number: QTBUG-15690
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13719
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Just add some Q_UNUSED for parameters or remove the variable we don't
need for the others.
Reviewed-by: Trust Me
|
|/ / |
|
|\ \ |
|
| |/
| |
| |
| | |
Also clean up some code uglyness in the process
|
|/
|
|
|
| |
Task-number: QTBUG-15623
Reviewed-by: Yann Bodson
|
|
|
|
|
|
|
| |
avoid an unnecessary copy
Task-number: QTBUG-15534
Reviewed-by: Martin Jones
|
|
|
|
| |
Task-number: QTBUG-15569
|
|
|
|
|
|
|
|
|
| |
This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab. This resulted
in a short jump before future events were handled by the nested item.
Task-number: QTBUG-15568
Reviewed-by: Bea Lam
|
|
|
|
|
| |
Task-number: QTBUG-14666
Reviewed-by: Aaron Kennedy
|
|
|
|
|
|
|
|
|
|
| |
Animating delegates results in the content height changing, which
may result in fixup being called if at the ends of the view, which
may in turn cause refill to be called, which will change the content
height, which repeats. Prevent this recusion from happening.
Task-number: QTBUG-14821
Reviewed-by: Bea Lam
|
|\ |
|
| |
| |
| |
| | |
Task-number: QTBUG-14761
|