From f5c29149fa02172314d8f1d607d7ee7364674fff Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sun, 30 Jun 2019 11:26:57 +0800 Subject: [PATCH] Skip the Wayland warning if QT_QPA_PLATFORM already set --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index b6769661bb..af7db7fbdd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char** argv) QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif #ifdef Q_OS_LINUX - if (qgetenv("XDG_SESSION_TYPE") == QByteArrayLiteral("wayland")) { + if (qgetenv("XDG_SESSION_TYPE") == QByteArrayLiteral("wayland") && qgetenv("QT_QPA_PLATFORM").isEmpty()) { qWarning() << "Warning: disregarding XDG_SESSION_TYPE=wayland"; qWarning() << "To use wayland anyway, please set QT_QPA_PLATFORM=wayland"; qunsetenv("XDG_SESSION_TYPE");