mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 12:46:35 +01:00
Merge branch 'v2.0'
This commit is contained in:
commit
ec64be807b
@ -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
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 3.4 KiB |
@ -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")) {
|
||||
|
@ -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)
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user