diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-20 16:58:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 17:02:29 +0100 |
| commit | b6c332107372fdcbe64c47eb458d8820e499fd16 (patch) | |
| tree | 31e555d853b5b9f9bbd775afa1a431c41ad939a4 | |
| parent | bb364c14157df635cf166b293f8cab6c22534aa1 (diff) | |
Build with g++ / C++11.
Change-Id: Ibc538d11806d0fec452ee9eb01936940da9dc199
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 6ec38c5c..b3a33179 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -438,7 +438,10 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop, case QVariant::DateTime: { QDateTime dateTime = QDeclarativeStringConverters::dateTimeFromString(string); - int data[] = { dateTime.date().toJulianDay(), +#ifdef Q_CC_GNU +# warning "QDateTime range has extended in Qt 5, please fix me" +#endif + int data[] = { int(dateTime.date().toJulianDay()), dateTime.time().hour(), dateTime.time().minute(), dateTime.time().second(), |