Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip the Wayland warning if QT_QPA_PLATFORM already set #3341

Merged
merged 1 commit into from Jul 7, 2019
Merged

Skip the Wayland warning if QT_QPA_PLATFORM already set #3341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main.cpp
View file
Open in desktop
Expand Up @@ -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");
Expand Down