anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#11682 amend change 4d4dc96b06 - check Qt version for all Qt::ApplicationState occurances

Browse Source
This commit is contained in:
Stephan Witt 2021-02-08 09:04:18 +01:00
parent 3c16d627da
commit 80e20e86be
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt/GuiApplication.cpp
View File

@ -944,7 +944,10 @@ public:
struct GuiApplication::Private
{
Private(): language_model_(nullptr), meta_fake_bit(NoModifier),
global_menubar_(nullptr), last_state_(Qt::ApplicationInactive)
global_menubar_(nullptr)
#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))
, last_state_(Qt::ApplicationInactive)
#endif
{
#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400)
#if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
@ -1011,8 +1014,10 @@ struct GuiApplication::Private
/// Only used on mac.
QMenuBar * global_menubar_;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0))
/// Holds previous application state on Mac
Qt::ApplicationState last_state_;
#endif
#ifdef Q_OS_MAC
/// Linkback mime handler for MacOSX.