| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
| |
examples from class docs and improve assorted docs
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Doc: Fixed an off-by-one error in an example.
Fix QT_NO_TEXTHTMLPARSER
Fix QT_NO_DOM
Fix QT_NO_TEXTSTREAM compilation errors.
Fix QT_NO_VALIDATOR compilation.
Doc: Removed a misleading sentence about a class constructor.
Doc: correcting docs in QDrag::exec
Doc: Adding note about QDrag::exec()
Revert behavior of QTextLayout::boundingRect() when line width is set
Fix unreasonably large width of QTextLayout::boundingRect()
Doc: replacing old image
Fix compilation with stricts compilers.
Fix QT_NO_DIRMODEL build error in QtDeclarative.
Revert "Added native key support to QSharedMemory API."
Revert "Improved documentation for QSharedMemory's key/setKey functions."
Fix a simple mistake in QXmlStreamReader::atEnd() docs.
Improved documentation for QSharedMemory's key/setKey functions.
Added native key support to QSharedMemory API.
Make test work with shadow builds again.
Doc: Corrected the documentation about the compression threshold.
...
|
| |
| |
| |
| |
| | |
Merge-request: 647
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|/ |
|
|\ |
|
| |
| |
| |
| | |
Task-number: QTBUG-10852
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Task-number: QTBUG-10797
Reviewed-by: Bea Lam
|
|
|
|
| |
Task-number: QTBUG-10797
|
| |
|
|
|
|
| |
Task-number: QTBUG-10761
|
| |
|
|
|
|
| |
Task-number: QTBUG-10816
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
doc/src/snippets/declarative/listview/highlight.qml
doc/src/snippets/declarative/listview/listview.qml
|
| |
| |
| |
| | |
Task-number: QTBUG-10755
|
|/ |
|
|
|
|
| |
Also rearrange the parameter order to be more clear.
|
|
|
|
|
|
|
| |
So that scope resolution is correct, e.g. "width: parent.width-10;" in
a ParentChange works correctly.
Task-number: QTBUG-10675
|
|
|
|
| |
returns undefined items for these cases anywyay.
|
|
|
|
|
|
| |
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).
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Qt.include() support in worker scripts
Only add "include" property in non-workerscript threads
Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89
Reduce the chance of AnchorAnimation animating geometry changes it
Add Qt.include() method for scoped inclusion of JavaScript files
Fix crash in ParentAnimation.
Revert "Fix crash in ParentAnimation."
Symbian build fix to declarative auto and benchmark tests
Revert "Use raster graphicssystem for qml.app on OS X."
Fix crash in ParentAnimation.
Minor declarative webview tweaks
Removed dependency of QDeclarativeWebView to private Qt (Declarative) API
Note that you need to unset a flag to create a visual item
Follow-up on Flickable changes.
ListModel::get() should return undefined if bad index specified
Add an example spinner.
Fix crash on remote content.
Dates and variants are not considered nested objects
|
| |
| |
| |
| | |
isn't responsible for.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
copyOriginals plays with the order of the revertList, which messes up
the assumptions of ParentAnimation. The full fix will require some
rearchitecting of how the states and transitions handle "related"
actions, but for now this fixes the crash.
Reverting to the base state has also been fixed.
Task-number: QTBUG-10671, QTBUG-10676
|
| |
| |
| |
| | |
This reverts commit 8f800ea5611be333ae15f932dfea50bc80852c03.
|
| |
| |
| |
| |
| |
| | |
When rolling-back a parent change, the actions are in reverse order.
Task-number: QTBUG-10671
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (159 commits)
Doc: Adding loading image to search textbox
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
...
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
tools/qdoc3/htmlgenerator.cpp
|
| | | |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10555
|
| | |
| | |
| | |
| | |
| | |
| | | |
enough.
Work around QTBUG-10622
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10586
Reviewed-by: leo
|
| | |
| | |
| | |
| | |
| | | |
Fix regression in bindinganimation visual test introduced in
129940723d9145a4380f7e44c06cbaa88ee4053b.
|
| | | |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10522
|
| |/
|/|
| |
| | |
Task-number: QTBUG-10528
|
| |
| |
| |
| |
| |
| |
| | |
When a state uses override, we may apply the same replacesignalhandler
on top of itself. Make sure we update ownership accordingly.
Task-number: QTBUG-10523
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
examples/declarative/dynamic/qml/PerspectiveItem.qml
|
| | |
| | |
| | |
| | |
| | | |
Task-number:
Reviewed-by: Warwick Allison
|
| | | |
|