mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
1.0.0-b4
This commit is contained in:
parent
9c0f5af200
commit
b526e99c0f
Binary file not shown.
Before Width: | Height: | Size: 16 KiB |
|
@ -671,7 +671,7 @@ bool MainApplication::checkSettingsDir()
|
|||
versionFile.write(QupZilla::VERSION.toAscii());
|
||||
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;
|
||||
|
||||
dir.mkdir("profiles");
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#define QUPZILLA_H
|
||||
|
||||
//Comment for release building
|
||||
#define DEVELOPING
|
||||
//#define DEVELOPING
|
||||
|
||||
#ifdef QT_NO_DEBUG
|
||||
#ifdef DEVELOPING
|
||||
|
|
|
@ -112,7 +112,7 @@ QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
|
|||
case QStyle::SP_ArrowForward:
|
||||
return QIcon(":/icons/faenza/forward.png");
|
||||
|
||||
case QStyle::QStyle::SP_ArrowBack:
|
||||
case QStyle::SP_ArrowBack:
|
||||
return QIcon(":/icons/faenza/back.png");
|
||||
|
||||
default:
|
||||
|
@ -140,7 +140,7 @@ QPixmap IconProvider::standardPixmap(QStyle::StandardPixmap icon)
|
|||
case QStyle::SP_ArrowForward:
|
||||
return QPixmap(":/icons/faenza/forward.png");
|
||||
|
||||
case QStyle::QStyle::SP_ArrowBack:
|
||||
case QStyle::SP_ArrowBack:
|
||||
return QPixmap(":/icons/faenza/back.png");
|
||||
|
||||
default:
|
||||
|
|
|
@ -757,8 +757,11 @@ void WebView::load(const QUrl &url)
|
|||
if (QFile::exists(url.path()))
|
||||
#endif
|
||||
QWebView::load(url);
|
||||
else
|
||||
QWebView::load(QUrl("http://www.google.com/search?client=qupzilla&q="+url.toString()));
|
||||
else {
|
||||
QString urlString = "http://www.google.com/search?client=qupzilla&q=" + url.toString();
|
||||
QWebView::load(QUrl(urlString));
|
||||
m_locationBar->setText(urlString);
|
||||
}
|
||||
}
|
||||
|
||||
QUrl WebView::url() const
|
||||
|
|
Loading…
Reference in New Issue
Block a user