diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Calendar.qml | 7 | ||||
| -rw-r--r-- | src/controls/Private/qquicktooltip.cpp | 9 |
2 files changed, 13 insertions, 3 deletions
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 } |