| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (182 commits)
Fixes XPASS
Revert part of commit 7c1ab9b6a8
Fixed wrong casing of a Symbian library.
Fixed wrong static library extension on Symbian.
Fixed library casing.
Remove dependencies to pre-Symbian3 platforms from Symbian3 packages
My changes 4.7.2
Don't accept input methods when a TextEdit or TextInput is read only.
Correct error message
On windows xp using a higher port makes the declarativedebug* tests work
Correct assert
Fix qt.sis platform dependencies for Symbian^3 builds.
Fix few QFileDialog static method issues in Symbian^3
Update QDeclarative DEF files for Symbian
Export QDeclarativeRefCount so that symbian compiles.
Make Flickable's wheel handling more like QAbstractScrollArea.
Changing header or footer failed to delete the previous.
Avoid index-out-of bounds related crash in Grid
Move Qt.application docs into Qt global object page
Add initial size to ListView in FolderListModel example
...
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
It was not properly merged in master because of conflicts, and
we have now a public API for this
Added QEXPECT_FAIL and opened QTBUG-17325
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/samegame/SamegameCore/samegame.js
mkspecs/features/symbian/default_post.prf
src/declarative/qml/qdeclarativeengine.cpp
src/gui/text/qtextdocumentlayout.cpp
src/plugins/plugins.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/s60installs.pro
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
tests/auto/declarative/qmlvisual/qmlvisual.pro
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (172 commits)
Don't accept input methods when a TextEdit or TextInput is read only.
Correct error message
On windows xp using a higher port makes the declarativedebug* tests work
Correct assert
Update QDeclarative DEF files for Symbian
Export QDeclarativeRefCount so that symbian compiles.
Make Flickable's wheel handling more like QAbstractScrollArea.
Changing header or footer failed to delete the previous.
Avoid index-out-of bounds related crash in Grid
Move Qt.application docs into Qt global object page
Add initial size to ListView in FolderListModel example
update What's New for QtQuick 1.1 and AnimatedImage docs
Improve docs on Item::visible and Item::opacity
Make sure we update Loader size if item size changes after creation.
Froze two more symbols and fixed compilation error (QtQuick11).
PinchArea sometimes failed.
Froze Symbian def files for QtQuick11.
Clarify that IntValidator performs locale specific validation.
Add a mouseSelectionMode property to TextEdit and TextInput.
Add missing versioning tests for new QtQuick 1.1 properties/methods.
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Neither would open a software input panel or allow text entry while
read only, but on Symbian at least the text input mode indicator was
still displayed giving the appearance of being able to enter text.
Task-number: QT-4497
Reviewed-by: Damian Jansen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
I know not why...
Reviewed-by: Aaron Kennedy
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Vertical scrolling should only affect vertical movement, and horizontal
scrolling should only affect horizontal movement.
Task-number: QTBUG-7369
Reviewed-by: Martin Jones
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (165 commits)
Changing header or footer failed to delete the previous.
Avoid index-out-of bounds related crash in Grid
Move Qt.application docs into Qt global object page
Add initial size to ListView in FolderListModel example
update What's New for QtQuick 1.1 and AnimatedImage docs
Improve docs on Item::visible and Item::opacity
Make sure we update Loader size if item size changes after creation.
Froze two more symbols and fixed compilation error (QtQuick11).
PinchArea sometimes failed.
Froze Symbian def files for QtQuick11.
Clarify that IntValidator performs locale specific validation.
Add a mouseSelectionMode property to TextEdit and TextInput.
Add missing versioning tests for new QtQuick 1.1 properties/methods.
Use qobject_cast rather than dynamic_cast.
expect fail for some PinchArea tests on mac
Allow functions to be passed in as values for grouped properties
Fix lineHeight autotests.
Update Docs, Examples and Demos for new CreateObject overloadable
Adding support for group properties in Component::CreateObject()
Update test, versioning is fixed so expect-fail no longer needed
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also ensure that the view is repositioned if the change of header
results in the view being out of bounds.
Task-number: QTBUG-16522
Reviewed-by: Michael Brasser
|
| | | | |\ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-17114
Reviewed-by: Bea Lam
|
| | | | |/
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-16959
Reviewed-by: Martin Jones
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Almost always failed on Mac and could fail on other systems due to
QDeclarativePinchEvent::m_accepted not being initialized.
Task-number: QTBUG-15491
Reviewed-by: Bea Lam
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Adds an option to do per word selection when selectByMouse is true.
Also changes the selection behavior so that the first word selected
remains selected when the direction of the selection changes which
is more consistent with other implementations including the existing
per word selection in QTextEdit.
Task-number: QTBUG-16283
Reviewed-by: Martin Jones
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-15489
Reviewed-by: Bea Lam
|
| | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits)
expect fail for some PinchArea tests on mac
Allow functions to be passed in as values for grouped properties
Fix lineHeight autotests.
Update Docs, Examples and Demos for new CreateObject overloadable
Adding support for group properties in Component::CreateObject()
Update test, versioning is fixed so expect-fail no longer needed
Test failure fixed - remove XFAIL
photoviewer needs QtQuick 1.1 for Image::cache
disable some pincharea tests on mac temporarily
Fix failing test on mac for Qt.application
Fix test breakage for qdeclarativeworkerscript
Fix typo in error message.
Doc fix for lineHeight.
Add support for line spacing in Text element.
Fixing right-to-left text in Text and TextInput
Fix MaximumLineCount in Text and add tests
Ensure simple objects also get the appropriate property cache
Add test for Loader implicitWidth/implicitHeight
Don't crash when appending a null item
Test for passing functions to createObject() for property bindings
...
|
| | | | | |\
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits)
expect fail for some PinchArea tests on mac
Allow functions to be passed in as values for grouped properties
Fix lineHeight autotests.
Update Docs, Examples and Demos for new CreateObject overloadable
Adding support for group properties in Component::CreateObject()
Update test, versioning is fixed so expect-fail no longer needed
Test failure fixed - remove XFAIL
photoviewer needs QtQuick 1.1 for Image::cache
disable some pincharea tests on mac temporarily
Fix failing test on mac for Qt.application
Fix test breakage for qdeclarativeworkerscript
Fix typo in error message.
Doc fix for lineHeight.
Add support for line spacing in Text element.
Fixing right-to-left text in Text and TextInput
Fix MaximumLineCount in Text and add tests
Ensure simple objects also get the appropriate property cache
Add test for Loader implicitWidth/implicitHeight
Don't crash when appending a null item
Test for passing functions to createObject() for property bindings
...
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Using QDeclarativeProperty::write() works for grouped properties but
stops functions values from being passed in, and using
QScriptValue::setProperty() on the object being created allows functions
to be passed in but doesn't work for grouped properties. This fix
walks down the tree for grouped properties to find the property that
should be set so that functions can be set for grouped property values.
Reviewed-by: Aaron Kennedy
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The QScriptValue overload for Component::CreateObject() should be able
to set group properties. This change also allows for property
binding from Javascript to continue to function.
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
setActiveWindow(0) on mac does not deactivate the current application.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This change adds the lineHeight and lineHeightMode properties.
Task-number: QTBUG-14296
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The Text and TextInput items should now automatically flip the
alignment of right-to-left text. Autotests also added to ensure the
text is on the correct side (added for TextInput also).
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixed MaximumLineCount not truncating when wrapMode was not set.
Visual autotests were added to test various possible options for
maximumLineCount.
Task-number: QTBUG-12305
Reviewed-by: Michael Brasser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-13849
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-16871
|
| | | | | | |\ |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-15279
Reviewed-by: Michael Brasser
|
| | | | | | |\ \
| | | | | | | |/ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In text, textEdit and textInput, the layout of the text should
automatically align to the right if the it is deemed to be
right-to-left text.
Task-number: QTBUG-15880
Reviewed-by: Bea Lam
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Previously components were loaded as soon as setSource() or
setSourceComponent() were called, even if the Loader component was not
complete. If a source component had been set, the itemChanged(),
statusChanged() etc. signals would be emitted before the Loader would
be complete and before the internal item had been sized. If a source
had been set via url, these signals were not emitted at all. It also
caused loaded() to be emitted twice for components set by
setSourceComponent().
Task-number: QTBUG-16319
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Properties can now be assigned a function that returns the binding
value.
Task-number: QTBUG-14964
Reviewed-by: Aaron Kennedy
|
| | | | | | | |\ |
|
| | | | | | | |\ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
|
| | | | | | | |_|/
| | | | | | |/| |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
If the created item does not have a valid width/height then our
implictWidth/Height should be the same as the items implict size.
Task-number: QTBUG-16928
Reviewed-by: Bea Lam
|
| | | | | | |/ /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-13451
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is a more natural ordering, and makes it trivial to control
different state groups with pressed and onClicked.
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Overridden as readonly for elements that have an inherent implicit size
such as Text, TextEdit, TextInput, positioners, Loader.
Task-number: QTBUG-14957
Reviewed-by: Michael Brasser
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is to keep consistent property naming consistent. E.g. Image
has 'smooth', 'mirror' properties rather than 'smoothed', 'mirrored'.
For consistency QDeclarativePixmap::Cached was renamed as well.
Reviewed-by: Martin Jones
|
| | | | | | |\ \ |
|
| | | | | | |\ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number:
Reviewed-by: Martin Jones
|
| | | | | | | | | | |
|