diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-11-10 18:33:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-22 03:32:21 +0100 |
| commit | 88fefbc68ddcbe99e718a07c5f25e5d28c839439 (patch) | |
| tree | 84d422addf8589b1412dee3abed5ba7f08e832eb /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | d2c1adc6f9afc4dd1bab3c487bbde70f3b8f2e81 (diff) | |
Qt.locale() and JS locale type extension.
Task-number: QTBUG-17129
Change-Id: I69cbbe858735b750b4e37ce489f2fa1ad5d8b5d3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 1323669fc7..ef638b4e44 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -85,6 +85,7 @@ #include <private/qdeclarativeutilmodule_p.h> #include <private/qquickitemsmodule_p.h> #include <private/qquickparticlesmodule_p.h> +#include <private/qdeclarativelocale_p.h> #ifdef Q_OS_WIN // for %APPDATA% #include <qt_windows.h> @@ -174,6 +175,7 @@ void QDeclarativeEnginePrivate::defineModule() { registerBaseTypes("QtQuick", 2, 0); qmlRegisterType<QDeclarativeBinding>(); + qmlRegisterUncreatableType<QDeclarativeLocale>("QtQuick",2,0,"Locale",QDeclarativeEngine::tr("Locale cannot be instantiated. Use Qt.locale()")); } /*! |