diff options
| author | Tim Blechmann <[email protected]> | 2025-07-01 10:08:04 +0800 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2025-07-03 11:11:53 +0000 |
| commit | 9671b49182f37f575eea5f0a38b67a2ba85bdd74 (patch) | |
| tree | 95d705d3224f2592597c5414a30818b426725ddf | |
| parent | fd1915aba413b2e01d1a0cd2a175b31f0d5f1e9b (diff) | |
QAPP_CHECK is defined in multiple cpp files. It should be undefined in
the end to prevent unity build failures.
Pick-to: 6.10
Change-Id: If01791a4022c88714aab2b798a70195c5b6a8613
Reviewed-by: Tor Arne Vestbø <[email protected]>
| -rw-r--r-- | src/gui/kernel/qaction.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qshortcut.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 1768cd8aa1a..f965a5a30e9 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -1325,4 +1325,6 @@ Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAction *action) QT_END_NAMESPACE +#undef QAPP_CHECK + #include "moc_qaction.cpp" diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp index 3f6822cb031..e730b5f9e8b 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/kernel/qshortcut.cpp @@ -577,4 +577,6 @@ bool QShortcut::event(QEvent *e) QT_END_NAMESPACE +#undef QAPP_CHECK + #include "moc_qshortcut.cpp" |