Little cleanup for Linux platform code & build

CheckCXXSourceCompiles is not needed anymore

Material wayland decorations could be checked just with IsQtPluginsBundled
This commit is contained in:
Ilya Fedin 2020-10-01 17:22:39 +04:00 committed by John Preston
parent 0536a479f9
commit 1d24d29afa
2 changed files with 2 additions and 7 deletions

View file

@ -21,7 +21,6 @@ add_subdirectory(lib_qr)
add_subdirectory(lib_webrtc) add_subdirectory(lib_webrtc)
add_subdirectory(codegen) add_subdirectory(codegen)
include(CheckCXXSourceCompiles)
include(lib_ui/cmake/generate_styles.cmake) include(lib_ui/cmake/generate_styles.cmake)
include(cmake/generate_numbers.cmake) include(cmake/generate_numbers.cmake)

View file

@ -1342,15 +1342,11 @@ void start() {
"this may lead to font issues."); "this may lead to font issues.");
#endif // DESKTOP_APP_USE_PACKAGED_FONTS #endif // DESKTOP_APP_USE_PACKAGED_FONTS
if(IsStaticBinary() if (IsQtPluginsBundled()) {
|| InAppImage()
|| InFlatpak()
|| InSnap()
|| IsQtPluginsBundled()) {
qputenv("QT_WAYLAND_DECORATION", "material"); qputenv("QT_WAYLAND_DECORATION", "material");
} }
if((IsStaticBinary() if ((IsStaticBinary()
|| InAppImage() || InAppImage()
|| IsQtPluginsBundled()) || IsQtPluginsBundled())
// it is handled by Qt for flatpak and snap // it is handled by Qt for flatpak and snap