| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
(otherwise "default" widget size happens first)
|
| |
|
|
|
|
| |
Continues d62bc81491b4b3ef76d626fd56f736427ee1e20c
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Resizing is not propagated to canvas view and root item. Examples may
or may not resize meaningfully. Skins are device-oriented and so do
not resize.
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml
examples/declarative/tutorials/contacts/3_Collections/Button.qml
examples/declarative/tutorials/contacts/3_Collections/ContactField.qml
examples/declarative/tutorials/contacts/3_Collections/FieldText.qml
examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | |
| | | |
generation of `fake' tokens.
A `fake' token is a token generated while recovering from a syntax error.
|
| |/ |
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/declarative/mediabrowser/content/PhonesPathView.qml
demos/declarative/mediabrowser/mediabrowser.qml
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
You can now specify an axis and rotation, rather than using transform.
The tranform behavior has been preserved, however, to allow for cases
where you want a more complex transform when rotating.
|
| | | | |
|
| | |\ \
| | | |/
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
They're no longer on by default, as per QWebPage.
|
| | | |
| | | |
| | | |
| | | | |
Nicer order, but not perfect (no global Z)
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added snippet comments for qdoc, also qmlconv leaves some
errors. ',' where they are not supposed to be,
] and indenting in the wrong places, lack of " around
enum values.
|
|\ \ \ \
| | |_|/
| |/| |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximageitem.cpp
src/declarative/fx/qfxpathview.cpp
src/declarative/util/qmllistmodel.cpp
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-declarativeui
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Before adding a / to the path one should check if it doesn't end with
one already. Otherwise one might get paths like //My Documents on
WinCE causing the native call to crash the filesystem service on that
system.
Reviewed-by: alexis
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We do not need to relayout on all changeEvents. The only events that
should change the layout of tabs are StyleChange and FontChange.
LayoutDirectionChange is separately by layouts.
Task-number: 188389
Reviewed-by: ogoffart
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These were caused by a comparison between QVariant::Type and
QMetaType::Type. We're using QMetaType::Float because QVariant have no
such Float value
Reviewed-by: denis
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This makes it possible to make a custom icon for the selected tab.
We cannot use the Selected state because that has a blue tint on
many platforms which is not what you typically want int a tab. The
On state will only affect icons where these states are explicitly set.
Task-number: 202063
Reviewed-by: ogoffart
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
|
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | |
| | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The qmlvariantanimation was setting an invalid 'fromValue' when the 'from'
property was unspecified.
|
| | | | | | | |
|
| | | |_|/ /
| | |/| | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | | |
kinetic-declarativeui
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: David Boddie
|