| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
|
| |
Conflicts:
doc/src/examples/maemovibration.qdoc
|
|
|
|
| |
(4.7-generated-declarative branch).
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
The 'Writing QML Components' is mainly a restructuring of the
'Extending types from QML' page. It also documents the signal
connect() function that was previously undocumented.
Task-number: QTBUG-15718, QTBUG-15138
|
|
|
|
|
|
|
|
| |
Also, the currentIndex stayed -1 since the views all bound to each
others currentIndex, which starts as -1.
Task-number: QTBUG-14794
Reviewed-by: Yann Bodson
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed regression in QPixmap::size() for null pixmaps.
Make test less sensitive to platform specifics
Doc: Further QML improvements.
Doc: Minor improvements to QML-related documentation.
The test livelock of QTimer is now expected to work
Make sure mapSelectionFromSource does not return a selection with invalid ranges.
QEventDispatcherUnix: do not process too many timer if other events need to be processed first
Doc: Continued work on the QML documentation.
Doc: More work on the QML documentation.
Doc: More work on the declarative API documentation.
Doc: Some editing and tidying up.
Doc: Added a missing file.
Doc: Fixed text in license headers.
|
| | |
|
|/ |
|
| |
|
|
|
|
|
|
|
| |
Invisible areas cause redraw artifacts with OpenVg paint engine.
Task-number:
Reviewed-by: Martin Jones
|
| |
|
|\ |
|
| | |
|
|/ |
|
|
|
|
| |
Replace the usages of Follows with Behaviors, update docs.
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
|
| |
| |
| |
| |
| |
| | |
Forgot one occurrence of org.webkit :)
Reviewed-by: Trust me
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Fix examples
Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd
Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef
Update S60 stuff after renaming the webkit component.
Update qmlchanges from import org.webkit to QtWebKit
Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a
Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5
Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit
Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5
Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Fix examples
Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd
Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185
Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef
Update S60 stuff after renaming the webkit component.
Update qmlchanges from import org.webkit to QtWebKit
Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a
Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5
Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit
Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5
Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Import QtWebKit instead of org.webkit
Reviewed-by: Trust me
|
|/ / / |
|
|/ / |
|
|\ \ |
|
| |/ |
|
|/
|
|
|
|
|
| |
If I missed any, just set inAnotherDemo to true on the SameGame root
item.
Task-number: QTBUG-11562
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
By making selectionStart/End read-only, and adding adding select().
Task-number: QTBUG-11056
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel parentFolder property's file drive handling
Add license headers for .qml files.
Also show file/line numbers on XML query errors.
Print warnings for xml query syntax errors
Clean up
Add XmlListModel::get()
|
| |
| |
| |
| |
| |
| |
| | |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
|/
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
subdirectories to make it easier to locate examples for certain
features (e.g. animation) and to distinguish between different types
of examples (e.g. very basic examples vs complex demo-like examples).
|