Skip the Wayland warning if QT_QPA_PLATFORM already set

This commit is contained in:
Chih-Hsuan Yen 2019-06-30 11:26:57 +08:00 committed by Jonathan White
parent 2a8b52a014
commit 65cec901d5

View File

@ -55,7 +55,7 @@ int main(int argc, char** argv)
#endif
#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");