diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:49:33 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:49:33 (GMT) |
| commit | dd6262e2c4e977f7a02cd8bdc740a08adb0cad49 (patch) | |
| tree | da20cf9a2031e041254b2325d6af204a0ad3aa9a /src/declarative | |
| parent | e745245bd86333b0512f50728b80c4610a081a44 (diff) | |
| parent | 7d2bf2c6e3aa23d52ef7305915c6f8db02a5d08f (diff) | |
| download | Qt-dd6262e2c4e977f7a02cd8bdc740a08adb0cad49.zip Qt-dd6262e2c4e977f7a02cd8bdc740a08adb0cad49.tar.gz Qt-dd6262e2c4e977f7a02cd8bdc740a08adb0cad49.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsflipable.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/qml.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp index 7719469..b964e22 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp @@ -97,8 +97,9 @@ public: } MouseRegion { - anchors.fill: parent + // change between default and 'back' states onClicked: flipable.state = (flipable.state == 'back' ? '' : 'back') + anchors.fill: parent } } \endqml diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 2c03aad..323525b 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE #define QML_DEFINE_INTERFACE(INTERFACE) \ static int defineInterface##INTERFACE = qmlRegisterInterface<INTERFACE>(#INTERFACE); -#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERS, NAME, TYPE, EXTENSION) \ +#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \ static int registerExtended##TYPE = qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE); #define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \ |