diff --git a/src/Mogan/Research/research.cpp b/src/Mogan/Research/research.cpp index 137eebe517..e4ad22d767 100644 --- a/src/Mogan/Research/research.cpp +++ b/src/Mogan/Research/research.cpp @@ -209,12 +209,6 @@ main (int argc, char** argv) { else if (theme != "") tm_style_sheet= theme; #if !defined(OS_MINGW) && !defined(OS_WIN) set_env ("LC_NUMERIC", "POSIX"); -#ifndef OS_MACOS -#ifndef OS_WASM - set_env ("QT_QPA_PLATFORM", "xcb"); - set_env ("XDG_SESSION_TYPE", "x11"); -#endif -#endif #endif #ifdef MACOSX_EXTENSIONS // Reset TeXmacs if Alt is pressed during startup diff --git a/src/Plugins/Qt/qt_gui.cpp b/src/Plugins/Qt/qt_gui.cpp index 0211b90be5..e85dcce671 100644 --- a/src/Plugins/Qt/qt_gui.cpp +++ b/src/Plugins/Qt/qt_gui.cpp @@ -73,6 +73,9 @@ #ifdef qt_static_plugin_xcb Q_IMPORT_PLUGIN (QXcbIntegrationPlugin) #endif +#ifdef qt_static_plugin_qwayland +Q_IMPORT_PLUGIN (QWaylandIntegrationPlugin) +#endif #ifdef qt_static_plugin_qjpeg Q_IMPORT_PLUGIN (qjpeg) #endif @@ -194,8 +197,13 @@ qt_gui_rep::qt_gui_rep (int& argc, char** argv) debug_boot << "Screen extents: " << w / PIXEL << " x " << h / PIXEL << "\n"; if (min (w, h) >= 1440 * PIXEL) { - retina_zoom = 2; - retina_scale= (tm_style_sheet == "" ? 1.0 : 1.6666); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + if (QGuiApplication::platformName () != "wayland") +#endif + { + retina_zoom = 2; + retina_scale= (tm_style_sheet == "" ? 1.0 : 1.6666); + } if (!retina_iman) { retina_iman = true; retina_icons= 2;