diff options
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 9 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 13 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 69109d12..85ae3ebc 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -438,15 +438,14 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop, case QVariant::DateTime: { QDateTime dateTime = QDeclarativeStringConverters::dateTimeFromString(string); -#ifdef Q_CC_GNU -# warning "QDateTime range has extended in Qt 5, please fix me" -#endif - int data[] = { int(dateTime.date().toJulianDay()), + // Stuff the qint64 julianDay into an array of int. + const qint64 julianDay = dateTime.date().toJulianDay(); + int data[] = { int(julianDay & 0xFFFFFFFF), int(julianDay >> 32), dateTime.time().hour(), dateTime.time().minute(), dateTime.time().second(), dateTime.time().msec() }; - int index = output->indexForInt(data, 5); + const int index = output->indexForInt(data, 6); instr.type = QDeclarativeInstruction::StoreDateTime; instr.storeDateTime.propertyIndex = prop.propertyIndex(); instr.storeDateTime.valueIndex = index; diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index f3adbe76..c4be742c 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -534,12 +534,13 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack, QObject *target = stack.top(); CLEAN_PROPERTY(target, instr.storeDateTime.propertyIndex); - QTime t; - t.setHMS(intData.at(instr.storeDateTime.valueIndex+1), - intData.at(instr.storeDateTime.valueIndex+2), - intData.at(instr.storeDateTime.valueIndex+3), - intData.at(instr.storeDateTime.valueIndex+4)); - QDateTime dt(QDate::fromJulianDay(intData.at(instr.storeDateTime.valueIndex)), t); + const qint64 julianDay = qint64((quint64)(uint)(intData.at(instr.storeDateTime.valueIndex))) + + (qint64(intData.at(instr.storeDateTime.valueIndex + 1)) << 32); + QDateTime dt(QDate::fromJulianDay(julianDay), + QTime(intData.at(instr.storeDateTime.valueIndex + 2), + intData.at(instr.storeDateTime.valueIndex + 3), + intData.at(instr.storeDateTime.valueIndex + 4), + intData.at(instr.storeDateTime.valueIndex + 5))); void *a[] = { &dt, 0, &status, &flags }; QMetaObject::metacall(target, QMetaObject::WriteProperty, instr.storeDateTime.propertyIndex, a); |