diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-06-01 01:37:05 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-06-01 01:37:05 (GMT) |
| commit | 06df53baf46ea7968b23f8b325990d047b5a67a5 (patch) | |
| tree | dd54bb1d6133987235bbf6e5d2ab5b7d514dfe09 /src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | |
| parent | ff93c3562f2b73abb69b1698f71fc9538ca5d999 (diff) | |
| parent | 283e899c7d57c003facc5ed8aef8e5dacf2eb945 (diff) | |
| download | Qt-06df53baf46ea7968b23f8b325990d047b5a67a5.zip Qt-06df53baf46ea7968b23f8b325990d047b5a67a5.tar.gz Qt-06df53baf46ea7968b23f8b325990d047b5a67a5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index 151a9e9..0be8dac 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -112,9 +112,11 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QDeclarativePathPercent>("Qt",4,7,"PathPercent"); qmlRegisterType<QDeclarativePathQuad>("Qt",4,7,"PathQuad"); qmlRegisterType<QDeclarativePathView>("Qt",4,7,"PathView"); +#ifndef QT_NO_VALIDATOR qmlRegisterType<QIntValidator>("Qt",4,7,"IntValidator"); qmlRegisterType<QDoubleValidator>("Qt",4,7,"DoubleValidator"); qmlRegisterType<QRegExpValidator>("Qt",4,7,"RegExpValidator"); +#endif qmlRegisterType<QDeclarativeRectangle>("Qt",4,7,"Rectangle"); qmlRegisterType<QDeclarativeRepeater>("Qt",4,7,"Repeater"); qmlRegisterType<QGraphicsRotation>("Qt",4,7,"Rotation"); @@ -138,7 +140,9 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QDeclarativePathElement>(); qmlRegisterType<QDeclarativeCurve>(); qmlRegisterType<QDeclarativeScaleGrid>(); +#ifndef QT_NO_VALIDATOR qmlRegisterType<QValidator>(); +#endif qmlRegisterType<QDeclarativeVisualModel>(); #ifndef QT_NO_ACTION qmlRegisterType<QAction>(); |