From 3139ad16b58fe44643ed16bfd1eaa1b8b9c17db8 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Sat, 22 Jul 2023 10:42:25 +0200 Subject: [PATCH] WIP6 --- src/app/command_system_information.cpp | 10 +++++++--- src/app/commands_help.h | 2 -- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/command_system_information.cpp b/src/app/command_system_information.cpp index e089f354..0e1089c5 100644 --- a/src/app/command_system_information.cpp +++ b/src/app/command_system_information.cpp @@ -6,12 +6,12 @@ #include "commands_help.h" -#include "../base/meta_enum.h" -#include "../base/filepath.h" -#include "../base/io_system.h" #include "app_module.h" #include "qstring_conv.h" #include "qtwidgets_utils.h" +#include "../base/meta_enum.h" +#include "../base/filepath.h" +#include "../base/io_system.h" #include #include @@ -33,6 +33,10 @@ #include #include +// NOTICE for Linux/X11 +// Because of #define conflicts, OpenGL_Context.hxx must be included *before* QtGui/QOpenGLContext +// It also has to be included *after* QtCore/QTextStream +// Beware of these limitations when adding/removing inclusion of headers here #include #include diff --git a/src/app/commands_help.h b/src/app/commands_help.h index 2ca2e8ba..0b652ab1 100644 --- a/src/app/commands_help.h +++ b/src/app/commands_help.h @@ -8,8 +8,6 @@ #include "commands_api.h" -#include - namespace Mayo { class CommandReportBug : public Command {