| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView items were not correctly updated when rootIndex changed.
Allow text to selected in a TextEdit or TextInput inside a Flickable.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
PathView got confused because it queried the model when removing
items due to the rootIndex change. This caused new items to be added
since the model->count() was not zero (it was the count for the new
rootIndex). Calculate the PathView modelCount similarly to the other
views (rather than querying the model) and correctly handle the
modelCount being set to zero.
Change-Id: I9e4fb27c14aa8c77ad37ff01d95c123f909db20d
Task-number: QTBUG-16366
Reviewed-by: Bea Lam
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix auto test failure.
PathView regression: dragging the path didn't update currentIndex
Fix docs for variant and list basic types
Add test for importing plugins that contain QML files
Call onAdd() for first items added to ListView and GridView
Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master.
Don't clear pre-edit text when a graphics items loses focus.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some refectoring while fixing QTBUG-13687 resulted in the private
setOffset() method being called rather than the public. The
public version was responsible for updating currentIndex.
Change-Id: Iac9c7a19d6fa64550b9498e77b8983512e199370
Task-number: QTBUG-17319
Reviewed-by: Michael Brasser
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.cpp
|
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the model is a VisualDataModel, the count will initally be zero
and modelCount is not updated due to itemsInserted() before the
component is completed.
Task-number: QTBUG-16357
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| |
| |
| |
| | |
Clarify that the properties are attached to the root of the delegate,
and must be accessed as such by child items.
Task-number: QTBUG-16193
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16133
Reviewed-by: Bea Lam
|
|/ |
|
|
|
|
|
|
|
|
| |
Removing the currentIndex could result in currentIndex being > than
the number of items in the model.
Task-number: QTBUG-15926
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
|
| |
PathView needed to update internal item count when delegate was set.
VDM::count() didn't call into the internal VDM when querying count.
Task-number: QTBUG-14781
Reviewed-by: Alan Alpert
|
|
|
|
| |
Task-number: QTBUG-15073
|
|
|
|
|
| |
Task-number: QTBUG-15222
Reviewed-by: Yann Bodson
|
|
|
|
|
|
|
|
|
|
| |
direction.
With < 4 items the shortest distance algorithm doesn't work since it
is equal distance either way.
Task-number: QTBUG-15260
Reviewed-by: Yann Bodson
|
| |
|
|
|
|
|
|
|
|
|
| |
The test to determine whether the mouse had moved greater than
startDragDistance() compared the starting point on the path to the
current mouse position. Fix to compare nearest path position.
Task-number: QTBUG-14220
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
|
| |
If we remove all items then we don't have a valid firstIndex with
which to anchor item positions, so just use offset.
Task-number: QTBUG-14199
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
|
| |
Fixes regression caused by optimization added in commit
35a51442ed21f58c06b21293eeb56e843251ee82.
Task-number: QTBUG-14239
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
|
|
|
| |
Since it didn't accept the press it didn't get a grab, so its events
were always filtered away by Flickable.
Use the same implementation as Flickable, i.e. create private handler
functions for mouse events and accept normal events in the mouse*Event()
methods.
Task-number: QTBUG-13687
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
|
| |
Check that we no longer hold a reference to the item before setting
onPath to false.
Task-number: QTBUG-13689
Reviewed-by: Michael Brasser
|
| |
|
|
|
|
|
|
|
| |
Ensure the offset is adjusted to account for the new or removed items.
Also minor optimizations to delegate updates.
Task-number: QTBUG-13416
|
|
|
|
|
| |
Task-number: QTBUG-13017
Reviewed-by: Martin Jones
|
|
|
|
| |
...and a set of functional group pages.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator
QtDeclarative: get rid of warnings in public header
doc: Clarify documentation of QStaticText
Fix scrollbar randomly popping up in QPlainTextEdit
Remove the definition of QT_HAVE_NEON from qt.prf
Use the fast Neon conversion for converting colors of jpeg images.
Do the conversion from RGB888 to RGB32 using Neon
Move the build of Neon file from painting.pri to gui.pro
QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads
compilation with QT_NO_DEPRECATED
Test we do not have compiler warnings in our headers with more options
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Doc: Fixed qdoc warnings.
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
Doc: Fixed typo.
Doc: Fixed QML documentation errors.
Doc: Merged in some of Thomas Zander's suggestions.
Doc: Fixed name clash.
...
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/qml-examples.qdoc
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
|/|
| |
| |
| |
| |
| | |
Any movement beyond the threshold is sufficient.
Task-number: 12747
Reviewed-by: Joona Petrell
|
| |
| |
| |
| | |
Task-number: QTBUG-12529
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12404
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
PathView handles its own mouse interaction, but lacked properties
similar to those in Flickable to determine when it is stationary.
This made it impossible to start an animation when the view stops moving,
for example.
Task-number: QTBUG-12497
Reviewed-by: Warwick Allison
|
|/
|
|
|
|
|
|
|
|
|
| |
Always place PathView delegates centered on the path
The scale of the delegate was used to offset the item. This was a
bad way of making the item appear to be positioned correctly when
the default transform origin was the top-left. Now that transform origin
is center, it is obvious that it was a bad idea.
Task-number: QTBUG-12245
Reviewed-by: Michael Brasser
|
| |
|
|
|
|
| |
So use Component.onCompleted:
|
| |
|
| |
|
|
|
|
| |
examples from class docs and improve assorted docs
|
| |
|
|
|
|
| |
Task-number: QTBUG-11006
|
|
|
|
|
| |
Also add missing increment/decrementCurrentIndex() slots to PathView,
and tweak the number of points cached along a Path.
|
|
|
|
|
|
|
|
| |
If an item was created spontaneously (i.e. delegate is a package and
some other view created the item), ensure its attached properties are
correctly initialized.
Task-number: QTBUG-10527
|
| |
|
|
|
|
| |
Task-number: QTBUG-10353
|
|
|
|
| |
Task-number: QTBUG-10386
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-10327
Reviewed-by: Martin Jones
|
|/ |
|