From: Manuel Nickschas Date: Fri, 14 Mar 2014 17:32:39 +0000 (+0100) Subject: Merge pull request #62 from Express50/issue_1243 X-Git-Tag: 0.10-rc1~6 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=272037b295143fa5400bf944aca7c9522887259e;hp=6ec86373070f98c4700f998d114d9a4e600f3335 Merge pull request #62 from Express50/issue_1243 Fix URL regex --- diff --git a/src/uisupport/clickable.cpp b/src/uisupport/clickable.cpp index 7acd8e22..3b32f267 100644 --- a/src/uisupport/clickable.cpp +++ b/src/uisupport/clickable.cpp @@ -55,7 +55,7 @@ ClickableList ClickableList::fromString(const QString &str) // For matching URLs static QString scheme("(?:(?:mailto:|(?:[+.-]?\\w)+://)|www(?=\\.\\S+\\.))"); static QString authority("(?:(?:[,.;@:]?[-\\w]+)+\\.?|\\[[0-9a-f:.]+\\])(?::\\d+)?"); - static QString urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*{}\\[\\]\\|'^-])"); + static QString urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*-])"); static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)"); static QRegExp regExp[] = {