Merge remote-tracking branch 'origin/4.5' into 4.6

Change-Id: I88e4d82b9453274fa2575332aa465cb965e20808
2018-01-11 14:34:52 +01:00
parent b65c13c6a5 57e27915f4
commit 9d03865ce3
6 changed files with 7 additions and 0 deletions
--- 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>