diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-01-11 14:34:52 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-11 14:34:52 +0100 |
commit | 9d03865ce382680ead361bb1779fe2ab062b6086 (patch) | |
tree | 3d7f94068d416b32ad6904a7773890a0cfba1970 /src/plugins/macros | |
parent | b65c13c6a5c1d9447b6b04cef5a14b2204dadcf9 (diff) | |
parent | 57e27915f444c95e845b3b2790e2e97fde4c465c (diff) |
Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: I88e4d82b9453274fa2575332aa465cb965e20808
Diffstat (limited to 'src/plugins/macros')
-rw-r--r-- | src/plugins/macros/macrooptionswidget.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index a55849d50bc..b49d6eeab09 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -35,6 +35,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/id.h> +#include <QAction> #include <QDir> #include <QFileInfo> #include <QTreeWidget> |