| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/qtbinding.qdoc
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
| | | |
|
| |/
|/| |
|
|/
|
|
|
|
|
| |
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:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fix does not work for enums declared outside of the class that
emits the signal, since in this case it is not possible to access
the metaobject of the class that declared the enum. However the
fix makes a special case for the Qt namespace to allow enums in this
namespace to be used.
Task-number: QTBUG-15983
Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b
Reviewed-by: Aaron Kennedy
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/propertybinding.qdoc
doc/src/overviews.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeview.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-16071
|
| |\ \ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Tidy up that section a little, while I'm at it.
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In the context of QML, they are not officially supported as public API
unless otherwise documented in QDeclarativeItem. This commit mentions
that somewhere.
Task-number: QTBUG-15797
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
|/| |
|
|/ |
|
|
|
|
|
|
|
|
| |
The 'Writing QML Components' is mainly a restructuring of the
'Extending types from QML' page. It also documents the signal
connect() function that was previously undocumented.
Task-number: QTBUG-15718, QTBUG-15138
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
Doc: Documented that border width does not affect rectangle geometry.
Doc: Minor fixes to style.
Doc: Updated the DirectFB documentation to reflect version changes.
Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt Quick
Doc: Correcting references to Qt Declarative module.
doc: Stated that the destructor does not call close().
|
| | |
|
|/
|
|
| |
Task-number: QTBUG-15456
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|/
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
| |
|
| |
|
|
|
|
| |
and work standalone
|
| |
|
| |
|
| |
|
|
|
|
| |
QDeclarativeXXX.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Replace QmlList* and QList* support with a single QmlListProperty type
Rename MouseRegion -> MouseArea
Update QmlChanges with animation API changes.
Document the default velocity of EaseFollow
Remove use of unexprted private classes.
Fix compile error on Solaris
Increase durations when testing Behaviors.
Add cached path rounded rect painting benchmark.
Remove use of direct event posting. Use QTest::keyClick() for keys.
|
| | |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
|/ |
|
| |
|
| |
|