Commit 4a999aa3 authored by Victor Yacovlev's avatar Victor Yacovlev

Removed extra X11 dependencies + Qt5 fixes

parent d190860e
...@@ -922,6 +922,10 @@ class Gui: ...@@ -922,6 +922,10 @@ class Gui:
if "menus" in json_node: if "menus" in json_node:
for menu in json_node["menus"]: for menu in json_node["menus"]:
self.menus.append(MenuItem(menu)) 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): def get_icon_name(self, role):
""" """
...@@ -1507,6 +1511,8 @@ private: ...@@ -1507,6 +1511,8 @@ private:
""" """
if self._module.gui: if self._module.gui:
guiRequired = "true" guiRequired = "true"
if self._module.gui.optional:
guiRequired = "false"
else: else:
guiRequired = "false" guiRequired = "false"
return """ return """
......
#include "robotmodel.h"
namespace Robot25D {
RobotModel::RobotModel()
{
}
} // namespace Robot25D
#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
...@@ -65,7 +65,7 @@ void ConsoleMessageOutput(QtMsgType type, const char *msg) ...@@ -65,7 +65,7 @@ void ConsoleMessageOutput(QtMsgType type, const char *msg)
void showErrorMessage(const QString & text) void showErrorMessage(const QString & text)
{ {
bool gui = true; bool gui = true;
#ifdef Q_WS_X11 #ifdef Q_OS_LINUX
gui = gui && getenv("DISPLAY")!=0; gui = gui && getenv("DISPLAY")!=0;
#endif #endif
......
...@@ -87,7 +87,7 @@ ExternalModuleLoadFunctor::operator() ( ...@@ -87,7 +87,7 @@ ExternalModuleLoadFunctor::operator() (
} }
bool gui = true; bool gui = true;
#ifdef Q_WS_X11 #ifdef Q_OS_LINUX
gui = gui && getenv("DISPLAY")!=0; gui = gui && getenv("DISPLAY")!=0;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment