1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
This commit is contained in:
nowrep 2011-10-01 17:55:10 +02:00
parent 9c0f5af200
commit b526e99c0f
5 changed files with 9 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@ -671,7 +671,7 @@ bool MainApplication::checkSettingsDir()
versionFile.write(QupZilla::VERSION.toAscii()); versionFile.write(QupZilla::VERSION.toAscii());
versionFile.close(); versionFile.close();
if (rData.contains("1.0.0-b1")) // Data not changed from this version if (rData.contains("1.0.0-b3")) // Data not changed from this version
return true; return true;
dir.mkdir("profiles"); dir.mkdir("profiles");

View File

@ -19,7 +19,7 @@
#define QUPZILLA_H #define QUPZILLA_H
//Comment for release building //Comment for release building
#define DEVELOPING //#define DEVELOPING
#ifdef QT_NO_DEBUG #ifdef QT_NO_DEBUG
#ifdef DEVELOPING #ifdef DEVELOPING

View File

@ -112,7 +112,7 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
case QStyle::SP_ArrowForward: case QStyle::SP_ArrowForward:
return QIcon(":/icons/faenza/forward.png"); return QIcon(":/icons/faenza/forward.png");
case QStyle::QStyle::SP_ArrowBack: case QStyle::SP_ArrowBack:
return QIcon(":/icons/faenza/back.png"); return QIcon(":/icons/faenza/back.png");
default: default:
@ -140,7 +140,7 @@ QPixmap IconProvider::standardPixmap(QStyle::StandardPixmap icon)
case QStyle::SP_ArrowForward: case QStyle::SP_ArrowForward:
return QPixmap(":/icons/faenza/forward.png"); return QPixmap(":/icons/faenza/forward.png");
case QStyle::QStyle::SP_ArrowBack: case QStyle::SP_ArrowBack:
return QPixmap(":/icons/faenza/back.png"); return QPixmap(":/icons/faenza/back.png");
default: default:

View File

@ -757,8 +757,11 @@ void WebView::load(const QUrl &url)
if (QFile::exists(url.path())) if (QFile::exists(url.path()))
#endif #endif
QWebView::load(url); QWebView::load(url);
else else {
QWebView::load(QUrl("http://www.google.com/search?client=qupzilla&q="+url.toString())); QString urlString = "http://www.google.com/search?client=qupzilla&q=" + url.toString();
QWebView::load(QUrl(urlString));
m_locationBar->setText(urlString);
}
} }
QUrl WebView::url() const QUrl WebView::url() const