From 7d3e9074e16209d9df3e910834115c9a96c70318 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 25 Jun 2017 17:55:23 +0200
Subject: Convert features.tooltip to QT_CONFIG

Change-Id: I4638457a51a72666b4c73130f4a856ad93ca2f13
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/controls/Private/qquicktooltip.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

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
 }
-- 
cgit v1.2.1


From a77494140324c3ede1f7c16086593c070d81e2b3 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Mon, 31 Jul 2017 16:18:28 +0200
Subject: Calendar: add a doc example that sets minimum/maximumDate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie2fb915a927d4c3481afa6e4ac64089440f7ac9c
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 src/controls/Calendar.qml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index 96896480..c5347c51 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.
 
-- 
cgit v1.2.1