AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 5.15 into 5.15.0

Browse Source 
Change-Id: Ib5251a8cb59693f076da7f75b86bfb6767bdf958
This commit is contained in:
Alexandru Croitor 2020-04-23 11:22:00 +02:00
commit 79381ca10d
10 changed files with 108 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/network/securesocketclient/sslclient.cpp
View File

@ -63,6 +63,7 @@ SslClient::SslClient(QWidget *parent)
SslClient::~SslClient()
{
delete socket;
delete form;
}

16
src/corelib/kernel/qobject.cpp
View File

@ -4614,6 +4614,14 @@ QDebug operator<<(QDebug dbg, const QObject *o)
\c{staticMetaObject} is of type QMetaObject and provides access to the
enums declared with Q_ENUM_NS/Q_FLAG_NS.
For example:
\code
namespace test {
Q_NAMESPACE
...
\endcode
\sa Q_NAMESPACE_EXPORT
*/
@ -4630,6 +4638,14 @@ QDebug operator<<(QDebug dbg, const QObject *o)
is declared with the supplied \a EXPORT_MACRO qualifier. This is
useful if the object needs to be exported from a dynamic library.
For example:
\code
namespace test {
Q_NAMESPACE_EXPORT(EXPORT_MACRO)
...
\endcode
\sa Q_NAMESPACE, {Creating Shared Libraries}
*/

9
src/corelib/text/qlocale.cpp
View File

@ -2559,19 +2559,18 @@ QDateTime QLocale::toDateTime(const QString &string, const QString &format) cons
QDateTime QLocale::toDateTime(const QString &string, const QString &format, QCalendar cal) const
{
#if QT_CONFIG(datetimeparser)
QTime time;
QDate date;
QDateTime datetime;
QDateTimeParser dt(QMetaType::QDateTime, QDateTimeParser::FromString, cal);
dt.setDefaultLocale(*this);
if (dt.parseFormat(format) && dt.fromString(string, &date, &time))
return QDateTime(date, time);
if (dt.parseFormat(format) && dt.fromString(string, &datetime))
return datetime;
#else
Q_UNUSED(string);
Q_UNUSED(format);
Q_UNUSED(cal);
#endif
return QDateTime(QDate(), QTime(-1, -1, -1));
return QDateTime();
}
#endif // datestring

35
src/corelib/time/qdatetime.cpp
View File

@ -1762,9 +1762,9 @@ QT_WARNING_POP
be given in the user's local language. It is only possible to use the English
names if the user's language is English.
All other input characters will be treated as text. Any sequence
of characters that are enclosed in single quotes will also be
treated as text and will not be used as an expression. For example:
All other input characters will be treated as text. Any non-empty sequence
of characters enclosed in single quotes will also be treated (stripped of
the quotes) as text and not be interpreted as expressions. For example:
\snippet code/src_corelib_tools_qdatetime.cpp 1
@ -2132,11 +2132,11 @@ QT_WARNING_POP
\row \li t \li The timezone (for example "CEST")
\endtable
Any sequence of characters enclosed in single quotes will be included
verbatim in the output string (stripped of the quotes), even if it contains
formatting characters. Two consecutive single quotes ("''") are replaced by
a single quote in the output. All other characters in the format string are
included verbatim in the output string.
Any non-empty sequence of characters enclosed in single quotes will be
included verbatim in the output string (stripped of the quotes), even if it
contains formatting characters. Two consecutive single quotes ("''") are
replaced by a single quote in the output. All other characters in the format
string are included verbatim in the output string.
Formats without separators (e.g. "ddMM") are supported but must be used with
care, as the resulting strings aren't always reliably readable (e.g. if "dM"
@ -2536,9 +2536,9 @@ QT_WARNING_POP
\row \li t \li the timezone (for example "CEST")
\endtable
All other input characters will be treated as text. Any sequence
of characters that are enclosed in single quotes will also be
treated as text and not be used as an expression.
All other input characters will be treated as text. Any non-empty sequence
of characters enclosed in single quotes will also be treated (stripped of
the quotes) as text and not be interpreted as expressions.
\snippet code/src_corelib_tools_qdatetime.cpp 6
@ -5480,9 +5480,9 @@ QT_WARNING_POP
See QDate::fromString() and QTime::fromString() for the expressions
recognized in the format string to represent parts of the date and time.
All other input characters will be treated as text. Any sequence of
characters that are enclosed in single quotes will also be treated as text
and not be used as an expression.
All other input characters will be treated as text. Any non-empty sequence
of characters enclosed in single quotes will also be treated (stripped of
the quotes) as text and not be interpreted as expressions.
\snippet code/src_corelib_tools_qdatetime.cpp 12
@ -5537,13 +5537,12 @@ QT_WARNING_POP
QDateTime QDateTime::fromString(const QString &string, const QString &format, QCalendar cal)
{
#if QT_CONFIG(datetimeparser)
QTime time;
QDate date;
QDateTime datetime;
QDateTimeParser dt(QMetaType::QDateTime, QDateTimeParser::FromString, cal);
// dt.setDefaultLocale(QLocale::c()); ### Qt 6
if (dt.parseFormat(format) && dt.fromString(string, &date, &time))
return QDateTime(date, time);
if (dt.parseFormat(format) && dt.fromString(string, &datetime))
return datetime;
#else
Q_UNUSED(string);
Q_UNUSED(format);

74
src/corelib/time/qdatetimeparser.cpp
View File

@ -1207,12 +1207,16 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
Q_ASSERT(!zoneName.isEmpty()); // sect.used > 0
const QByteArray latinZone(zoneName == QLatin1String("Z")
? QByteArray("UTC") : zoneName.toLatin1());
timeZone = QTimeZone(latinZone);
tspec = timeZone.isValid()
? (QTimeZone::isTimeZoneIdAvailable(latinZone)
? Qt::TimeZone
: Qt::OffsetFromUTC)
: (Q_ASSERT(startsWithLocalTimeZone(zoneName)), Qt::LocalTime);
if (latinZone.startsWith("UTC") &&
(latinZone.size() == 3 || latinZone.at(3) == '+' || latinZone.at(3) == '-' )) {
timeZone = QTimeZone(sect.value);
tspec = sect.value ? Qt::OffsetFromUTC : Qt::UTC;
} else {
timeZone = QTimeZone(latinZone);
tspec = timeZone.isValid()
? Qt::TimeZone
: (Q_ASSERT(startsWithLocalTimeZone(zoneName)), Qt::LocalTime);
}
#else
tspec = Qt::LocalTime;
#endif
@ -1537,12 +1541,10 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu
}
}
text = scan.input = input;
// Set spec *after* all checking, so validity is a property of the string:
scan.value = scan.value.toTimeSpec(spec);
/*
However, even with a valid string we might have ended up with an invalid datetime:
the non-existent hour during dst changes, for instance.
We might have ended up with an invalid datetime: the non-existent hour
during dst changes, for instance.
*/
if (!scan.value.isValid() && scan.state == Acceptable)
scan.state = Intermediate;
@ -2018,13 +2020,12 @@ QString QDateTimeParser::stateName(State s) const
#if QT_CONFIG(datestring)
bool QDateTimeParser::fromString(const QString &t, QDate *date, QTime *time) const
{
QDateTime val(QDate(1900, 1, 1).startOfDay());
const StateNode tmp = parse(t, -1, val, false);
if (tmp.state != Acceptable || tmp.conflicts) {
QDateTime datetime;
if (!fromString(t, &datetime))
return false;
}
if (time) {
const QTime t = tmp.value.time();
const QTime t = datetime.time();
if (!t.isValid()) {
return false;
}
@ -2032,7 +2033,7 @@ bool QDateTimeParser::fromString(const QString &t, QDate *date, QTime *time) con
}
if (date) {
const QDate d = tmp.value.date();
const QDate d = datetime.date();
if (!d.isValid()) {
return false;
}
@ -2040,26 +2041,43 @@ bool QDateTimeParser::fromString(const QString &t, QDate *date, QTime *time) con
}
return true;
}
bool QDateTimeParser::fromString(const QString &t, QDateTime* datetime) const
{
QDateTime val(QDate(1900, 1, 1).startOfDay());
const StateNode tmp = parse(t, -1, val, false);
if (tmp.state != Acceptable || tmp.conflicts)
return false;
if (datetime) {
if (!tmp.value.isValid())
return false;
*datetime = tmp.value;
}
return true;
}
#endif // datestring
QDateTime QDateTimeParser::getMinimum() const
{
// Cache the most common case
if (spec == Qt::LocalTime) {
static const QDateTime localTimeMin(QDATETIMEEDIT_DATE_MIN.startOfDay(Qt::LocalTime));
return localTimeMin;
}
return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec));
// NB: QDateTimeParser always uses Qt::LocalTime time spec by default. If
// any subclass needs a changing time spec, it must override this
// method. At the time of writing, this is done by QDateTimeEditPrivate.
// Cache the only case
static const QDateTime localTimeMin(QDATETIMEEDIT_DATE_MIN.startOfDay(Qt::LocalTime));
return localTimeMin;
}
QDateTime QDateTimeParser::getMaximum() const
{
// Cache the most common case
if (spec == Qt::LocalTime) {
static const QDateTime localTimeMax(QDATETIMEEDIT_DATE_MAX.endOfDay(Qt::LocalTime));
return localTimeMax;
}
return QDateTime(QDATETIMEEDIT_DATE_MAX.endOfDay(spec));
// NB: QDateTimeParser always uses Qt::LocalTime time spec by default. If
// any subclass needs a changing time spec, it must override this
// method. At the time of writing, this is done by QDateTimeEditPrivate.
// Cache the only case
static const QDateTime localTimeMax(QDATETIMEEDIT_DATE_MAX.endOfDay(Qt::LocalTime));
return localTimeMax;
}
QString QDateTimeParser::getAmPmText(AmPm ap, Case cs) const

