diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-14 13:03:46 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-19 13:53:21 +0100 |
| commit | 26e876912435bdafbca2b425af43824d7ec5b876 (patch) | |
| tree | b7ee83cdd9de18ce5970bab0bb217a972d3d2445 /src/widgets/util/qundostack_p.h | |
| parent | 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6bc (diff) | |
| parent | bac999f38ca10147832846f6d7df1e4a051d3760 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
Diffstat (limited to 'src/widgets/util/qundostack_p.h')
| -rw-r--r-- | src/widgets/util/qundostack_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h index 05c9e0d27e..c44cdd6603 100644 --- a/src/widgets/util/qundostack_p.h +++ b/src/widgets/util/qundostack_p.h @@ -44,7 +44,9 @@ #include <private/qobject_p.h> #include <QtCore/qlist.h> #include <QtCore/qstring.h> -#include <QtWidgets/qaction.h> +#if QT_CONFIG(action) +# include <QtWidgets/qaction.h> +#endif #include "qundostack.h" |