| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Replace Nokia contact email address with Qt Project website.
Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| | |
| |
| |
| |
| | |
Change-Id: I8796086097b5464dbe16a92df055e5a153971f21
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/quick/util/qdeclarativetimer.cpp
tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
Change-Id: I981b0d01c71035f6611682e742f4330d0ef7891b
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Set the running property to false before calling the triggered handler
when a timer finishes so it does not appear to still be running and
can be restarted by setting the running property to true.
Task-number: QTBUG-22004
Change-Id: I840efa30f5b7ad7d0cda96803d4898be3f390705
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
| | |
| |
| |
| |
| | |
Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Note that this removes the reference counting, as in
practice we seem to always have a single clear owner
for each animation. This isn't completely the case
for Smoothed, Spring, and Path animations, which also
keep previous animations cached, so we will need to
specially handle that case.
Change-Id: Ie7eb6642ae1ecdee31602cd8d49d1ad703ac102a
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
src/declarative/declarative.pro
src/declarative/items/qquickanimation_p.h
src/declarative/items/qquickcanvas.cpp
src/declarative/items/qquickcanvas_p.h
src/declarative/particles/qquickparticlesystem.cpp
src/declarative/particles/qquickparticlesystem_p.h
src/declarative/scenegraph/qsgcontext.cpp
src/declarative/scenegraph/qsgcontext_p.h
src/declarative/util/qdeclarativeanimation_p.h
src/declarative/util/qdeclarativebehavior_p.h
src/declarative/util/qdeclarativesmoothedanimation_p.h
src/declarative/util/qdeclarativespringanimation_p.h
src/declarative/util/qdeclarativetimer_p.h
src/declarative/util/util.pri
tests/auto/declarative/nodes/nodes.pro
tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
Change-Id: Ia406128ed943866fc296c7810c3aab94f00e906d
|
|
|
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.
99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.
The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.
All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.
A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.
The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)
There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.
In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.
Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
