diff options
-rw-r--r-- | dist/changes-5.9.1 | 35 | ||||
-rw-r--r-- | src/controls/Calendar.qml | 7 | ||||
-rw-r--r-- | src/controls/Private/qquicktooltip.cpp | 9 |
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 00000000..f158083f --- /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 b18a8b47..a5b32210 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 c8eb81f6..88a82e6c 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 } |