AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build without features.action

Browse Source 
Change-Id: Ia776cdcb36d07bb89f39c631029458adf2187d90
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tasuku Suzuki 2019-07-04 11:10:44 +09:00
parent 4cb0749250
commit 6b26b2ee03
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/styles/qwindowsstyle.cpp
View File

@ -84,6 +84,7 @@
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <private/qguiapplication_p.h> #include <private/qguiapplication_p.h>
#include <private/qhighdpiscaling_p.h> #include <private/qhighdpiscaling_p.h>
#include <private/qwidget_p.h>
#include <private/qstylehelper_p.h> #include <private/qstylehelper_p.h>
#if QT_CONFIG(animation) #if QT_CONFIG(animation)

2
src/widgets/widgets/qmdisubwindow.cpp
View File

@ -1986,7 +1986,7 @@ void QMdiSubWindowPrivate::updateActions()
for (int i = 0; i < NumWindowStateActions; ++i) for (int i = 0; i < NumWindowStateActions; ++i)
setVisible(WindowStateAction(i), false); setVisible(WindowStateAction(i), false);
#ifdef Q_OS_MACOS #if defined(Q_OS_MACOS) && QT_CONFIG(action)
if (q_func()->style()->inherits("QMacStyle")) if (q_func()->style()->inherits("QMacStyle"))
for (int i = 0; i < NumWindowStateActions; ++i) for (int i = 0; i < NumWindowStateActions; ++i)
if (QAction *action = actions[i]) if (QAction *action = actions[i])