Fix build with -no-feature-listview and itemviews

tested with each/all of below
-no-feature-gridview
-no-feature-listview
-no-feature-pathview
-no-feature-tableview
-no-feature-treeview

Pick-to: 6.5
Change-Id: I90cc7bc45bb9065000bc0fc7eeb8e80f02acb0d0
Reviewed-by: Volker Hilsheimer <[email protected]>

10 files changed, 63 insertions, 21 deletions

diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index f7d6b148aa..47aad50b2b 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -26,6 +26,9 @@
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(lcItemViewDelegateLifecycle)
+#if !QT_CONFIG(quick_itemview)
+Q_LOGGING_CATEGORY(lcItemViewDelegateLifecycle, "qt.quick.itemview.lifecycle")
+#endif
 Q_LOGGING_CATEGORY(lcPathView, "qt.quick.pathview")
 
 static QQmlOpenMetaObjectType *qPathViewAttachedType = nullptr;
diff --git a/src/quickcontrolstestutils/dialogstestutils.cpp b/src/quickcontrolstestutils/dialogstestutils.cpp
index 71622fabb0..4a795e42da 100644
--- a/src/quickcontrolstestutils/dialogstestutils.cpp
+++ b/src/quickcontrolstestutils/dialogstestutils.cpp
@@ -4,18 +4,24 @@
 #include "dialogstestutils_p.h"
 
 #include <QtTest/qsignalspy.h>
+#include <QtQuick/private/qtquickglobal_p.h>
+#if QT_CONFIG(quick_listview)
 #include <QtQuick/private/qquicklistview_p.h>
+#endif
 #include <QtQuickTest/quicktest.h>
 #include <QtQuickControls2/qquickstyle.h>
 #include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
 #include <QtQuickTemplates2/private/qquickdialogbuttonbox_p.h>
+#if QT_CONFIG(quick_listview)
 #include <QtQuickDialogs2QuickImpl/private/qquickfiledialogdelegate_p.h>
 #include <QtQuickDialogs2QuickImpl/private/qquickfolderbreadcrumbbar_p.h>
 #include <QtQuickDialogs2QuickImpl/private/qquickfolderbreadcrumbbar_p_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