4
src/corelib/time/qdatetimeparser_p.h
View File

@ -85,7 +85,7 @@ public:
};
QDateTimeParser(QMetaType::Type t, Context ctx, const QCalendar &cal = QCalendar())
: currentSectionIndex(-1), cachedDay(-1), parserType(t),
fixday(false), spec(Qt::LocalTime), context(ctx), calendar(cal)
fixday(false), context(ctx), calendar(cal)
{
defaultLocale = QLocale::system();
first.type = FirstSection;
@ -181,6 +181,7 @@ public:
#if QT_CONFIG(datestring)
StateNode parse(QString input, int position, const QDateTime &defaultValue, bool fixup) const;
bool fromString(const QString &text, QDate *date, QTime *time) const;
bool fromString(const QString &text, QDateTime* datetime) const;
#endif
bool parseFormat(const QString &format);
@ -297,7 +298,6 @@ protected: // for the benefit of QDateTimeEditPrivate
QLocale defaultLocale;
QMetaType::Type parserType;
bool fixday;
Qt::TimeSpec spec; // spec if used by QDateTimeEdit
Context context;
QCalendar calendar;
};

6
src/plugins/platforms/cocoa/qcocoabackingstore.mm
View File

@ -537,8 +537,10 @@ void QCALayerBackingStore::flush(QWindow *flushedWindow, const QRegion &region,
flushedView.layer.contentsScale = m_buffers.back()->devicePixelRatio();
}
const bool isSingleBuffered = window()->format().swapBehavior() == QSurfaceFormat::SingleBuffer;
id backBufferSurface = (__bridge id)m_buffers.back()->surface();
if (flushedView.layer.contents == backBufferSurface) {
if (!isSingleBuffered && flushedView.layer.contents == backBufferSurface) {
// We've managed to paint to the back buffer again before Core Animation had time
// to flush the transaction and persist the layer changes to the window server, or
// we've been asked to flush without painting anything. The layer already knows about
@ -555,7 +557,7 @@ void QCALayerBackingStore::flush(QWindow *flushedWindow, const QRegion &region,
// with other pending view and layer updates.
flushedView.window.viewsNeedDisplay = YES;
if (window()->format().swapBehavior() == QSurfaceFormat::SingleBuffer) {
if (isSingleBuffered) {
// The private API [CALayer reloadValueForKeyPath:@"contents"] would be preferable,
// but barring any side effects or performance issues we opt for the hammer for now.
flushedView.layer.contents = nil;

7
src/widgets/widgets/qdatetimeedit.cpp
View File

@ -1976,7 +1976,14 @@ QDateTime QDateTimeEditPrivate::validateAndInterpret(QString &input, int &positi
return minimum.toDateTime();
}
}
StateNode tmp = parse(input, position, value.toDateTime(), fixup);
// Impose this widget's spec:
tmp.value = tmp.value.toTimeSpec(spec);
// ... but that might turn a valid datetime into an invalid one:
if (!tmp.value.isValid() && tmp.state == Acceptable)
tmp.state = Intermediate;
input = tmp.input;
position += tmp.padded;
state = QValidator::State(int(tmp.state));

6
src/widgets/widgets/qdatetimeedit_p.h
View File

@ -98,12 +98,16 @@ public:
{
if (keyboardTracking)
return minimum.toDateTime();
if (spec != Qt::LocalTime)
return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec));
return QDateTimeParser::getMinimum();
}
QDateTime getMaximum() const override
{
if (keyboardTracking)
return maximum.toDateTime();
if (spec != Qt::LocalTime)
return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec));
return QDateTimeParser::getMaximum();
}
QLocale locale() const override { return q_func()->locale(); }
@ -148,6 +152,8 @@ public:
#ifdef QT_KEYPAD_NAVIGATION
bool focusOnButton;
#endif
Qt::TimeSpec spec = Qt::LocalTime;
};

5
tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
View File

@ -2554,6 +2554,11 @@ void tst_QDateTime::fromStringStringFormat()
QDateTime dt = QDateTime::fromString(string, format);
if (expected.isValid()) {
QCOMPARE(dt.timeSpec(), expected.timeSpec());
if (expected.timeSpec() == Qt::TimeZone)
QCOMPARE(dt.timeZone(), expected.timeZone());
}
QCOMPARE(dt, expected);
}