diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-09-02 08:31:08 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-09-02 08:38:12 (GMT) |
| commit | 3cfd5a69976bbd98c14cfbf51879356e46cd76a8 (patch) | |
| tree | d6cc1f27f6249b746c9a4794d1c32e255804b0b0 | |
| parent | 138ee8a53aba5ea6abf3dd5ad08008d372141814 (diff) | |
| download | Qt-3cfd5a69976bbd98c14cfbf51879356e46cd76a8.zip Qt-3cfd5a69976bbd98c14cfbf51879356e46cd76a8.tar.gz Qt-3cfd5a69976bbd98c14cfbf51879356e46cd76a8.tar.bz2 | |
Compilation on S60 of external projects depending on private headers
Minor change to allow external projects to include qdeclarativeanimation_p_p.h
and still compile on Symbian. The inlined constructor with a templated
object that contains a call to an non-exported function (execute())
caused a linker error.
Reviewed-by: bnilsen
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation_p_p.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 267642d..ed8343b 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -2939,4 +2939,8 @@ void QDeclarativeAnchorAnimation::transition(QDeclarativeStateActions &actions, } } +QDeclarativeScriptActionPrivate::QDeclarativeScriptActionPrivate() + : QDeclarativeAbstractAnimationPrivate(), hasRunScriptScript(false), reversing(false), proxy(this), rsa(0) {} + + QT_END_NAMESPACE diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index e38580c..26c04d4 100644 --- a/src/declarative/util/qdeclarativeanimation_p_p.h +++ b/src/declarative/util/qdeclarativeanimation_p_p.h @@ -247,8 +247,7 @@ class QDeclarativeScriptActionPrivate : public QDeclarativeAbstractAnimationPriv { Q_DECLARE_PUBLIC(QDeclarativeScriptAction) public: - QDeclarativeScriptActionPrivate() - : QDeclarativeAbstractAnimationPrivate(), hasRunScriptScript(false), reversing(false), proxy(this), rsa(0) {} + QDeclarativeScriptActionPrivate(); void init(); |