use new plasma way of detecting platform

pull/2/head
Michail Vourlakos 7 years ago
parent 60531484e9
commit f41395abc3

@ -53,6 +53,7 @@
#define CRED "\e[0;31m"
inline void configureAboutData();
inline void detectPlatform(int argc, char **argv);
int main(int argc, char **argv)
{
@ -72,7 +73,16 @@ int main(int argc, char **argv)
}
QQuickWindow::setDefaultAlphaBuffer(true);
const bool qpaVariable = qEnvironmentVariableIsSet("QT_QPA_PLATFORM");
detectPlatform(argc, argv);
QApplication app(argc, argv);
if (!qpaVariable) {
// don't leak the env variable to processes we start
qunsetenv("QT_QPA_PLATFORM");
}
KQuickAddons::QtQuickSettings::init();
KLocalizedString::setApplicationDomain("latte-dock");
@ -281,3 +291,32 @@ inline void configureAboutData()
KAboutData::setApplicationData(about);
}
//! used the version provided by PW:KWorkspace
inline void detectPlatform(int argc, char **argv)
{
if (qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
return;
}
for (int i = 0; i < argc; i++) {
if (qstrcmp(argv[i], "-platform") == 0 ||
qstrcmp(argv[i], "--platform") == 0 ||
QByteArray(argv[i]).startsWith("-platform=") ||
QByteArray(argv[i]).startsWith("--platform=")) {
return;
}
}
const QByteArray sessionType = qgetenv("XDG_SESSION_TYPE");
if (sessionType.isEmpty()) {
return;
}
if (qstrcmp(sessionType, "wayland") == 0) {
qputenv("QT_QPA_PLATFORM", "wayland");
} else if (qstrcmp(sessionType, "x11") == 0) {
qputenv("QT_QPA_PLATFORM", "xcb");
}
}

Loading…
Cancel
Save