From: Anthony Geay <anthony.geay@edf.fr>
Date: Mon, 16 Mar 2020 10:29:40 +0000 (+0100)
Subject: Fast Qt5.12 porting to use gui under native ubuntu 18.1 qt5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=415f931f309f6566a42cd773e86d6accffd2b1fa;p=modules%2Fgui.git

Fast Qt5.12 porting to use gui under native ubuntu 18.1 qt5
---

diff --git a/src/GLViewer/GLViewer_Geom.h b/src/GLViewer/GLViewer_Geom.h
index 16ccf44f3..49ac0f194 100644
--- a/src/GLViewer/GLViewer_Geom.h
+++ b/src/GLViewer/GLViewer_Geom.h
@@ -30,7 +30,7 @@
 #include "GLViewer.h"
 
 #include <QRect>
-#include <QtOpenGL>
+#include <QtOpenGL/QtOpenGL>
 #include <math.h>
 
 #ifdef WIN32
diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index 737d34c14..22fb6e164 100644
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -43,7 +43,7 @@
 #include "GLViewer_Widget.h"
 #include "GLViewer_Geom.h"
 
-#include <QtOpenGL>
+#include <QtOpenGL/QtOpenGL>
 #include <QColor>
 #include <QPaintDevice>
 
diff --git a/src/GLViewer/GLViewer_Widget.h b/src/GLViewer/GLViewer_Widget.h
index ae1f4346c..701fe3c07 100644
--- a/src/GLViewer/GLViewer_Widget.h
+++ b/src/GLViewer/GLViewer_Widget.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QtOpenGL>
+#include <QtOpenGL/QtOpenGL>
 
 class QFile;
 
diff --git a/src/GraphicsView/GraphicsView_ViewPort.cxx b/src/GraphicsView/GraphicsView_ViewPort.cxx
index 4607f6906..1cf1c05f1 100644
--- a/src/GraphicsView/GraphicsView_ViewPort.cxx
+++ b/src/GraphicsView/GraphicsView_ViewPort.cxx
@@ -34,7 +34,7 @@
 #include <QRectF>
 #include <QRubberBand>
 #include <QScrollBar>
-#include <QPrinter>
+#include <QtPrintSupport/QPrinter>
 #include <QPainter>
 
 #include <math.h>
diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index bf3a98e5b..1e38ed829 100644
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -58,7 +58,7 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QContextMenuEvent>
-#include <QPrinter>
+#include <QtPrintSupport/QPrinter>
 #include <QPalette>
 #include <QLocale>
 #include <QXmlStreamWriter>
diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 861ab1e5c..654a89712 100644
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.cxx
@@ -46,8 +46,8 @@
 #include <QPaintEvent>
 #include <QActionGroup>
 #include <QPainter>
-#include <QPrinter>
-#include <QPrintDialog>
+#include <QtPrintSupport/QPrinter>
+#include <QtPrintSupport/QPrintDialog>
 
 #include <qwt_plot_curve.h>
 
diff --git a/src/Qtx/QtxActionMgr.cxx b/src/Qtx/QtxActionMgr.cxx
index adca119f7..c82e54c29 100644
--- a/src/Qtx/QtxActionMgr.cxx
+++ b/src/Qtx/QtxActionMgr.cxx
@@ -29,9 +29,9 @@
 #include <QFile>
 #include <QTimer>
 #ifndef QT_NO_DOM
-#include <QDomDocument>
-#include <QDomNode>
-#include <QCoreApplication>
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomNode>
+#include <QtCore/QCoreApplication>
 #endif
 
 typedef QList< QPointer<QAction> > qtx_actionlist;
diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 82202410d..711893b92 100644
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -36,9 +36,9 @@
 #include <QLibraryInfo>
 #include <QtDebug>
 #ifndef QT_NO_DOM
-#include <QDomDocument>
-#include <QDomElement>
-#include <QDomNode>
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomElement>
+#include <QtXml/QDomNode>
 #endif
 
 #include <stdlib.h>
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
index ba32cb1bc..a811775e1 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
@@ -41,9 +41,9 @@
 #include "SUIT_ViewWindow.h"
 
 #include <QApplication>
-#include <QDomDocument>
-#include <QDomElement>
-#include <QDomNode>
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomElement>
+#include <QtXml/QDomNode>
 #include <QFile>
 #include <QMenu>
 #include <QMutex>
diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index efd266adc..2282389dd 100644
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.cxx
@@ -25,7 +25,7 @@
 #include <QPushButton>
 #include <QTextStream> 
 #include <QFile>
-#include <QPrinter>
+#include <QtPrintSupport/QPrinter>
 //#include <QSimpleRichText>
 #include <QTextDocument>
 #include <QPainter>