diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 13:21:59 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 13:24:53 (GMT) |
| commit | b4710dd7ddb2a78754cbe58e55070f71456fb09c (patch) | |
| tree | 9e937cd7c27c9780a4cd5edadef2655cf3d77f4d /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | 77474ad850b91e1de080d2f8fb9a60af2f89668f (diff) | |
| parent | 5c8017e0880cc5f71854ebb71a38b944e58260b1 (diff) | |
| download | Qt-b4710dd7ddb2a78754cbe58e55070f71456fb09c.zip Qt-b4710dd7ddb2a78754cbe58e55070f71456fb09c.tar.gz Qt-b4710dd7ddb2a78754cbe58e55070f71456fb09c.tar.bz2 | |
Fix QT_NO_TEXTDATE compilation errors.
Merge-request: 649
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 804476c..3269e98 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -302,10 +302,11 @@ public: static QScriptValue consoleLog(QScriptContext*, QScriptEngine*); static QScriptValue quit(QScriptContext*, QScriptEngine*); +#ifndef QT_NO_TEXTDATE static QScriptValue formatDate(QScriptContext*, QScriptEngine*); static QScriptValue formatTime(QScriptContext*, QScriptEngine*); static QScriptValue formatDateTime(QScriptContext*, QScriptEngine*); - +#endif static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { return &e->d_func()->scriptEngine; } static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast<QDeclarativeScriptEngine*>(e)->p->q_func(); } static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); } |