Merge branch 'EraseAction' of github.com:Nordsoft91/vcmi into EraseAction

.github/workflows/github.yml

@@ -5,6 +5,7 @@ on:
       branches:
         - features/*
         - develop
+        - cpp-map-editor
     pull_request:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -46,7 +47,7 @@ jobs:
             pack: 1
             cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
             extension: exe
-            cmake_args: -G Ninja
+            cmake_args: -G Ninja -DENABLE_EDITOR=0
           - platform: msvc
             os: windows-latest
             test: 0

.travis.yml

@@ -41,7 +41,7 @@ addons:
     notification_email: coverity@arseniyshestakov.com
     build_command_prepend: cov-configure --compiler clang-3.6 --comptype clangcc &&
       cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja ..
-      -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0
+      -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=0 -DENABLE_EDITOR=0
     build_command: ninja -j 3
     branch_pattern: coverity_scan
 

mapeditor/mainwindow.cpp

@@ -2,7 +2,6 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
-#include <QApplication.h>
 #include <QFileDialog>
 #include <QFile>
 #include <QMessageBox>

mapeditor/spoiler.cpp

@@ -1,7 +1,7 @@
 #include "StdInc.h"
 #include <QPropertyAnimation>
 
-#include "Spoiler.h"
+#include "spoiler.h"
 
 Spoiler::Spoiler(const QString & title, const int animationDuration, QWidget *parent) : QWidget(parent), animationDuration(animationDuration)
 {