summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-08-15 10:23:50 (GMT)
committerLiang Qi <liang.qi@qt.io>2017-08-15 11:30:12 (GMT)
commiteabf64ed680dc85082ed325c3db5cb20049d3d97 (patch)
treefc8cd9d260116bc4e63c47aaa7a6d25b3a444a7d
parent8b36cdd25761348c285305edec1bf861a924e858 (diff)
parenta77494140324c3ede1f7c16086593c070d81e2b3 (diff)
downloadqtquickcontrols-eabf64ed680dc85082ed325c3db5cb20049d3d97.tar.gz
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf Change-Id: Icfa0daf5e65337745f5986afee7cd3c8043fafa0
-rw-r--r--dist/changes-5.9.135
-rw-r--r--src/controls/Calendar.qml7
-rw-r--r--src/controls/Private/qquicktooltip.cpp9
3 files changed, 48 insertions, 3 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1
new file mode 100644
index 0000000..f158083
--- /dev/null
+++ b/dist/changes-5.9.1
@@ -0,0 +1,35 @@
+Qt 5.9.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - Slider
+ * [QTBUG-47081] Fixed to not suppress updates by a drag threshold on
+ non-touch screens.
+
+****************************************************************************
+* Dialogs *
+****************************************************************************
+
+ - [QTBUG-60861] Fixed inclusion of QML files of the QtQuick Dialogs module
+ in static builds.
+ - [QTBUG-60991] Fixed support for using QtQuick Dialogs with the QML
+ compiler.
diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index b18a8b4..a5b3221 100644
--- a/src/controls/Calendar.qml
+++ b/src/controls/Calendar.qml
@@ -62,6 +62,13 @@ import QtQuick.Controls.Private 1.0
\l maximumDate. The earliest minimum date that can be set is 1 January, 1
AD. The latest maximum date that can be set is 25 October, 275759 AD.
+ \code
+ Calendar {
+ minimumDate: new Date(2017, 0, 1)
+ maximumDate: new Date(2018, 0, 1)
+ }
+ \endcode
+
The selected date is displayed using the format in the application's
default locale.
diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp
index c8eb81f..88a82e6 100644
--- a/src/controls/Private/qquicktooltip.cpp
+++ b/src/controls/Private/qquicktooltip.cpp
@@ -44,9 +44,12 @@
#include <qpa/qplatformintegration.h>
#include <QtQuick/QQuickRenderControl>
-#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP)
+#if defined(QT_WIDGETS_LIB)
+#include <QtWidgets/qtwidgetsglobal.h>
+#if QT_CONFIG(tooltip)
#include <qtooltip.h>
#endif
+#endif
QT_BEGIN_NAMESPACE
@@ -60,7 +63,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin
{
if (!item || !item->window())
return;
-#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP)
+#if defined(QT_WIDGETS_LIB) && QT_CONFIG(tooltip)
if (QGuiApplicationPrivate::platformIntegration()->
hasCapability(QPlatformIntegration::MultipleWindows) &&
QCoreApplication::instance()->inherits("QApplication")) {
@@ -80,7 +83,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin
void QQuickTooltip1::hideText()
{
-#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP)
+#if defined(QT_WIDGETS_LIB) && QT_CONFIG(tooltip)
QToolTip::hideText();
#endif
}