summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Namespaces not needed in new syntax.Warwick Allison2009-04-3013-87/+0
|
* Port syntaxWarwick Allison2009-04-301-12/+29
|
* Port syntaxWarwick Allison2009-04-301-52/+128
|
* Change syntaxWarwick Allison2009-04-305-95/+112
|
* fixWarwick Allison2009-04-301-1/+1
|
* Don't delay initial resizeWarwick Allison2009-04-301-1/+1
| | | | (otherwise "default" widget size happens first)
* Fix smooth scalingWarwick Allison2009-04-301-1/+3
|
* Fix crashWarwick Allison2009-04-301-4/+4
| | | | Continues d62bc81491b4b3ef76d626fd56f736427ee1e20c
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-3024-258/+451
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Convert phonebrowser.Yann Bodson2009-04-307-254/+447
| |
| * Rename the mediabrowser demo to match the content.Yann Bodson2009-04-3017-0/+0
| |
* | Resizable.Warwick Allison2009-04-302-3/+10
| | | | | | | | | | | | 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.
* | Compress sizeChanged signal to give width and height.Warwick Allison2009-04-302-2/+15
|/
* Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-3079-955/+1481
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-296-620/+703
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Added first/lastSourceLocations to AST::UiObjectMember and improved the ↵Roberto Raggi2009-04-296-620/+703
| | | | | | | | | | | | | | | | | | generation of `fake' tokens. A `fake' token is a token generated while recovering from a syntax error.
| * | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-296-20/+54
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-29380-10353/+8565
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Forgot this src attribute.Yann Bodson2009-04-291-1/+1
| | |
| | * Merge branch 'source' into kinetic-declarativeuiYann Bodson2009-04-2951-112/+112
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/mediabrowser/content/PhonesPathView.qml demos/declarative/mediabrowser/mediabrowser.qml
| | | * Rename the 'src' attribute 'source'. Don't need to be HTML-like anymore.Yann Bodson2009-04-2951-113/+113
| | | |
| | * | API improvements for Flipable.Michael Brasser2009-04-295-19/+171
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | model dataWarwick Allison2009-04-291-0/+137
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-29398-11233/+24508
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Convert the calculator demo.Yann Bodson2009-04-292-103/+169
| | | |
| | * | docWarwick Allison2009-04-291-1/+5
| | | |
| | * | Enable pluginsWarwick Allison2009-04-291-1/+1
| | | | | | | | | | | | | | | | They're no longer on by default, as per QWebPage.
| | * | Nicer order.Warwick Allison2009-04-292-5/+2
| | | | | | | | | | | | | | | | Nicer order, but not perfect (no global Z)
| | * | Phones info media, not movie info media.Warwick Allison2009-04-294-71/+47
| | | |
| | * | Fix plugin delayed loading. Allows settings from QML.Warwick Allison2009-04-292-4/+82
| | | |
| * | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-292-2/+1
| | | |
* | | | documentation snippets, some qmlconv cleanupIan Walters2009-04-2923-260/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-29331-10079/+7886
|\ \ \ \ | | |_|/ | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-298-29/+37
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-29111-2197/+2204
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Some foreach remove/improve.Martin Jones2009-04-288-29/+37
| | | | | |
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-287-18/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | * | | | | fix double slash prepending causing troubles on WinCEMaurice Kalinowski2009-04-281-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Fixed tabbar position reset on palette changeJens Bache-Wiig2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Compile Warnings removed in canConvertThierry Bastian2009-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Made tabbar tab icons set the On state for selected tabsJens Bache-Wiig2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Fixed Compile after removal of D3D.Friedemann Kleint2009-04-283-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-28108-2177/+2178
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Fix qmlvariantanimation to behave as qmlnumericanimation when 'from' is not setLeonardo Sobral Cunha2009-04-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmlvariantanimation was setting an invalid 'fromValue' when the 'from' property was unspecified.
| | * | | | | Remove trailing whitespaces from qmlanimation*Leonardo Sobral Cunha2009-04-282-15/+14
| | | | | | |
| | * | | | | Coding style refactor, changing 'if(' and 'for(' to 'if (' and 'for ('Leonardo Sobral Cunha2009-04-28103-2154/+2154
| | | |_|/ / | | |/| | |
| | * | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-287-11/+10
| | | | | |
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-28215-7763/+5537
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | kinetic-declarativeui
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2811-11/+11
| | |\ \ \ \
| | | * | | | Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie