Merge remote-tracking branch 'origin/master' into cdrom_changes

src/qt/qt_openglrenderer.cpp

@@ -174,7 +174,7 @@ OpenGLRenderer::compile_shader(GLenum shader_type, const char *prepend, const ch
     const char *source[3];
     char        version[50];
     int         ver         = 0;
-    char       *version_loc = strstr(program, "#version");
+    char       *version_loc = (char *) strstr(program, "#version");
     if (version_loc)
         ver = (int) strtol(version_loc + 8, (char **) &program, 10);
     else {

src/qt/qt_openglrenderer.hpp

@@ -70,7 +70,7 @@ public:
     void     finalize() override final;
     bool     hasOptions() const override { return true; }
     QDialog *getOptions(QWidget *parent) override;
-    bool     reloadRendererOption() { return true; }
+    bool     reloadRendererOption() override { return true; }
 
 signals:
     void initialized();