From c2710cbbc8f4dbd5fbf80de4fd644ae13cc8318f Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Sun, 17 May 2020 07:47:35 +0200
Subject: [PATCH] Aggressive porting to ubuntu19.10

---
 src/Qtx/CMakeLists.txt     |  5 +++--
 src/Qtx/Qtx.cxx            | 20 ++++++++++----------
 src/Qtx/Qtx.h              | 10 +++++-----
 src/Qtx/QtxAction.cxx      |  4 ++--
 src/Qtx/QtxAction.h        |  2 +-
 src/Qtx/QtxActionGroup.cxx |  6 +++---
 src/Qtx/QtxComboBox.h      |  2 +-
 src/SUIT/CMakeLists.txt    |  2 +-
 8 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/Qtx/CMakeLists.txt b/src/Qtx/CMakeLists.txt
index 078b3e672..6a55257aa 100644
--- a/src/Qtx/CMakeLists.txt
+++ b/src/Qtx/CMakeLists.txt
@@ -23,12 +23,13 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(${QT_INCLUDES})
+INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/qt5/QtWidgets")
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(${QT_DEFINITIONS})
-
+#/usr/lib/x86_64-linux-gnu/libQt5Widgets.so
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES})
+SET(_link_LIBRARIES ${QT_LIBRARIES} /usr/lib/x86_64-linux-gnu/libQt5Xml.so ${OPENGL_LIBRARIES})
 
 # --- headers ---
 
diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index f5c5d8942..283196d29 100644
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -26,19 +26,19 @@
 #include "Qtx.h"
 
 #include <QDir>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QRegExp>
-#include <QBitmap>
-#include <QWidget>
-#include <QLayout>
-#include <QPainter>
-#include <QDirModel>
+#include <QtGui/QBitmap>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLayout>
+#include <QtGui/QPainter>
+#include <QtWidgets/QDirModel>
 #include <QFileInfo>
-#include <QCompleter>
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QtWidgets/QCompleter>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
 #include <QtDebug>
-#include <QSurfaceFormat>
+#include <QtGui/QSurfaceFormat>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index 5204c09bf..9105d8658 100644
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.h
@@ -44,11 +44,11 @@
 
 #include <QString>
 #include <QList>
-#include <QFont>
-#include <QColor>
-#include <QImage>
-#include <QPixmap>
-#include <QGradient>
+#include <QtGui/QFont>
+#include <QtGui/QColor>
+#include <QtGui/QImage>
+#include <QtGui/QPixmap>
+#include <QtGui/QGradient>
 
 class QObject;
 class QWidget;
diff --git a/src/Qtx/QtxAction.cxx b/src/Qtx/QtxAction.cxx
index da80e756a..08ba3d261 100644
--- a/src/Qtx/QtxAction.cxx
+++ b/src/Qtx/QtxAction.cxx
@@ -27,8 +27,8 @@
 
 #include <QEvent>
 #include <QPointer>
-#include <QActionEvent>
-#include <QApplication>
+#include <QtGui/QActionEvent>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxAction::ActionNotify
diff --git a/src/Qtx/QtxAction.h b/src/Qtx/QtxAction.h
index e15d98aa1..d5ed36fce 100644
--- a/src/Qtx/QtxAction.h
+++ b/src/Qtx/QtxAction.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QWidgetAction>
+#include <QtWidgets/QWidgetAction>
 
 class QIcon;
 
diff --git a/src/Qtx/QtxActionGroup.cxx b/src/Qtx/QtxActionGroup.cxx
index f5b74f5b6..7b001907c 100644
--- a/src/Qtx/QtxActionGroup.cxx
+++ b/src/Qtx/QtxActionGroup.cxx
@@ -24,9 +24,9 @@
 
 #include "QtxComboBox.h"
 
-#include <QMenu>
-#include <QMenuBar>
-#include <QActionGroup>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QActionGroup>
 
 /*!
   \class QtxActionGroup
diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h
index 77202fe72..e9fb2c18c 100644
--- a/src/Qtx/QtxComboBox.h
+++ b/src/Qtx/QtxComboBox.h
@@ -29,7 +29,7 @@
 #include "Qtx.h"
 
 #include <QMap>
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/SUIT/CMakeLists.txt b/src/SUIT/CMakeLists.txt
index f93750924..926586653 100644
--- a/src/SUIT/CMakeLists.txt
+++ b/src/SUIT/CMakeLists.txt
@@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${PLATFORM_LIBS} ${QT_LIBRARIES} qtx ObjBrowser)
+SET(_link_LIBRARIES ${PLATFORM_LIBS} ${QT_LIBRARIES} /usr/lib/x86_64-linux-gnu/libQt5PrintSupport.so qtx ObjBrowser)
 
 # --- headers ---
 
-- 
2.39.2