| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added more DITA output to the XML generator
Usefully convert from QtScript object/array to QVariant
document QSslSocket::systemCaCertificates() change in changelog
Implement QIODevice::peek() using read() + ungetBlock().
Allocate the memory for QtFontSize when count > 1
doc: Added more DITA output to the XML generator
Defer allocation of GIF decoding tables/stack.
Make sure only started gestures can cause cancellations
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
Fix some kind of race condition while using remote commands.
Work around ICE in Intel C++ Compiler 11.1.072
Reduce the memory consumption of QtFontStyle
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For arrays, the conversion would crash if the array was cyclic.
Introduce a set that keeps track of which objects are being
converted, and return an empty list when a cycle is detected.
For other types of objects, the object was previously attempted
to be converted to a primitive, which typically meant you would
get the string representation ("[object Object]"), since most
(practically all) objects can be converted to a string -- not
useful at all.
Change the conversion so it converts the object to a QVariantMap
instead. This was already done for slots that took a QVariantMap
as argument, but only one level deep. Make the conversion recursive,
using the same mechanism as for arrays to detect cycles.
This change also means that you get a meaningful
JS object => QVariant => JS object roundtrip.
It also aligns the behavior with the Qt WebKit bridge.
Update the documentation to describe the new behavior.
The 4.7 changelog will also be updated under "important behavioral
changes".
This change exposed an issue with one of the QML autotests: A JS
object was assigned to a QVariant property, which caused it to be
converted to a string (rather than a QVariantMap) -- just shows
that the previous behavior was unintuitive). Later, this variant
property is compared to another object, the intention being to
compare the _properties_ of the two objects; but because the variant
property contained a string, this would cause the other operand
(object) to be converted to a string as well ("[object Object]"),
causing a meaningless test pass.
Change the test to deserialize both objects using JSON.stringify,
and compare the resulting strings, so that actual
JS object => QVariant(Map) => JS object roundtrip is tested (the
intention).
Task-number: QTBUG-3511
Reviewed-by: Olivier Goffart
|
| | |
|
| |
| |
| |
| | |
Found some minor demo issues while testing a TextInput change.
|
|/
|
|
|
|
|
|
|
|
|
| |
The scrolling should not be calculated inside the paint event, this
leads to some incorrect behaviour. It is now calculated separately when
needed.
Patch actually written by Alexis, and I reviewed it.
Task-number: QTBUG-11127
Reviewed-by: Alexis Ménard
|
|
|
|
|
|
| |
This also optimizes the implementation.
Task-number: QTBUG-11383
|
|
|
|
| |
QTRY_COMPARE for some tests.
|
|
|
|
| |
Attempted to make window size smaller than Windows minimum.
|
|\ |
|
| | |
|
|/ |
|
|\ |
|
| |
| |
| |
| | |
other minor doc fixes
|
|/
|
|
|
|
| |
ListView.StrictlyEnforceRange
Task-number: QTBUG-11328
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-10251 and QTBUG-11156
Reviewed-by: Martin Jones
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
|/
|
|
| |
Task-number: QTBUG-11283
|
|
|
|
|
|
|
| |
This allows you to, for example, bind to a Text's font.pixelSize, even
if one was never explicitly set.
Task-number: QTBUG-11111
|
|
|
|
|
|
|
| |
TextInput has lost focus
Task-number:
Reviewed-by: Warwick Allison
|
|
|
|
|
|
| |
when returning to that state.
Task-number: QTBUG-11228
|
| |
|
|
|
|
|
|
| |
additional PortraitInverted and LandscapeInverted values. TopUp etc.
only indicates rotation which makes it difficult to resize the window
according to whether the device is in Portrait or Landscape orientation.
|
|
|
|
|
| |
Task-number: QTBUG-11157
Reviewed-by: Warwick Allison
|
|
|
|
|
|
| |
Also document them for both ListView and GridView
Task-number: QTBUG-11191
|
|
|
|
|
|
|
|
| |
instead of Portrait/Landscape. The new orientations are named the same
as the orientations in the QtMobility sensors module.
Task-number: QTBUG-11106
Reviewed-by: akennedy
|
|
|
|
|
| |
Task-number:
Reviewed-by: Warwick Allison
|
| |
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-11127
Task-number: QTBUG-11054
|
|/
|
|
|
|
|
|
| |
The view position is reset to 0 after clear()ing, but this results
in refill() being called, effectively undoing the clear(). Fix is to make
the model invalid before resetting position.
Task-number: QTBUG-11105
|
|
|
|
|
|
| |
By making selectionStart/End read-only, and adding adding select().
Task-number: QTBUG-11056
|
|
|
|
|
|
|
|
| |
Sufficient to allow different selection look and feel (see whacky example)
Task-number: QTBUG-10968
Reviewed-by: Michael Brasser
Reviewed-by: Alan Alpert
|
|
|
|
|
| |
Task-number:
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve QML framerate debugging
If a pathview delegate changes size, reposition center on path
Remove deprecated Flickable::overshoot property.
Don't display unnecessary copyright headers in doc
|
| |
| |
| |
| | |
Task-number: QTBUG-11006
|
|\ \
| |/
| |
| |
| | |
Conflicts:
doc/src/declarative/advtutorial.qdoc
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
panel has been closed
Task-number:
Reviewed-by: Martin Jones
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-10999
Reviewed-by: Michael Brasser
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
TextEdit elements
Task-number: QTBUG-10841
Reviewed-by: Warwick Allison
|
| |/ |
|
|/
|
|
| |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|
|
|
| |
This reverts commit 2b3e7706f4459569520c77b9fb3ff2bc006e60f1.
|
|
|
|
| |
QTBUG-10659
|
| |
|
|
|
|
|
|
| |
Also augmented the docs for both functions a little.
Task-number: QTBUG-10926
|
|\ |
|