summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-21 00:07:08 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-21 00:07:08 +0200
commit4743d3b6f7c1dd2fe9b04c3094d5ec2aebcf0d68 (patch)
tree8fdd269044a9bbaeca09ba4b245059a0bb2ec4fe
parentFix developers panel handling (diff)
parentadd local file detection (diff)
downloadrekonq-4743d3b6f7c1dd2fe9b04c3094d5ec2aebcf0d68.tar.xz
Merge commit 'refs/merge-requests/2267' of git://gitorious.org/rekonq/mainline into m2267
-rw-r--r--src/urlbar/urlresolver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 4313d569..21e3fe9c 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -76,6 +76,8 @@ UrlResolver::UrlResolver(const QString &typedUrl)
QString protocol = "^(http://|https://|file://|ftp://)";
+ QString local = "^/";
+
QString ipv4 = "^0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])"\
"\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
@@ -89,7 +91,7 @@ UrlResolver::UrlResolver(const QString &typedUrl)
"y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\
"pro)";
- _browseRegexp = QRegExp("(" + protocol + ")|(" + address + ")|(" + ipv6 + ")|(" + ipv4 +")");
+ _browseRegexp = QRegExp("(" + protocol + ")|(" + local + ")|(" + address + ")|(" + ipv6 + ")|(" + ipv4 +")");
}
}