diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qtcore_eval.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 0647513221..5fe1047426 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -310,7 +310,7 @@ struct DefinedTypesFilter { name to a type so that it can be created and destructed dynamically at run-time. Declare new types with Q_DECLARE_METATYPE() to make them available to QVariant and other template-based functions. - Call qRegisterMetaType() to make type available to non-template based + Call qRegisterMetaType() to make types available to non-template based functions, such as the queued signal and slot connections. Any class or struct that has a public default diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp index a5c4c36638..c938e0fb5b 100644 --- a/src/corelib/kernel/qtcore_eval.cpp +++ b/src/corelib/kernel/qtcore_eval.cpp @@ -119,9 +119,11 @@ static EvaluationStatus qt_eval_is_supported() static int qt_eval_days_left() { + const char *expiry_date = const_cast<const char*>(qt_eval_expiry_date + 12); + QDate today = QDate::currentDate(); - QDate build = QLibraryInfo::buildDate(); - return qMax<qint64>(-1, today.daysTo(build) + 30); + QDate lastday = QDate::fromString(QString::fromLatin1(expiry_date), Qt::ISODate); + return today.daysTo(lastday); } static bool qt_eval_is_expired() |