Changeset View
Changeset View
Standalone View
Standalone View
main_wayland.cpp
Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s) | 111 | if (m_xwaylandProcess) { | |||
---|---|---|---|---|---|
113 | while (m_xwaylandProcess->state() != QProcess::NotRunning) { | 113 | while (m_xwaylandProcess->state() != QProcess::NotRunning) { | ||
114 | processEvents(QEventLoop::WaitForMoreEvents); | 114 | processEvents(QEventLoop::WaitForMoreEvents); | ||
115 | } | 115 | } | ||
116 | waylandServer()->destroyXWaylandConnection(); | 116 | waylandServer()->destroyXWaylandConnection(); | ||
117 | } | 117 | } | ||
118 | if (QStyle *s = style()) { | 118 | if (QStyle *s = style()) { | ||
119 | s->unpolish(this); | 119 | s->unpolish(this); | ||
120 | } | 120 | } | ||
121 | //terminate connections after QGuiApplication::~QGuiApplication | ||||
122 | connect(this, &QObject::destroyed, [=]() { | ||||
121 | waylandServer()->terminateClientConnections(); | 123 | waylandServer()->terminateClientConnections(); | ||
124 | }); | ||||
122 | destroyCompositor(); | 125 | destroyCompositor(); | ||
123 | } | 126 | } | ||
124 | 127 | | |||
125 | void ApplicationWayland::performStartup() | 128 | void ApplicationWayland::performStartup() | ||
126 | { | 129 | { | ||
127 | setOperationMode(m_startXWayland ? OperationModeXwayland : OperationModeWaylandAndX11); | 130 | setOperationMode(m_startXWayland ? OperationModeXwayland : OperationModeWaylandAndX11); | ||
128 | // first load options - done internally by a different thread | 131 | // first load options - done internally by a different thread | ||
129 | createOptions(); | 132 | createOptions(); | ||
▲ Show 20 Lines • Show All 633 Lines • Show Last 20 Lines |