From 4a999aa303e728e4f165425b78eacb339ff50d83 Mon Sep 17 00:00:00 2001
From: Victor Yacovlev <v.yacovlev@gmail.com>
Date: Wed, 24 Aug 2016 19:12:22 +0300
Subject: [PATCH] Removed extra X11 dependencies + Qt5 fixes

---
 scripts/gen_actor_source.py              |  6 ++++++
 src/actors/isometricrobot/robotmodel.cpp | 10 ++++++++++
 src/actors/isometricrobot/robotmodel.h   | 15 +++++++++++++++
 src/app/main.cpp                         |  2 +-
 src/plugins/kumircoderun/consolerun.cpp  |  2 +-
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/actors/isometricrobot/robotmodel.cpp
 create mode 100644 src/actors/isometricrobot/robotmodel.h

diff --git a/scripts/gen_actor_source.py b/scripts/gen_actor_source.py
index 965a4b0a..e18471d0 100755
--- a/scripts/gen_actor_source.py
+++ b/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 """
diff --git a/src/actors/isometricrobot/robotmodel.cpp b/src/actors/isometricrobot/robotmodel.cpp
new file mode 100644
index 00000000..70142c49
--- /dev/null
+++ b/src/actors/isometricrobot/robotmodel.cpp
@@ -0,0 +1,10 @@
+#include "robotmodel.h"
+
+namespace Robot25D {
+
+RobotModel::RobotModel()
+{
+
+}
+
+} // namespace Robot25D
diff --git a/src/actors/isometricrobot/robotmodel.h b/src/actors/isometricrobot/robotmodel.h
new file mode 100644
index 00000000..a3026d9d
--- /dev/null
+++ b/src/actors/isometricrobot/robotmodel.h
@@ -0,0 +1,15 @@
+#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
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 48755d2c..a5aafde4 100644
--- a/src/app/main.cpp
+++ b/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
 
diff --git a/src/plugins/kumircoderun/consolerun.cpp b/src/plugins/kumircoderun/consolerun.cpp
index 933f2653..98f011f2 100644
--- a/src/plugins/kumircoderun/consolerun.cpp
+++ b/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
 
-- 
GitLab