Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Merge branch 'v2.0'

Browse Source
This commit is contained in:
David Rosca 2016-06-14 12:15:48 +02:00
commit ec64be807b
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/app/browserwindow.cpp
View File

@ -1443,7 +1443,7 @@ bool BrowserWindow::restoreState(const QByteArray &state, int version)
#ifdef QZ_WS_X11
int BrowserWindow::getCurrentVirtualDesktop() const
{
if (!QX11Info::isPlatformX11())
if (QGuiApplication::platformName() != QL1S("xcb"))
return 0;
xcb_intern_atom_cookie_t intern_atom;
@ -1481,7 +1481,7 @@ error:
void BrowserWindow::moveToVirtualDesktop(int desktopId)
{
if (!QX11Info::isPlatformX11())
if (QGuiApplication::platformName() != QL1S("xcb"))
return;
// Don't move when window is already visible or it is first app window

BIN
src/lib/data/html/broken-page.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

1
src/lib/plugins/speeddial.cpp
View File

@ -346,7 +346,6 @@ void SpeedDial::thumbnailCreated(const QPixmap &pixmap)
if (pixmap.isNull()) {
fileName = "qrc:/html/broken-page.png";
title = tr("Unable to load");
loadTitle = true;
}
else {
if (!pixmap.save(fileName, "PNG")) {

8
src/lib/preferences/useragentdialog.cpp
View File

@ -37,7 +37,13 @@ UserAgentDialog::UserAgentDialog(QWidget* parent)
ui->globalComboBox->setLayoutDirection(Qt::LeftToRight);
ui->table->setLayoutDirection(Qt::LeftToRight);
const QString os = QzTools::operatingSystemLong();
QString os = QzTools::operatingSystemLong();
#ifdef Q_OS_UNIX
if (QGuiApplication::platformName() == QL1S("xcb"))
os.prepend(QL1S("X11; "));
else if (QGuiApplication::platformName().startsWith(QL1S("wayland")))
os.prepend(QL1S("Wayland; "));
#endif
m_knownUserAgents << QString("Opera/9.80 (%1) Presto/2.12.388 Version/12.16").arg(os)
<< QString("Mozilla/5.0 (%1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.84 Safari/537.36").arg(os)

2
src/lib/tools/qztools.cpp
View File

@ -811,7 +811,7 @@ bool QzTools::startExternalProcess(const QString &executable, const QString &arg
void QzTools::setWmClass(const QString &name, const QWidget* widget)
{
#ifdef QZ_WS_X11
if (!QX11Info::isPlatformX11())
if (QGuiApplication::platformName() != QL1S("xcb"))
return;
const QByteArray &nameData = name.toUtf8();