diff options
| author | Juha Vuolle <juha.vuolle@qt.io> | 2025-04-07 16:11:28 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@qt.io> | 2025-04-10 11:03:53 +0300 |
| commit | b4ed50f0090c3cec8e74b99b3a35c6266e6dc2ec (patch) | |
| tree | b30c0fd5eb3b3782d6c08b83a69a704e906ada76 /src/quickcontrolstestutils/dialogstestutils.cpp | |
| parent | 0abe19031052ae65e32397201e066a3e28776c39 (diff) | |
Fix compilation when draganddrop support is disabled
When Qt is configured with -no-feature-draganddrop, the
quick_draganddrop feature gets disabled too. Consequently many dialog
files are then omitted from the build, see
src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt.
As a result, some dialogs and templates that include and use
these files/classes unconditionally, fail to compile. This commit
adds same feature guards to these includes/uses.
In addition this commit adds the few missing 'drag' feature
guards in QQuickVerticalHeaderView as well as adds appropriate
feature guards to autotests.
Pick-to: 6.9 6.8
Fixes: QTBUG-135740
Change-Id: If1688a3cd8f52918088a8c586d54ccf09cb08890
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Diffstat (limited to 'src/quickcontrolstestutils/dialogstestutils.cpp')
| -rw-r--r-- | src/quickcontrolstestutils/dialogstestutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quickcontrolstestutils/dialogstestutils.cpp b/src/quickcontrolstestutils/dialogstestutils.cpp index 2b21f674d1..ed30d6f76b 100644 --- a/src/quickcontrolstestutils/dialogstestutils.cpp +++ b/src/quickcontrolstestutils/dialogstestutils.cpp @@ -13,7 +13,7 @@ #include <QtQuickTemplates2/private/qquickabstractbutton_p.h> #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h> #include <QtQuickTemplates2/private/qquickdialogbuttonbox_p.h> -#if QT_CONFIG(quick_listview) +#if QT_CONFIG(quick_listview) && QT_CONFIG(draganddrop) #include <QtQuickDialogs2QuickImpl/private/qquickfiledialogdelegate_p.h> #include <QtQuickDialogs2QuickImpl/private/qquickfolderbreadcrumbbar_p.h> #include <QtQuickDialogs2QuickImpl/private/qquickfolderbreadcrumbbar_p_p.h> @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -#if QT_CONFIG(quick_listview) +#if QT_CONFIG(quick_listview) && QT_CONFIG(draganddrop) bool QQuickDialogTestUtils::verifyFileDialogDelegates(QQuickListView *fileDialogListView, const QStringList &expectedFiles, QString &failureMessage) { @@ -111,7 +111,7 @@ bool QQuickDialogTestUtils::verifyBreadcrumbDelegates(QQuickFolderBreadcrumbBar return true; } -#endif +#endif // QT_CONFIG(quick_listview) && QT_CONFIG(draganddrop) QQuickAbstractButton *QQuickDialogTestUtils::findDialogButton(QQuickDialogButtonBox *box, const QString &buttonText) { |