diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 14:10:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 14:10:25 (GMT) |
| commit | aa36b6701c11a5bb0bae6de9df570a6c530bcead (patch) | |
| tree | 2879ec5e06b5b5ef17029bffb7f2d82f253e5290 /src/declarative/graphicsitems/qdeclarativegridview_p.h | |
| parent | dbfc08cf8de75439f78f2b10a6b487ff23735f69 (diff) | |
| parent | fbe0d24bdd429248dbf9e9be592f15fd7b1648bc (diff) | |
| download | Qt-aa36b6701c11a5bb0bae6de9df570a6c530bcead.zip Qt-aa36b6701c11a5bb0bae6de9df570a6c530bcead.tar.gz Qt-aa36b6701c11a5bb0bae6de9df570a6c530bcead.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h index d2dff48..078d033 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview_p.h +++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h @@ -75,7 +75,6 @@ class Q_AUTOTEST_EXPORT QDeclarativeGridView : public QDeclarativeFlickable Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged) Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged REVISION 1) - Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged REVISION 1) Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled NOTIFY keyNavigationWrapsChanged) Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged) Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellWidthChanged) @@ -194,7 +193,6 @@ Q_SIGNALS: void delegateChanged(); void flowChanged(); Q_REVISION(1) void layoutDirectionChanged(); - Q_REVISION(1) void effectiveLayoutDirectionChanged(); void keyNavigationWrapsChanged(); void cacheBufferChanged(); void snapModeChanged(); |