summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-14 01:00:09 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-14 01:00:09 +0200
commit1632786f00875d23c7d111cbb29dedaa35c1c8c2 (patch)
treef22a5bca4e8ec6f513ca4c9d83fc8c94594ec1f1
parentdf9f9fb368cc2dc17c57030e1df51804c2f2265d (diff)
parent2a9cf3aeab8927d73adc3d63fc7bf97e0edda41a (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r--mkspecs/android-clang/qmake.conf2
-rw-r--r--src/corelib/tools/qdatetime.cpp4
-rw-r--r--src/gui/text/qfont.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.cpp2
-rw-r--r--src/widgets/widgets/qdatetimeedit.cpp6
5 files changed, 10 insertions, 6 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf
index 20c6efee16..05b7979142 100644
--- a/mkspecs/android-clang/qmake.conf
+++ b/mkspecs/android-clang/qmake.conf
@@ -27,7 +27,7 @@ else: equals(ANDROID_TARGET_ARCH, x86_64): \
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
QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 56f74135d4..a156970ac6 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -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
correspond to elapsed time, if a daylight-saving transition intervenes.
- \sa QDateTime::currentDateTime(), QDateTime::curentDateTimeUtc()
+ \sa QDateTime::currentDateTime(), QDateTime::currentDateTimeUtc()
*/
#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.
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
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,
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index a51e98ce85..1dbb03948d 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -3044,7 +3044,7 @@ void QFontCache::decreaseCache()
it.value().data->ref.load(), engineCacheCount.value(it.value().data),
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);
}
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 76747b7956..de533cab08 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -317,6 +317,8 @@ QWindowsContext::~QWindowsContext()
OleUninitialize();
d->m_screenManager.clearScreens(); // Order: Potentially calls back to the windows.
+ if (d->m_displayContext)
+ ReleaseDC(nullptr, d->m_displayContext);
m_instance = nullptr;
}
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index b874e4e3a9..3cebea77d6 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -1530,7 +1530,7 @@ void QDateTimeEdit::mousePressEvent(QMouseEvent *event)
QTimeEdit::QTimeEdit(QWidget *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)
: QDateTimeEdit(time, QVariant::Time, parent)
{
+ connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged);
}
/*!
@@ -1599,7 +1600,7 @@ QTimeEdit::~QTimeEdit()
QDateEdit::QDateEdit(QWidget *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)
: QDateTimeEdit(date, QVariant::Date, parent)
{
+ connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged);
}
/*!