Removed extra X11 dependencies + Qt5 fixes

scripts/gen_actor_source.py

@@ -922,6 +922,10 @@ class Gui:
         if "menus" in json_node:
             for menu in json_node["menus"]:
                 self.menus.append(MenuItem(menu))
+        if "optional" in json_node:
+            self.optional = json_node["optional"]
+        else:
+            self.optional = False
 
     def get_icon_name(self, role):
         """
@@ -1507,6 +1511,8 @@ private:
         """
         if self._module.gui:
             guiRequired = "true"
+            if self._module.gui.optional:
+                guiRequired = "false"
         else:
             guiRequired = "false"
         return """

src/actors/isometricrobot/robotmodel.cpp

+#include "robotmodel.h"
+
+namespace Robot25D {
+
+RobotModel::RobotModel()
+{
+
+}
+
+} // namespace Robot25D

src/actors/isometricrobot/robotmodel.h

+#ifndef ROBOT25D_ROBOTMODEL_H
+#define ROBOT25D_ROBOTMODEL_H
+
+
+namespace Robot25D {
+
+class RobotModel
+{
+public:
+    RobotModel();
+};
+
+} // namespace Robot25D
+
+#endif // ROBOT25D_ROBOTMODEL_H
\ No newline at end of file

src/app/main.cpp

@@ -65,7 +65,7 @@ void ConsoleMessageOutput(QtMsgType type, const char *msg)
 void showErrorMessage(const QString & text)
 {
     bool gui = true;
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
     gui = gui && getenv("DISPLAY")!=0;
 #endif
 

src/plugins/kumircoderun/consolerun.cpp

@@ -87,7 +87,7 @@ ExternalModuleLoadFunctor::operator() (
     }
 
     bool gui = true;
-#ifdef Q_WS_X11
+#ifdef Q_OS_LINUX
     gui = gui && getenv("DISPLAY")!=0;
 #endif