| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QtQuickPlayground app contains a version of samegame which allow
the user to edit the code. By setting the ball size to 8, the app can
run out of memory. This leaves it in a pretty bad state. But apps
on Symbian shouldn't crash due to OOM and should allow some operation.
This change fixes the immediate OOM crashes in declarative, gui and
corelib. It shows warning dialogs which explain what has gone wrong and
leaves the app in a state that can be exited cleanly
from the Symbian task list.
Task-number: QT-5319
Reviewed-by: Shane Kearns
Reviewed-by: Gareth Stockwell
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
|
|
| |
And fix the file names/location, too
Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c
Reviewed-on: http://codereview.qt.nokia.com/3890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
ListView has wrong keyPressEvent behaviour when vertical
Ensure view is positioned correctly when orientation changes.
Fix regression in wigglytext.qml
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change re-adds the code removed in
8e9c28eaa4d7a3372b9a9a21a984701b62f96456 (which caused this regression),
while keeping the new code as well (to specially handle the case of
registration in componentCompleted()).
Change-Id: I707e3d2ead9ea25079f79cd5e5886d1dc1c69d1b
Task-number: QTBUG-18362
Reviewed-by: Aaron Kennedy
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure attributes added in QtQuick 1.1 are marked with the
'\since QtQuick 1.1' tag. Also add links to items listed in the
QtQuick 1.1 section in whatsnew.qdoc.
Task-number: QTBUG-17771
Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
|
|\ \
| |/
| |
| |
| |
| |
| | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Animations register to be started when the component is finalized,
but in the case of a binding, the registration doesn't happen until
we are already working with a copy of the finalization list. With this
patch, we no longer work with a copy, but with the actual list.
Change-Id: If460c250d2403590907e9ac854d277db68ba8b2a
Task-number: QTBUG-14042
Reviewed-by: Aaron Kennedy
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
The 'if' check for the value map was inverted. Spelling in warning
was fixed.
Task-number: QTBUG-13087
Reviewed-by: Bea Lam
|
|
|
|
|
|
|
|
|
| |
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
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Setting the parent of the returned item does not affect its object
ownership so care must be taken to ensure it is not garbage collected.
Task-number: QTBUG-16630
Reviewed-by: Aaron Kennedy
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
|
| | |
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Task-number: QTBUG-13719
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
now has an overview of different approaches to QML/C++ integration
and demonstrates how to pass data between QML and C++ through
properties/functions/signals. The part in the old docs that focused
on QDeclarativeContext has been merged into the QDeclarativeContext
class docs (although most of the info was largely covered in there
already) and the part that covered Network Components has been
moved to the QDeclarativeComponent class docs. The custom enum
types example previously in extending-tutorial.qdoc has been
moved to these new docs.
Task-number: QTBUG-14923
|
| |
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13170
Reviewed-by: Alan Alpert
|
|/ |
|
| |
|
|
|
|
| |
Reviewed-by: Lasse Holmstedt
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/elements.qdoc
|
| |
| |
| |
| | |
...and a set of functional group pages.
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/getting-started/demos.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
|
|/
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-11938
|
|
|
|
| |
Task-number: QTBUG-12447
|
|
|
|
|
|
| |
this page from other documentation.
Task-number: QTBUG-12446
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/extending.qdoc
|
| | |
|
| | |
|