diff options
author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-07-27 09:05:12 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-07-27 09:05:12 (GMT) |
commit | 4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf (patch) | |
tree | 9c85cf4369603ae9cb308f1329d7cd182bdaef48 /src/declarative/qml/qdeclarativeengine_p.h | |
parent | 475a3c275ba173cb130a838b6053cb45d405887e (diff) | |
download | Qt-4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf.zip Qt-4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf.tar.gz Qt-4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf.tar.bz2 |
Fix QT_NO_DATESTRING
Merge-request: 730
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index a5c8c38..3b5dd5a 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -304,7 +304,7 @@ public: static QScriptValue consoleLog(QScriptContext*, QScriptEngine*); static QScriptValue quit(QScriptContext*, QScriptEngine*); -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING static QScriptValue formatDate(QScriptContext*, QScriptEngine*); static QScriptValue formatTime(QScriptContext*, QScriptEngine*); static QScriptValue formatDateTime(QScriptContext*, QScriptEngine*); |