- Added special build time option for Flatpak/Wayland (cmake -DCONFIG…

…_WAYLAND=ON ...)
rncbc · Mar 1, 2022 · 1f59a7b · 1f59a7b
1 parent 1512ee4
commit 1f59a7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,6 +87,8 @@ option (CONFIG_GRADIENT "Enable gradient eye-candy (default=yes)" 1)
 # Enable debugger stack-trace option (assumes --enable-debug).
 option (CONFIG_STACKTRACE "Enable debugger stack-trace (default=no)" 0)
 
+# Enable Wayland support option.
+option (CONFIG_WAYLAND "Enable Wayland support (EXPERIMENTAL) (default=no)" 0)
 
 # Enable Qt6 build preference.
 option (CONFIG_QT6 "Enable Qt6 build (default=yes)" 1)

diff --git a/src/config.h.cmake b/src/config.h.cmake
@@ -127,4 +127,7 @@
 /* Define if fluid_free function is available. */
 #cmakedefine CONFIG_FLUID_FREE @CONFIG_FLUID_FREE@
 
+/* Define if Wayland is supported */
+#cmakedefine CONFIG_WAYLAND @CONFIG_WAYLAND@
+
 #endif /* CONFIG_H */
diff --git a/src/qsynth.cpp b/src/qsynth.cpp
@@ -526,7 +526,7 @@ int main ( int argc, char **argv )
 	::signal(SIGBUS,  stacktrace);
 #endif
 #endif
-#if defined(Q_OS_LINUX)
+#if defined(Q_OS_LINUX) && !defined(CONFIG_WAYLAND)
 	::setenv("QT_QPA_PLATFORM", "xcb", 0);
 #endif
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)