1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr649'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-06 18:39:48 +01:00
commit 2c2e934969
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -33,7 +33,7 @@ QString MessageAction::getMessage(QString div)
message_ = toHtmlChars(message); message_ = toHtmlChars(message);
// detect urls // detect urls
QRegExp exp("(?:\\b)(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+"); QRegExp exp("(?:\\b)(www\\.|http[s]?:\\/\\/|ftp:\\/\\/|tox:\\/\\/|tox:)\\S+");
int offset = 0; int offset = 0;
while ((offset = exp.indexIn(message_, offset)) != -1) while ((offset = exp.indexIn(message_, offset)) != -1)
{ {