diff options
Diffstat (limited to 'src/declarative/util')
22 files changed, 80 insertions, 59 deletions
diff --git a/src/declarative/util/qbindablemap.h b/src/declarative/util/qbindablemap.h index d617867..c76928d 100644 --- a/src/declarative/util/qbindablemap.h +++ b/src/declarative/util/qbindablemap.h @@ -42,11 +42,11 @@ #ifndef QBINDABLEMAP_H #define QBINDABLEMAP_H -#include <qfxglobal.h> -#include <QObject> -#include <QHash> -#include <QStringList> -#include <QVariant> +#include <QtDeclarative/qfxglobal.h> +#include <QtCore/QObject> +#include <QtCore/QHash> +#include <QtCore/QStringList> +#include <QtCore/QVariant> QT_BEGIN_HEADER diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h index 887351d..6ba9409 100644 --- a/src/declarative/util/qfxglobal.h +++ b/src/declarative/util/qfxglobal.h @@ -42,8 +42,8 @@ #ifndef QFXGLOBAL_H #define QFXGLOBAL_H -#include <qglobal.h> -#include <QObject> +#include <QtCore/qglobal.h> +#include <QtCore/QObject> QT_BEGIN_HEADER diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h index 8dd9e2c..05bf005 100644 --- a/src/declarative/util/qfxview.h +++ b/src/declarative/util/qfxview.h @@ -42,11 +42,11 @@ #ifndef QFXVIEW_H #define QFXVIEW_H -#include <qfxglobal.h> #include <QtCore/qdatetime.h> #include <QtGui/qgraphicssceneevent.h> #include <QtGui/qwidget.h> -#include <qsimplecanvas.h> +#include <QtDeclarative/qfxglobal.h> +#include <QtDeclarative/qsimplecanvas.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h index 578631c..8bd53e2 100644 --- a/src/declarative/util/qmlanimation.h +++ b/src/declarative/util/qmlanimation.h @@ -43,12 +43,12 @@ #define QMLANIMATION_H #include <QtCore/qvariant.h> +#include <QtCore/QAbstractAnimation> #include <QtGui/qcolor.h> -#include <qmltransition.h> -#include <qmlpropertyvaluesource.h> -#include <qmlstate.h> -#include <qml.h> -#include <QAbstractAnimation> +#include <QtDeclarative/qmltransition.h> +#include <QtDeclarative/qmlpropertyvaluesource.h> +#include <QtDeclarative/qmlstate.h> +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index 00937a6..36b826f 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -44,15 +44,15 @@ #include <private/qobject_p.h> #include <private/qmlnullablevalue_p.h> -#include <qmlanimation.h> -#include <qml.h> -#include <qmlcontext.h> #include <private/qvariantanimation_p.h> -#include <QPauseAnimation> -#include <QVariantAnimation> -#include <QAnimationGroup> -#include <QColor> -#include <qmltimelinevalueproxy.h> +#include <QtCore/QPauseAnimation> +#include <QtCore/QVariantAnimation> +#include <QtCore/QAnimationGroup> +#include <QtGui/QColor> +#include <QtDeclarative/qmlanimation.h> +#include <QtDeclarative/qml.h> +#include <QtDeclarative/qmlcontext.h> +#include <QtDeclarative/qmltimelinevalueproxy.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/util/qmlbehaviour.h index 3d25cd8..7a54d63 100644 --- a/src/declarative/util/qmlbehaviour.h +++ b/src/declarative/util/qmlbehaviour.h @@ -42,9 +42,9 @@ #ifndef QMLBEHAVIOUR_H #define QMLBEHAVIOUR_H -#include <qmlpropertyvaluesource.h> -#include <qml.h> -#include <qmlstate.h> +#include <QtDeclarative/qmlpropertyvaluesource.h> +#include <QtDeclarative/qml.h> +#include <QtDeclarative/qmlstate.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h index 355edfd..5576957 100644 --- a/src/declarative/util/qmlbind.h +++ b/src/declarative/util/qmlbind.h @@ -42,9 +42,9 @@ #ifndef QMLBIND_H #define QMLBIND_H -#include <qfxglobal.h> +#include <QtDeclarative/qfxglobal.h> #include <QtCore/qobject.h> -#include "qml.h" +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h index bd9363a..fa0bff8 100644 --- a/src/declarative/util/qmlfollow.h +++ b/src/declarative/util/qmlfollow.h @@ -42,8 +42,8 @@ #ifndef QMLFOLLOW_H #define QMLFOLLOW_H -#include <qmlpropertyvaluesource.h> -#include <qml.h> +#include <QtDeclarative/qmlpropertyvaluesource.h> +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlfont.h b/src/declarative/util/qmlfont.h index b6bce7c..3a21c34 100644 --- a/src/declarative/util/qmlfont.h +++ b/src/declarative/util/qmlfont.h @@ -43,7 +43,7 @@ #define QMLFONT_H #include <QtCore/qobject.h> -#include <qml.h> +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmllistaccessor.h b/src/declarative/util/qmllistaccessor.h index 29f910d..dd766b2 100644 --- a/src/declarative/util/qmllistaccessor.h +++ b/src/declarative/util/qmllistaccessor.h @@ -42,7 +42,7 @@ #ifndef QMLLISTACCESSOR_H #define QMLLISTACCESSOR_H -#include <QVariant> +#include <QtCore/QVariant> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmllistmodel.h b/src/declarative/util/qmllistmodel.h index 36aa009..ddf1e13 100644 --- a/src/declarative/util/qmllistmodel.h +++ b/src/declarative/util/qmllistmodel.h @@ -42,14 +42,14 @@ #ifndef QMLLISTMODEL_H #define QMLLISTMODEL_H -#include <QObject> -#include <qfxglobal.h> -#include <QStringList> -#include <QHash> -#include <QList> -#include <QVariant> -#include <qml.h> -#include <qlistmodelinterface.h> +#include <QtCore/QObject> +#include <QtCore/QStringList> +#include <QtCore/QHash> +#include <QtCore/QList> +#include <QtCore/QVariant> +#include <QtDeclarative/qfxglobal.h> +#include <QtDeclarative/qml.h> +#include <QtDeclarative/qlistmodelinterface.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlopenmetaobject.h b/src/declarative/util/qmlopenmetaobject.h index f842f96..239276d 100644 --- a/src/declarative/util/qmlopenmetaobject.h +++ b/src/declarative/util/qmlopenmetaobject.h @@ -42,9 +42,9 @@ #ifndef QMLOPENMETAOBJECT_H #define QMLOPENMETAOBJECT_H -#include <QMetaObject> +#include <QtCore/QMetaObject> #include <QtCore/private/qobject_p.h> -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h index 6652b98..3861890 100644 --- a/src/declarative/util/qmlpackage.h +++ b/src/declarative/util/qmlpackage.h @@ -42,7 +42,7 @@ #ifndef QMLPACKAGE_H #define QMLPACKAGE_H -#include <qml.h> +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h index 8047a88..b739fd7 100644 --- a/src/declarative/util/qmlscript.h +++ b/src/declarative/util/qmlscript.h @@ -42,9 +42,9 @@ #ifndef QMLSCRIPT_H #define QMLSCRIPT_H -#include <qfxglobal.h> +#include <QtDeclarative/qfxglobal.h> #include <QtCore/qobject.h> -#include "qml.h" +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index 34d3b00..c986864 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -113,13 +113,15 @@ class QmlSetPropertiesPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QmlSetProperties) public: - QmlSetPropertiesPrivate() : object(0), decoded(true) {} + QmlSetPropertiesPrivate() : object(0), decoded(true), restore(true) {} QObject *object; QByteArray data; bool decoded; void decode(); + bool restore; + QList<QPair<QByteArray, QVariant> > properties; QList<QPair<QByteArray, QmlExpression *> > expressions; @@ -264,6 +266,18 @@ void QmlSetProperties::setObject(QObject *o) d->object = o; } +bool QmlSetProperties::restoreEntryValues() const +{ + Q_D(const QmlSetProperties); + return d->restore; +} + +void QmlSetProperties::setRestoreEntryValues(bool v) +{ + Q_D(QmlSetProperties); + d->restore = v; +} + QmlMetaProperty QmlSetPropertiesPrivate::property(const QByteArray &property) { @@ -314,6 +328,7 @@ QmlSetProperties::ActionList QmlSetProperties::actions() if (prop.isValid()) { Action a; + a.restore = restoreEntryValues(); a.property = prop; a.fromValue = a.property.read(); a.toValue = d->properties.at(ii).second; @@ -329,6 +344,7 @@ QmlSetProperties::ActionList QmlSetProperties::actions() if (prop.isValid()) { Action a; + a.restore = restoreEntryValues(); a.property = prop; a.fromValue = a.property.read(); a.toValue = d->expressions.at(ii).second->value(); diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h index bd036c1..24ad99a 100644 --- a/src/declarative/util/qmlsetproperties.h +++ b/src/declarative/util/qmlsetproperties.h @@ -42,7 +42,7 @@ #ifndef QMLSETPROPERTIES_H #define QMLSETPROPERTIES_H -#include <qmlstateoperations.h> +#include <QtDeclarative/qmlstateoperations.h> QT_BEGIN_HEADER @@ -58,6 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlSetProperties : public QmlStateOperation Q_DECLARE_PRIVATE(QmlSetProperties); Q_PROPERTY(QObject *target READ object WRITE setObject); + Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues); public: QmlSetProperties(); ~QmlSetProperties(); @@ -65,6 +66,9 @@ public: QObject *object() const; void setObject(QObject *); + bool restoreEntryValues() const; + void setRestoreEntryValues(bool); + virtual ActionList actions(); }; QML_DECLARE_TYPE(QmlSetProperties); diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 194cc1b..6261003 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG); -Action::Action() : bv(0), event(0), actionDone(false) +Action::Action() : restore(true), bv(0), event(0), actionDone(false) { } @@ -344,7 +344,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever for (int ii = 0; ii < applyList.count(); ++ii) { const Action &action = applyList.at(ii); - if (action.event) + if (action.event || !action.restore) continue; bool found = false; diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h index 68c43fa..aa8871f 100644 --- a/src/declarative/util/qmlstate.h +++ b/src/declarative/util/qmlstate.h @@ -43,9 +43,9 @@ #define QMLSTATE_H #include <QtCore/qobject.h> -#include <qfxglobal.h> -#include <qml.h> -#include <QSequentialAnimationGroup> +#include <QtCore/QSequentialAnimationGroup> +#include <QtDeclarative/qfxglobal.h> +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER @@ -61,6 +61,7 @@ public: Action(); QmlMetaProperty property; + bool restore; QVariant fromValue; QVariant toValue; QString fromBinding; diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h index 28e1781..a2f18eb 100644 --- a/src/declarative/util/qmlstate_p.h +++ b/src/declarative/util/qmlstate_p.h @@ -42,9 +42,9 @@ #ifndef QMLSTATE_P_H #define QMLSTATE_P_H -#include <qmlstate.h> -#include "private/qobject_p.h" -#include "private/qmlanimation_p.h" +#include <QtDeclarative/qmlstate.h> +#include <private/qobject_p.h> +#include <private/qmlanimation_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h index 55b84eb..cca1015 100644 --- a/src/declarative/util/qmlstategroup.h +++ b/src/declarative/util/qmlstategroup.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEGROUP_H #define QMLSTATEGROUP_H -#include <qmlstate.h> +#include <QtDeclarative/qmlstate.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h index 8ecdcd2..720c639 100644 --- a/src/declarative/util/qmlstateoperations.h +++ b/src/declarative/util/qmlstateoperations.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEOPERATIONS_H #define QMLSTATEOPERATIONS_H -#include <qmlstate.h> +#include <QtDeclarative/qmlstate.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h index 0b7ea14..646746e 100644 --- a/src/declarative/util/qmltransition.h +++ b/src/declarative/util/qmltransition.h @@ -43,9 +43,9 @@ #define QMLTRANSITION_H #include <QtCore/qobject.h> -#include <qfxglobal.h> -#include <qmlstate.h> -#include <qml.h> +#include <QtDeclarative/qfxglobal.h> +#include <QtDeclarative/qmlstate.h> +#include <QtDeclarative/qml.h> QT_BEGIN_HEADER |