mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-23 20:14:05 +00:00
fix: force wayland should work for BSD, also remove a unnecessary env check for macOS
This commit is contained in:
parent
4d48ab8f40
commit
30572321f7
|
@ -307,7 +307,7 @@ void processCommandLine( QCoreApplication * app, GDOptions * result )
|
|||
|
||||
int main( int argc, char ** argv )
|
||||
{
|
||||
#ifdef Q_OS_UNIX
|
||||
#if defined( Q_OS_UNIX ) && !defined( Q_OS_MACOS )
|
||||
// GoldenDict use lots of X11 functions and it currently cannot work
|
||||
// natively on Wayland. This workaround will force GoldenDict to use
|
||||
// XWayland.
|
||||
|
|
|
@ -2856,7 +2856,7 @@ void MainWindow::toggleMainWindow( bool onlyShow )
|
|||
|
||||
void MainWindow::installHotKeys()
|
||||
{
|
||||
#if defined( Q_OS_LINUX )
|
||||
#if defined( Q_OS_UNIX ) && !defined( Q_OS_MACOS )
|
||||
if ( !qEnvironmentVariableIsEmpty( "GOLDENDICT_FORCE_WAYLAND" ) ) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ nav:
|
|||
- Custom transliteration: topic_transliteration.md
|
||||
- Customize Dictionary: custom_dictionary.md
|
||||
- OCR Integration: howto/ocr.md
|
||||
- Wayland/Linux: topic_wayland.md
|
||||
- Wayland: topic_wayland.md
|
||||
- Report Bugs & Feedbacks: feedbacks.md
|
||||
- Contributor Guides:
|
||||
- Developer: developer.md
|
||||
|
|
Loading…
Reference in a new issue