From a1cf84572d84af1b4373228987f0ef531258908c Mon Sep 17 00:00:00 2001 From: David Rosca Date: Tue, 14 Jun 2016 11:53:20 +0200 Subject: [PATCH] Use platformName() to check for X11 platform --- src/lib/app/browserwindow.cpp | 4 ++-- src/lib/tools/qztools.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 6232cdbbe..8405146d6 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -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 diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index 60aa3fddf..5b8459d76 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -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();