Merge branch 'master' into migrate-to-QJSEngine

# Conflicts:
#	appveyor.yml
#	build/depends.py
#	res/controllers/midi-components-0.0.js
#	src/controllers/controller.h
#	src/controllers/controllerengine.h
#	src/controllers/engine/colorjsproxy.cpp
#	src/controllers/engine/controllerengine.cpp
#	src/controllers/hid/hidcontroller.cpp
#	src/preferences/dialog/dlgpreferences.cpp
#	src/preferences/dialog/dlgpreferences.h
#	src/skin/skincontext.cpp
#	src/skin/skincontext.h
#	src/test/controller_preset_validation_test.cpp
#	src/test/controllerengine_test.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index d276514632..45319d95ce 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -23,7 +23,7 @@
 class MidiController : public Controller {
     Q_OBJECT
   public:
-    MidiController();
+    explicit MidiController();
     ~MidiController() override;
 
     ControllerJSProxy* jsProxy() override;