diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index be2e0a37c..1917cc03d 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -923,9 +923,6 @@ void MainApplication::loadTheme(const QString &name) QString qss = QzTools::readAllFileContents(activeThemePath + QLatin1String("/main.css")); - // #id[style=QtStyle] (QtStyle = QMacStyle, QWindowsVistaStyle, QGtkStyle, ...) - // should be enough instead of loading special stylesheets - #if defined(Q_OS_MAC) qss.append(QzTools::readAllFileContents(activeThemePath + QLatin1String("/linux.css"))); #elif defined(Q_OS_UNIX) @@ -939,7 +936,7 @@ void MainApplication::loadTheme(const QString &name) } QString relativePath = QDir::current().relativeFilePath(activeThemePath); - qss.replace(QzRegExp(QLatin1String("url\\s*\\(\\s*([^\\*:\\);]+)\\s*\\)"), Qt::CaseSensitive), QString("url(%1\\1)").arg(relativePath + "/")); + qss.replace(QzRegExp(QSL("url\\s*\\(\\s*([^\\*:\\);]+)\\s*\\)"), Qt::CaseSensitive), QString("url(%1/\\1)").arg(relativePath)); setStyleSheet(qss); } diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp index 59e2a4102..d6052a135 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp +++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp @@ -167,9 +167,9 @@ QString QupZillaSchemeReply::reportbugPage() bPage.replace(QLatin1String("%INFO_OS%"), QzTools::operatingSystem()); bPage.replace(QLatin1String("%INFO_APP%"), #ifdef GIT_REVISION - QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) + QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) #else - Qz::VERSION + Qz::VERSION #endif ); bPage.replace(QLatin1String("%INFO_QT%"), QString("%1 (built with %2)").arg(qVersion(), QT_VERSION_STR)); @@ -222,9 +222,9 @@ QString QupZillaSchemeReply::aboutPage() aPage.replace(QLatin1String("%VERSION-INFO%"), QString("
%1
%2
").arg(tr("Version"), #ifdef GIT_REVISION - QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) + QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) #else - Qz::VERSION + Qz::VERSION #endif ) + QString("
%1
%2
").arg(tr("WebKit version"), qWebKitVersion())); @@ -391,9 +391,9 @@ QString QupZillaSchemeReply::configPage() cPage.replace(QLatin1String("%VERSION-INFO%"), QString("
%1
%2
").arg(tr("Application version"), #ifdef GIT_REVISION - QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) + QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) #else - Qz::VERSION + Qz::VERSION #endif ) + QString("
%1
%2
").arg(tr("Qt version"), QT_VERSION_STR) + diff --git a/src/lib/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp index 697df0ba4..8135d50bf 100644 --- a/src/lib/other/aboutdialog.cpp +++ b/src/lib/other/aboutdialog.cpp @@ -68,11 +68,11 @@ void AboutDialog::showAbout() m_aboutHtml += "
"; m_aboutHtml += tr("

Application version %1
").arg( #ifdef GIT_REVISION - QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) + QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) #else - Qz::VERSION + Qz::VERSION #endif - ); + ); m_aboutHtml += tr("WebKit version %1

").arg(qWebKitVersion()); m_aboutHtml += QString("

© %1 %2
").arg(Qz::COPYRIGHT, Qz::AUTHOR); m_aboutHtml += tr("Build time: %1

").arg(Qz::BUILDTIME);