From ed80fc1080a7861d5e5db4e21dab42775867cf14 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sun, 23 Jan 2022 23:21:40 +0100 Subject: [PATCH] Bug Fix: QRegularExpression-related compile error b31e65033c796d5dc7e557b3753c14f67be718f8 updated regexps to QRegularExpression for Qt6 compatibility, but did not include QRegularExpression.h. While this has apparently not been a problem in most environments, it breaks the build when using `CONFIG+=headless` (`CONFIG+="headless nosound"` is unaffected). This commit adds the includes. Fixes #2272 --- ChangeLog | 5 +++-- src/chatdlg.h | 1 + src/connectdlg.h | 1 + src/util.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bc9cb6453..7c3193298c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,8 +28,9 @@ (contributed by @ngocdh) - Client: Improved regex to highlight URLs in the chat window, avoiding terminating punctuation. - Also migrated from deprecated QRegExp to QRegularExpression, for future compatibility with Qt6 (#2124). - (contributed by @softins) + Also migrated from deprecated QRegExp to QRegularExpression, for future compatibility with + Qt6 (#2124, #2272, #2273). + (contributed by @softins, @corrados, @hoffie) - Client: Improved keyboard control of the list of Custom Directories (#2129). (contributed by @pljones) diff --git a/src/chatdlg.h b/src/chatdlg.h index 19c170640a..2c87dcfa4a 100644 --- a/src/chatdlg.h +++ b/src/chatdlg.h @@ -34,6 +34,7 @@ #include #include #include +#include #include "global.h" #include "util.h" #include "ui_chatdlgbase.h" diff --git a/src/connectdlg.h b/src/connectdlg.h index d4a5c64d7b..a2a63b1947 100644 --- a/src/connectdlg.h +++ b/src/connectdlg.h @@ -31,6 +31,7 @@ #include #include #include +#include #include "global.h" #include "util.h" #include "settings.h" diff --git a/src/util.h b/src/util.h index 6072c7727c..c1c2580f66 100644 --- a/src/util.h +++ b/src/util.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include