1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00

[Fix] Fixed showing url's in locationbar. Regression from da3d929

This commit is contained in:
nowrep 2012-02-22 19:12:22 +01:00
parent 80f8f99ce2
commit 9a59711b78
3 changed files with 12 additions and 3 deletions

View File

@ -17,5 +17,6 @@ TRANSLATIONS += cs_CZ.ts\
sr_RS.ts\ sr_RS.ts\
de_DE.ts\ de_DE.ts\
el_GR.ts\ el_GR.ts\
id_ID.ts\
include(../../plugins.pri) include(../../plugins.pri)

View File

@ -151,8 +151,16 @@ QUrl qz_makeRelativeUrl(const QUrl &baseUrl, const QUrl &rUrl)
QString qz_urlEncodeQueryString(const QUrl &url) QString qz_urlEncodeQueryString(const QUrl &url)
{ {
QString returnString = url.toString(QUrl::RemoveQuery | QUrl::RemoveFragment); QString returnString = url.toString(QUrl::RemoveQuery | QUrl::RemoveFragment);
returnString.append(url.encodedQuery());
returnString.append(url.encodedFragment()); if (url.hasQuery()) {
returnString.append("?");
returnString.append(url.encodedQuery());
}
if (url.hasFragment()) {
returnString.append("#");
returnString.append(url.encodedFragment());
}
return returnString; return returnString;
} }

View File

@ -1,4 +1,4 @@
<?php <?php
// Header + Footer // Header + Footer
$site_title = "QupZilla - Peramban multiplatform ringan"; $site_title = "QupZilla - Peramban multiplatform ringan";
$qupzilla = "QupZilla"; $qupzilla = "QupZilla";