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/v8/qv8engine_p.h | |
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/v8/qv8engine_p.h')
-rw-r--r-- | src/declarative/qml/v8/qv8engine_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index 7b85cfcc31..acf7ec816a 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -139,7 +139,7 @@ public: ValueTypeType, XMLHttpRequestType, DOMNodeType, SQLDatabaseType, ListModelType, Context2DType, Context2DStyleType, Context2DPixelArrayType, ParticleDataType, SignalHandlerType, IncubatorType, VisualDataItemType, - SequenceType }; + SequenceType, LocaleDataType }; virtual ResourceType resourceType() const = 0; QV8Engine *engine; @@ -412,6 +412,9 @@ public: QObject *qtObjectFromJS(v8::Handle<v8::Value> value); QSet<int> visitedConversionObjects; + + static QDateTime qtDateTimeFromJsDate(double jsDate); + protected: QJSEngine* q; QDeclarativeEngine *m_engine; @@ -449,7 +452,6 @@ protected: void initializeGlobal(v8::Handle<v8::Object>); double qtDateTimeToJsDate(const QDateTime &dt); - QDateTime qtDateTimeFromJsDate(double jsDate); private: typedef QScriptIntrusiveList<QJSValuePrivate, &QJSValuePrivate::m_node> ValueList; |