1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make autotests compile without draganddrop feature

Browse Source 
Disable tst_qdrag test itself, and put proper feature
guards in tst_event test.

Fixes: QTBUG-135806
Pick-to: 6.8
Change-Id: I80e41538488ba1df230551a97f18c8266c01bdb5
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit cb48788425b04338a60587b09c27bd5ed74b739f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Juha Vuolle 2025-04-08 17:00:33 +03:00 committed by Qt Cherry-pick Bot
parent a40fdae4e7
commit 1ae9914a32
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/gui/kernel/CMakeLists.txt
View File

@ -7,7 +7,9 @@ if(QT_FEATURE_action)
endif()
add_subdirectory(qbackingstore)
add_subdirectory(qcursor)
add_subdirectory(qdrag)
if(QT_FEATURE_draganddrop)
add_subdirectory(qdrag)
endif()
add_subdirectory(qevent)
add_subdirectory(qfileopenevent)
add_subdirectory(qguichronotimer)

20
tests/auto/gui/kernel/qevent/tst_qevent.cpp
View File

@ -53,6 +53,18 @@
#define X_QShortcutEvent(X)
#endif
#if QT_CONFIG(draganddrop)
#define X_QDropEvent(X) X(QDropEvent, ({}, {}, {}, {}, {}))
#define X_QDragMoveEvent(X) X(QDragMoveEvent, ({}, {}, {}, {}, {}))
#define X_QDragEnterEvent(X) X(QDragEnterEvent, ({}, {}, {}, {}, {}))
#define X_QDragLeaveEvent(X) X(QDragLeaveEvent, ())
#else
#define X_QDropEvent(X)
#define X_QDragMoveEvent(X)
#define X_QDragEnterEvent(X)
#define X_QDragLeaveEvent(X)
#endif
#define FOR_EACH_CORE_EVENT(X) \
/* qcoreevent.h */ \
X(QEvent, (QEvent::None)) \
@ -89,10 +101,10 @@
X(QContextMenuEvent, (QContextMenuEvent::Reason::Keyboard, {}, {})) \
X(QInputMethodEvent, ()) \
X(QInputMethodQueryEvent, ({})) \
X(QDropEvent, ({}, {}, {}, {}, {})) \
X(QDragMoveEvent, ({}, {}, {}, {}, {})) \
X(QDragEnterEvent, ({}, {}, {}, {}, {})) \
X(QDragLeaveEvent, ()) \
X_QDropEvent(X) \
X_QDragMoveEvent(X) \
X_QDragEnterEvent(X) \
X_QDragLeaveEvent(X) \
X(QHelpEvent, ({}, {}, {})) \
X(QStatusTipEvent, ({})) \
X_QWhatsThisClickedEvent(X) \