| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 730
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | |
|
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDeclarativePropertyPrivate::setBinding would delete the binding if
it cannot set the property. Then the call to binding->update() would
crash. So test for (property.isProperty()) before.
Also this will display a warning in the application output if the
property cannot be changed.
Reviewed-by: Lasse Holmstedt
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
invalid timers).
Authored-by: Daniel Molkentin
Reviewed-by: Marco Bubke
|
| |\ |
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (34 commits)
Fix TextInput echoMode autotest on Linux
Reuse QML lexer to simplify .pragma script logic
Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents
Remove QDeclarativeItem::childrenChanged() signal overload
Update QtGui and QtDeclarative def files
Make rootContext and engine pointers in QDeclarativeView API const
Add additional QVariant benchmarks.
Allow MouseArea dragging to filter mouse events from descendants
Expand QDeclarativeExtensionPlugin docs
Add missing snippet files
Expand QtObject doc
Indicate default values
Use snippets instead to avoid quoting license headers
Rename remaining 'wantsFocus'.
Bounding rect of text was not always calculated correctly.
Add QML tutorials to the tutorials page
QML focus API updates.
Do not show copyright header in documentation.
Ensure redirects (and indeed all reply process) is done in the right thread.
Only ignore the same target value for a Behavior when it is running.
...
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-11512
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
While it is difficult to predict the future, the hope is that this might
give us a little more flexibility when it comes to fixing bugs etc. in
patch releases.
|
| | |_|/
| |/| | |
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
having different contents
Task-number: QTBUG-12339
Reviewed-by: Martin Jones
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Broke signal handlers in QML
Task-number: QTBUG-12335
Reviewed-by: Aaron Kennedy
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-12322
Reviewed-by: Aaron Kennedy
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This allows dragging a MouseArea that contains a clickable MouseArea,
for example.
Task-number: QTBUG-12323
Reviewed-by: Michael Brasser
|
| |/ / / |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The boundingRect depended upon the image cache which may not become
valid until after boundingRect is called.
Task-number: QTBUG-12291
Reviewed-by: Michael Brasser
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.
Reviewed-by: Aaron Kennedy
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Otherwise a Behavior may mistakenly not be triggered. This situation
can arise when the property in question has been manipulated via the
property system, followed by a direct function call (which correctly
bypasses the Behavior), followed by a another change via the property
system.
Task-number: QTBUG-12295
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
... and percentage is useless.
Task-number: QTBUG-12282
Reviewed-by: Warwick Allison
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
height explicit
Task-number: QTBUG-12273
Reviewed-by: Michael Brasser
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
i.e. the thread with the QNAM the original reply was created in.
Task-number: QTBUG-12302
Reviewed-by: Aaron Kennedy
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Seems some platforms don't have it.
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We need to create our cached image in boundingRect() if it doesn't
already exist, to prevents painting errors.
Reviewed-by: Warwick Allison
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow essentially unbounded dragging once drag.target is set. The previous
default of contraining the dragging to 0,0 (i.e. no drag) was unintuitive
for learners. It's rare that unbounded is actually what you want, but it
makes it much easier to get started with the element.
Task-number: QTBUG-11184
Reviewed-by: Martin Jones
|
| | | | | |
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Using this property on Item will break transformOrigin property. We
have never documented it. It should not have been used. Now it is
enforced as best we can.
Task-number: QTBUG-12265
Reviewed-by: Aaron Kennedy
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
transformOriginPoint is undocumented for a reason. It shouldn't be used
by Item. Added some docs to assist find the right way, i.e. Scale and
Rotation elements.
Task-number: QTBUG-12265
|
| |\ \ \ |
|
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Text in QML is always painted into a pixmap, and with sub-pixel
antialiasing enabled this produced incorrect results. This patch is a
temporary fix until QTBUG-12252 and/or QTBUG-7747 can be properly
addressed in a patch release. In the worst case, if using QML and
QPainters are being constructed in a non-GUI thread, this patch could
potentially turn off sub-pixel antialiasing for them.
Task-number: QTBUG-11002
Reviewed-by: Aaron Kennedy
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
Also parent them back to the VIM to ensure correct destruction.
Task-number: QTBUG-12261
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QDeclarativeVisualDataModel::stringValue() did not handle
QList<QObject*> model types.
Task-number: QTBUG-12005
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
CanvasFrameRate
This silents a lot of warnings in creator.
Reviewed-by: Aaron Kennedy
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix RightBearing confusion in text layout
fixes, improvements for various docs and example code
Fixed debugger's evaluation of dynamic properties in context
Allow test to pass on smaller screens (eg. 480 high).
Minor animation doc improvement
|