Skip to content

Bug Fix: Fix QRegularExpression-related compile error #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoffie merged 1 commit into from
Jan 25, 2022
Merged

Bug Fix: Fix QRegularExpression-related compile error #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/chatdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <QAccessible>
#include <QDesktopServices>
#include <QMessageBox>
#include <QRegularExpression>
#include "global.h"
#include "util.h"
#include "ui_chatdlgbase.h"
Expand Down
1 change: 1 addition & 0 deletions src/connectdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <QTimer>
#include <QLocale>
#include <QtConcurrent>
#include <QRegularExpression>
#include "global.h"
#include "util.h"
#include "settings.h"
Expand Down
1 change: 1 addition & 0 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#endif
#include <QFile>
#include <QDirIterator>
#include <QRegularExpression>
#include <QTranslator>
#include <QLibraryInfo>
#include <QUrl>
Expand Down