1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"

Browse Source
This commit is contained in:
Qt Forward Merge Bot 2019-06-14 01:00:09 +02:00
commit 1632786f00
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/android-clang/qmake.conf
View File

@ -27,7 +27,7 @@ else: equals(ANDROID_TARGET_ARCH, x86_64): \
QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info
QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++
equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a
QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \

4
src/corelib/tools/qdatetime.cpp
View File

@ -1903,7 +1903,7 @@ int QTime::msecsTo(const QTime &t) const
24 hours each time midnight passes; and, beside this, changes in it may not 24 hours each time midnight passes; and, beside this, changes in it may not
correspond to elapsed time, if a daylight-saving transition intervenes. correspond to elapsed time, if a daylight-saving transition intervenes.
\sa QDateTime::currentDateTime(), QDateTime::curentDateTimeUtc() \sa QDateTime::currentDateTime(), QDateTime::currentDateTimeUtc()
*/ */
#if QT_CONFIG(datestring) #if QT_CONFIG(datestring)
@ -3023,7 +3023,7 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT
datetime by adding a number of seconds, days, months, or years. datetime by adding a number of seconds, days, months, or years.
QDateTime can describe datetimes with respect to \l{Qt::LocalTime}{local QDateTime can describe datetimes with respect to \l{Qt::LocalTime}{local
time}, to \l{Qt::UTC}{UTC}, to a specified \l{{Qt::OffsetFromUTC}{offset time}, to \l{Qt::UTC}{UTC}, to a specified \l{Qt::OffsetFromUTC}{offset
from UTC} or to a specified \l{{Qt::TimeZone}{time zone}, in conjunction from UTC} or to a specified \l{{Qt::TimeZone}{time zone}, in conjunction
with the QTimeZone class. For example, a time zone of "Europe/Berlin" will with the QTimeZone class. For example, a time zone of "Europe/Berlin" will
apply the daylight-saving rules as used in Germany since 1970. In contrast, apply the daylight-saving rules as used in Germany since 1970. In contrast,

2
src/gui/text/qfont.cpp
View File

@ -3044,7 +3044,7 @@ void QFontCache::decreaseCache()
it.value().data->ref.load(), engineCacheCount.value(it.value().data), it.value().data->ref.load(), engineCacheCount.value(it.value().data),
it.value().data->cache_cost); it.value().data->cache_cost);
if (it.value().data->ref.load() != 0) if (it.value().data->ref.load() > engineCacheCount.value(it.value().data))
in_use_cost += it.value().data->cache_cost / engineCacheCount.value(it.value().data); in_use_cost += it.value().data->cache_cost / engineCacheCount.value(it.value().data);
} }

2
src/plugins/platforms/windows/qwindowscontext.cpp
View File

@ -317,6 +317,8 @@ QWindowsContext::~QWindowsContext()
OleUninitialize(); OleUninitialize();
d->m_screenManager.clearScreens(); // Order: Potentially calls back to the windows. d->m_screenManager.clearScreens(); // Order: Potentially calls back to the windows.
if (d->m_displayContext)
ReleaseDC(nullptr, d->m_displayContext);
m_instance = nullptr; m_instance = nullptr;
} }

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

@ -1530,7 +1530,7 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event)
QTimeEdit::QTimeEdit(QWidget *parent) QTimeEdit::QTimeEdit(QWidget *parent)
: QDateTimeEdit(QDATETIMEEDIT_TIME_MIN, QVariant::Time, parent) : QDateTimeEdit(QDATETIMEEDIT_TIME_MIN, QVariant::Time, parent)
{ {
connect(this, SIGNAL(timeChanged(QTime)), SIGNAL(userTimeChanged(QTime))); connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged);
} }
/*! /*!
@ -1541,6 +1541,7 @@ QTimeEdit::QTimeEdit(QWidget *parent)
QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent) QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent)
: QDateTimeEdit(time, QVariant::Time, parent) : QDateTimeEdit(time, QVariant::Time, parent)
{ {
connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged);
} }
/*! /*!
@ -1599,7 +1600,7 @@ QTimeEdit::~QTimeEdit()
QDateEdit::QDateEdit(QWidget *parent) QDateEdit::QDateEdit(QWidget *parent)
: QDateTimeEdit(QDATETIMEEDIT_DATE_INITIAL, QVariant::Date, parent) : QDateTimeEdit(QDATETIMEEDIT_DATE_INITIAL, QVariant::Date, parent)
{ {
connect(this, SIGNAL(dateChanged(QDate)), SIGNAL(userDateChanged(QDate))); connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged);
} }
/*! /*!
@ -1610,6 +1611,7 @@ QDateEdit::QDateEdit(QWidget *parent)
QDateEdit::QDateEdit(const QDate &date, QWidget *parent) QDateEdit::QDateEdit(const QDate &date, QWidget *parent)
: QDateTimeEdit(date, QVariant::Date, parent) : QDateTimeEdit(date, QVariant::Date, parent)
{ {
connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged);
} }
/*! /*!