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 16ccf44f3305e98c0e08c6d19af64cc0fabb6ce1..49ac0f19481c1892cc6633ffcacd731e0d9af3d5 100644 (file)
--- 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 737d34c149c0064a58ff6dffcd5b50feb949e34c..22fb6e1648578b2a5422890bc92e46967633b4fa 100644 (file)
--- 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 ae1f4346c018cdedc8da7d72eb9039629d1ec37b..701fe3c073543f02a97f2b0eae5cf07701232733 100644 (file)
--- 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 4607f6906105976e262fcb9a7951d0e7347912dd..1cf1c05f1feacd465e6e6beea45daab38d9e7986 100644 (file)
--- 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 bf3a98e5b4c5c31ed4f55cd80b6ee52419216fb3..1e38ed82934b074aa2bb10a32e705dc10e3d4fe2 100644 (file)
--- 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 861ab1e5ca5b6b010c2dc782f78ed99be2cce733..654a89712ceb096ea9660056698bd39662866c07 100644 (file)
--- 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 adca119f7de0f42ae5dc23cedec1cb277e806f43..c82e54c2964ff237f1987bca9392531140003624 100644 (file)
--- 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 82202410d5d180c7736190c7256435c41098f39f..711893b92ef34841c0a848c7f52fca20c996ea15 100644 (file)
--- 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 ba32cb1bc3871ca63815249422be08cdeda56e44..a811775e13b3e85e4d2d1da8083e89b63b519592 100644 (file)
--- 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 efd266adc72e5b20157b5fccc5dc12f2b0bc49ec..2282389ddc02fa654356aadf0ccdd7d3c1b400aa 100644 (file)
--- 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>