+#if QT_CONFIG(quick_listview)
 bool QQuickDialogTestUtils::verifyFileDialogDelegates(QQuickListView *fileDialogListView,
     const QStringList &expectedFiles, QString &failureMessage)
 {
@@ -105,6 +111,7 @@ bool QQuickDialogTestUtils::verifyBreadcrumbDelegates(QQuickFolderBreadcrumbBar
 
     return true;
 }
+#endif
 
 QQuickAbstractButton *QQuickDialogTestUtils::findDialogButton(QQuickDialogButtonBox *box, const QString &buttonText)
 {
diff --git a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
index bcd61fec58..224260f14a 100644
--- a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
@@ -77,31 +77,11 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl
         qquickcolorinputs_p.h
         qquickdialogimplfactory.cpp
         qquickdialogimplfactory_p.h
-        qquickfiledialogdelegate.cpp
-        qquickfiledialogdelegate_p.h
-        qquickfiledialogimpl.cpp
-        qquickfiledialogimpl_p.h
-        qquickfiledialogimpl_p_p.h
-        qquickfolderbreadcrumbbar.cpp
-        qquickfolderbreadcrumbbar_p.h
-        qquickfolderbreadcrumbbar_p_p.h
-        qquickfolderdialogimpl.cpp
-        qquickfolderdialogimpl_p.h
-        qquickfolderdialogimpl_p_p.h
-        qquickfontdialogimpl.cpp
-        qquickfontdialogimpl_p.h
-        qquickfontdialogimpl_p_p.h
         qquickmessagedialogimpl.cpp
         qquickmessagedialogimpl_p.h
         qquickmessagedialogimpl_p_p.h
         qquickplatformcolordialog.cpp
         qquickplatformcolordialog_p.h
-        qquickplatformfiledialog.cpp
-        qquickplatformfiledialog_p.h
-        qquickplatformfolderdialog.cpp
-        qquickplatformfolderdialog_p.h
-        qquickplatformfontdialog.cpp
-        qquickplatformfontdialog_p.h
         qquickplatformmessagedialog.cpp
         qquickplatformmessagedialog_p.h
         qquicksaturationlightnesspicker.cpp
@@ -135,6 +115,30 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl
     GENERATE_PRIVATE_CPP_EXPORTS
 )
 
+qt_internal_extend_target(QuickDialogs2QuickImpl CONDITION QT_FEATURE_quick_listview
+    SOURCES
+        qquickfiledialogdelegate.cpp
+        qquickfiledialogdelegate_p.h
+        qquickfiledialogimpl.cpp
+        qquickfiledialogimpl_p.h
+        qquickfiledialogimpl_p_p.h
+        qquickfolderbreadcrumbbar.cpp
+        qquickfolderbreadcrumbbar_p.h
+        qquickfolderbreadcrumbbar_p_p.h
+        qquickfolderdialogimpl.cpp
+        qquickfolderdialogimpl_p.h
+        qquickfolderdialogimpl_p_p.h
+        qquickfontdialogimpl.cpp
+        qquickfontdialogimpl_p.h
+        qquickfontdialogimpl_p_p.h
+        qquickplatformfiledialog.cpp
+        qquickplatformfiledialog_p.h
+        qquickplatformfolderdialog.cpp
+        qquickplatformfolderdialog_p.h
+        qquickplatformfontdialog.cpp
+        qquickplatformfontdialog_p.h
+)
+
 # Resources:
 set(qtquickdialogs2quickimpl_resource_files
     "images/checkers.png"
diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
index 9a63fb0718..594b148528 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
+++ b/src/quickdialogs/quickdialogsquickimpl/qquickdialogimplfactory.cpp
@@ -5,9 +5,12 @@
 
 #include <QtCore/qloggingcategory.h>
 
+#include <QtQuick/private/qtquickglobal_p.h>
+#if QT_CONFIG(quick_listview)
 #include "qquickplatformfiledialog_p.h"
 #include "qquickplatformfolderdialog_p.h"
 #include "qquickplatformfontdialog_p.h"
+#endif
 #include "qquickplatformcolordialog_p.h"
 #include "qquickplatformmessagedialog_p.h"
 
@@ -29,6 +32,7 @@ std::unique_ptr<QPlatformDialogHelper> QQuickDialogImplFactory::createPlatformDi
         dialogHelper.reset(new QQuickPlatformColorDialog(parent));
         break;
     }
+#if QT_CONFIG(quick_listview)
     case QQuickDialogType::FileDialog: {
         dialogHelper.reset(new QQuickPlatformFileDialog(parent));
         break;
@@ -41,6 +45,7 @@ std::unique_ptr<QPlatformDialogHelper> QQuickDialogImplFactory::createPlatformDi
         dialogHelper.reset(new QQuickPlatformFontDialog(parent));
         break;
     }
+#endif
     case QQuickDialogType::MessageDialog: {
         dialogHelper.reset(new QQuickPlatformMessageDialog(parent));
         break;
diff --git a/src/quicktemplates/qquickcombobox.cpp b/src/quicktemplates/qquickcombobox.cpp
index 4b485f67b9..3b60eac061 100644
--- a/src/quicktemplates/qquickcombobox.cpp
+++ b/src/quicktemplates/qquickcombobox.cpp
@@ -23,7 +23,9 @@
 #include <QtQuick/private/qquickevents_p_p.h>
 #include <QtQuick/private/qquicktextinput_p.h>
 #include <QtQuick/private/qquicktextinput_p_p.h>
+#if QT_CONFIG(quick_itemview)
 #include <QtQuick/private/qquickitemview_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -342,14 +344,18 @@ void QQuickComboBoxPrivate::popupVisibleChanged()
     if (isPopupVisible())
         QGuiApplication::inputMethod()->reset();
 
+#if QT_CONFIG(quick_itemview)
     QQuickItemView *itemView = popup->findChild<QQuickItemView *>();
     if (itemView)
         itemView->setHighlightRangeMode(QQuickItemView::NoHighlightRange);
+#endif
 
     updateHighlightedIndex();
 
+#if QT_CONFIG(quick_itemview)
     if (itemView)
         itemView->positionViewAtIndex(highlightedIndex, QQuickItemView::Beginning);
+#endif
 
     if (!hasDown) {
         q->setDown(pressed || isPopupVisible());
@@ -381,8 +387,10 @@ void QQuickComboBoxPrivate::itemHovered()
     if (index != -1) {
         setHighlightedIndex(index, Highlight);
 
+#if QT_CONFIG(quick_itemview)
         if (QQuickItemView *itemView = popup->findChild<QQuickItemView *>())
             itemView->positionViewAtIndex(index, QQuickItemView::Contain);
+#endif
     }
 }
 
@@ -1339,8 +1347,10 @@ void QQuickComboBox::setPopup(QQuickPopup *popup)
         popup->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent);
         QObjectPrivate::connect(popup, &QQuickPopup::visibleChanged, d, &QQuickComboBoxPrivate::popupVisibleChanged);
 
+#if QT_CONFIG(quick_itemview)
         if (QQuickItemView *itemView = popup->findChild<QQuickItemView *>())
             itemView->setHighlightRangeMode(QQuickItemView::NoHighlightRange);
+#endif
     }
     d->popup = popup;
     if (!d->popup.isExecuting())
diff --git a/src/quicktemplates/qquickmenu.cpp b/src/quicktemplates/qquickmenu.cpp
index 3ce6e0fc3e..7f8ebf1ca9 100644
--- a/src/quicktemplates/qquickmenu.cpp
+++ b/src/quicktemplates/qquickmenu.cpp
@@ -26,7 +26,6 @@
 #include <private/qqmlobjectmodel_p.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
