vcl/inc/qt5/QtFrame.hxx | 4 ++++ vcl/qt5/QtFrame.cxx | 4 ++++ 2 files changed, 8 insertions(+)
New commits: commit c767e78e629721771c1b9b16b647963ef652732d Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Aug 16 09:52:41 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Aug 16 13:37:56 2024 +0200 Keep SessionManagerInhibitor disabled for Emscripten ...after 2f6f717073084b17e9be80e32a87200bacd1b74c "qt: Drop X11 condition for session/screensaver inhibition" caused > em++: warning: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/UnpackedTarball/argon2/libargon2.a: archive is missing an index; Use emar when creating libraries to ensure an index is created [-Wemcc] > em++: warning: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/UnpackedTarball/argon2/libargon2.a: adding index [-Wemcc] > wasm-ld: error: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/instdir/program/libvclplug_qt5lo.a(QtFrame.o): undefined symbol: SessionManagerInhibitor::inhibit(bool, std::__2::basic_string_view<char16_t, std::__2::char_traits<char16_t>>, ApplicationInhibitFlags, unsigned int, char const*) > wasm-ld: error: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/instdir/program/libvclplug_qt5lo.a(QtFrame.o): undefined symbol: SessionManagerInhibitor::inhibit(bool, std::__2::basic_string_view<char16_t, std::__2::char_traits<char16_t>>, ApplicationInhibitFlags, unsigned int, char const*) > em++: error: '/home/tdf/lode/emsdk/upstream/bin/wasm-ld @/tmp/emscripten_3x0hflai.rsp.utf-8' failed (returned 1) > make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_wasm/desktop/Executable_soffice_bin.mk:10: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/instdir/program/soffice.html] Error 1 (<https://ci.libreoffice.org/job/lo_daily_tb_linux_wasm/800/>). Most likely its implementation would not work on Emscripten, anyway. Change-Id: Ie7a643a8326df8c90645526930af21d54847a3ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171941 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx index 57a1b8cd1e2c..147c44b58085 100644 --- a/vcl/inc/qt5/QtFrame.hxx +++ b/vcl/inc/qt5/QtFrame.hxx @@ -33,7 +33,9 @@ #include <QtCore/QObject> +#if !defined EMSCRIPTEN #include <unx/sessioninhibitor.hxx> +#endif #if CHECK_ANY_QT_USING_X11 // any better way to get rid of the X11 / Qt type clashes? #undef Bool @@ -101,7 +103,9 @@ class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public SalFrame sal_uInt32 m_nRestoreScreen; QRect m_aRestoreGeometry; +#if !defined EMSCRIPTEN SessionManagerInhibitor m_SessionManagerInhibitor; +#endif #if CHECK_ANY_QT_USING_X11 ModKeyFlags m_nKeyModifiers; #endif diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx index 80c03174c221..e3bc65e185d1 100644 --- a/vcl/qt5/QtFrame.cxx +++ b/vcl/qt5/QtFrame.cxx @@ -745,6 +745,7 @@ void QtFrame::ShowFullScreen(bool bFullScreen, sal_Int32 nScreen) void QtFrame::StartPresentation(bool bStart) { +#if !defined EMSCRIPTEN assert(m_aSystemData.platform != SystemEnvData::Platform::Invalid); #if CHECK_QT5_USING_X11 @@ -760,6 +761,9 @@ void QtFrame::StartPresentation(bool bStart) #else m_SessionManagerInhibitor.inhibit(bStart, u"presentation", APPLICATION_INHIBIT_IDLE); #endif +#else + Q_UNUSED(bStart) +#endif } void QtFrame::SetAlwaysOnTop(bool bOnTop)
