git.iko.soy/unity8
on xenial help sign in
Specify QPA platform to mirserver if we use wayland as client QPA
b377476Marius Gripsgard
src/main.cpp+9−1
compare with xenial
unifiedsplit
@@ -28,9 +28,17 @@ int main(int argc, const char *argv[])
28 qSetMessagePattern("[%{time yyyy-MM-dd:hh:mm:ss.zzz}] %{if-category}%{category}: %{endif}%{message}");
28 qSetMessagePattern("[%{time yyyy-MM-dd:hh:mm:ss.zzz}] %{if-category}%{category}: %{endif}%{message}");
29
29
30 bool isMirServer = qgetenv("QT_QPA_PLATFORM") == "mirserver";
30 bool isMirServer = qgetenv("QT_QPA_PLATFORM") == "mirserver";
31− if (!isMirServer && qgetenv("QT_QPA_PLATFORM") == "ubuntumirclient") {
31+ if (qgetenv("QT_QPA_PLATFORM") == "ubuntumirclient" || qgetenv("QT_QPA_PLATFORM") == "wayland") {
32 setenv("QT_QPA_PLATFORM", "mirserver", 1 /* overwrite */);
32 setenv("QT_QPA_PLATFORM", "mirserver", 1 /* overwrite */);
33 isMirServer = true;
33 isMirServer = true;
34+
35+ qInfo("Using mirserver qt platform");
36+ }
37+
38+ // If we are not running using nested mir, we need to set cursor to null
39+ if (!qEnvironmentVariableIsSet("MIR_SERVER_HOST_SOCKET")) {
40+ qInfo("Not using nested server, using null mir cursor");
41+ setenv("MIR_SERVER_CURSOR", "null", 1);
34 }
42 }
35
43
36 if (enableQmlDebugger(argc, argv)) {
44 if (enableQmlDebugger(argc, argv)) {