-#include <QtQuick/private/qquickitemview_p.h>
 #include <QtQuick/private/qquickevents_p_p.h>
 #include <QtQuick/private/qquickwindow_p.h>
 
diff --git a/src/quicktestutils/quick/viewtestutils.cpp b/src/quicktestutils/quick/viewtestutils.cpp
index e8e5847548..79c34168e5 100644
--- a/src/quicktestutils/quick/viewtestutils.cpp
+++ b/src/quicktestutils/quick/viewtestutils.cpp
@@ -4,6 +4,7 @@
 #include "viewtestutils_p.h"
 
 #include <QtCore/QRandomGenerator>
+#include <QtCore/QTimer>
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickView>
 #include <QtGui/QScreen>
@@ -12,7 +13,9 @@
 #include <QtTest/QTest>
 
 #include <QtQuick/private/qquickdeliveryagent_p_p.h>
+#if QT_CONFIG(quick_itemview)
 #include <QtQuick/private/qquickitemview_p_p.h>
+#endif
 #include <QtQuick/private/qquickwindow_p.h>
 
 #include <QtQuickTestUtils/private/visualtestutils_p.h>
@@ -391,6 +394,7 @@ void QQuickViewTestUtils::StressTestModel::updateModel()
     }
 }
 
+#if QT_CONFIG(quick_itemview)
 bool QQuickViewTestUtils::testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx)
 {
     QHash<QQuickItem*, int> uniqueItems;
@@ -427,6 +431,7 @@ bool QQuickViewTestUtils::testVisibleItems(const QQuickItemViewPrivate *priv, bo
 
     return true;
 }
+#endif
 
 namespace QQuickTouchUtils {
 
diff --git a/src/quicktestutils/quick/viewtestutils_p.h b/src/quicktestutils/quick/viewtestutils_p.h
index ff8905afa6..28666786f0 100644
--- a/src/quicktestutils/quick/viewtestutils_p.h
+++ b/src/quicktestutils/quick/viewtestutils_p.h
@@ -19,6 +19,7 @@
 #include <QtQml/QQmlExpression>
 #include <QtQuick/QQuickItem>
 #include <QtCore/private/qglobal_p.h>
+#include <QtQuick/private/qtquickglobal_p.h>
 
 QT_FORWARD_DECLARE_CLASS(QQuickView)
 QT_FORWARD_DECLARE_CLASS(QQuickItemViewPrivate)
@@ -167,8 +168,10 @@ namespace QQuickViewTestUtils
         int m_rowCount;
     };
 
+#if QT_CONFIG(quick_itemview)
     [[nodiscard]] bool testVisibleItems(const QQuickItemViewPrivate *priv,
         bool *nonUnique, FxViewItem **failItem, int *expectedIdx);
+#endif
 }
 
 namespace QQuickTouchUtils {
diff --git a/src/quicktestutils/quick/visualtestutils.cpp b/src/quicktestutils/quick/visualtestutils.cpp
index fe7c914925..7684109070 100644
--- a/src/quicktestutils/quick/visualtestutils.cpp
+++ b/src/quicktestutils/quick/visualtestutils.cpp
@@ -6,7 +6,9 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtQuick/QQuickItem>
+#if QT_CONFIG(quick_itemview)
 #include <QtQuick/private/qquickitemview_p.h>
+#endif
 #include <QtQuickTest/QtQuickTest>
 
 QT_BEGIN_NAMESPACE
@@ -111,6 +113,7 @@ bool QQuickVisualTestUtils::compareImages(const QImage &ia, const QImage &ib, QS
     return true;
 }
 
+#if QT_CONFIG(quick_itemview)
 /*!
     \internal
 
@@ -139,6 +142,7 @@ QQuickItem *QQuickVisualTestUtils::findViewDelegateItem(QQuickItemView *itemView
 
     return itemView->itemAtIndex(index);
 }
+#endif
 
 QQuickVisualTestUtils::QQuickApplicationHelper::QQuickApplicationHelper(QQmlDataTest *testCase,
     const QString &testFilePath, const QVariantMap &initialProperties, const QStringList &qmlImportPaths)
diff --git a/src/quicktestutils/quick/visualtestutils_p.h b/src/quicktestutils/quick/visualtestutils_p.h
index e10848a278..2ceb35c044 100644
--- a/src/quicktestutils/quick/visualtestutils_p.h
+++ b/src/quicktestutils/quick/visualtestutils_p.h
@@ -131,8 +131,10 @@ namespace QQuickVisualTestUtils
     };
     Q_DECLARE_FLAGS(FindViewDelegateItemFlags, FindViewDelegateItemFlag)
 
+#if QT_CONFIG(quick_itemview)
     QQuickItem* findViewDelegateItem(QQuickItemView *itemView, int index,
         FindViewDelegateItemFlags flags = FindViewDelegateItemFlag::PositionViewAtIndex);
+#endif
 
     /*!
         \internal