# HG changeset patch # User Rik # Date 1572707020 25200 # Node ID 1c13a0f36160d30cd50946a0532d9d23f0ce5601 # Parent 83c1d4f75a3601f722509f013104e4a6fd0cfd05 Temporarily disable code in cset d0fe6e344c41 (bug #55940) Disable code using #if 0 / #endif until configure test can be written to distinguish between Mac libraries which have different function prototypes for objc_mseSend(). * octave-qobject.cc: Surround code from cset d0fe6e344c41 with #if 0 / #endif. diff -r 83c1d4f75a36 -r 1c13a0f36160 libgui/src/octave-qobject.cc --- a/libgui/src/octave-qobject.cc Sat Nov 02 09:45:09 2019 +0100 +++ b/libgui/src/octave-qobject.cc Sat Nov 02 08:03:40 2019 -0700 @@ -41,11 +41,14 @@ #include "qt-interpreter-events.h" #include "resource-manager.h" +// Bug #55940 (Disable App Nap on Mac) +#if 0 #if defined (Q_OS_MAC) // ObjC interface is needed for App Nap control # include # include #endif +#endif #include "oct-env.h" #include "version.h" @@ -139,11 +142,15 @@ qRegisterMetaType ("octave_value_list"); + +// Bug #55940 (Disable App Nap on Mac) +#if 0 #if defined (Q_OS_MAC) // Mac App Nap feature causes pause() and sleep() to misbehave. // Disable it for the entire program run. disable_app_nap (); #endif +#endif // Force left-to-right alignment (see bug #46204) m_qapplication->setLayoutDirection (Qt::LeftToRight); @@ -183,6 +190,8 @@ string_vector::delete_c_str_vec (m_argv); } +// Bug #55940 (Disable App Nap on Mac) +#if 0 #if defined (Q_OS_MAC) // FIXME: Does this need to be a private member function of base_qobject? // Or should it be a file local static function? @@ -230,6 +239,7 @@ reason_string); } #endif +#endif void base_qobject::config_translators (void) {