WIP6

fougue · Jul 22, 2023 · 3139ad1 · 3139ad1
1 parent 6a30c86
commit 3139ad1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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 <QtCore/QDir>
 #include <QtCore/QFileSelector>
@@ -33,6 +33,10 @@
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QStyleFactory>
 
+// 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 <OpenGl_Context.hxx>
 #include <Standard_Version.hxx>
 

diff --git a/src/app/commands_help.h b/src/app/commands_help.h
@@ -8,8 +8,6 @@
 
 #include "commands_api.h"
 
-#include <vector>
-
 namespace Mayo {
 
 class CommandReportBug : public Command {