diff --git a/src/main.cpp b/src/main.cpp index a518c2e515..10f962d4be 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,6 +66,8 @@ #endif #if defined( Q_OS_MACOS ) # include "mac/activity.h" +#endif +#if defined( Q_OS_MACOS ) && !defined( HEADLESS ) extern void qt_set_sequence_auto_mnemonic ( bool bEnable ); #endif #include @@ -82,7 +84,7 @@ extern void qt_set_sequence_auto_mnemonic ( bool bEnable ); int main ( int argc, char** argv ) { -#if defined( Q_OS_MACOS ) +#if defined( Q_OS_MACOS ) && !defined( HEADLESS ) // Mnemonic keys are default disabled in Qt for MacOS. The following function enables them. // Qt will not show these with underline characters in the GUI on MacOS. (#1873) qt_set_sequence_auto_mnemonic ( true ); @@ -909,7 +911,7 @@ int main ( int argc, char** argv ) // For accessible support we need to add a plugin to qt. The plugin has to // be located in the install directory of the software by the installer. // Here, we set the path to our application path. - QDir ApplDir ( QApplication::applicationDirPath() ); + QDir ApplDir ( QCoreApplication::applicationDirPath() ); pApp->addLibraryPath ( QString ( ApplDir.absolutePath() ) ); #endif diff --git a/src/sound/coreaudio-mac/sound.h b/src/sound/coreaudio-mac/sound.h index 9ee2796578..970c63718f 100644 --- a/src/sound/coreaudio-mac/sound.h +++ b/src/sound/coreaudio-mac/sound.h @@ -50,7 +50,6 @@ #include #include #include -#include #include "../soundbase.h" #include "../../global.h"