- adapt to Qt5 and mingw64

OpenModelica · Jul 23, 2015 · de17f81 · de17f81
1 parent e800774
commit de17f81
Show file tree

Hide file tree

Showing 42 changed files with 216 additions and 20 deletions.
diff --git a/OMNotebook/OMNotebookGUI/OMNotebookGUI.pro b/OMNotebook/OMNotebookGUI/OMNotebookGUI.pro
@@ -5,6 +5,9 @@
 # Adeel Asghar [adeel.asghar@ida.liu.se] 2011-03-05
 
 QT += network core gui xml svg
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT *= printsupport widgets webkitwidgets
+}
 
 TARGET = OMNotebook
 TEMPLATE = app
@@ -143,7 +146,7 @@ FORMS += ImageSizeDlg.ui \
     searchform.ui
 
 win32 {
-  QMAKE_LFLAGS += -enable-auto-import
+  QMAKE_LFLAGS += -Wl,--enable-auto-import
   DEFINES += IMPORT_INTO=1
   QMAKE_CXXFLAGS += -Wl,--stack,16777216
   PLOTLIBS = -L$$(OMBUILDDIR)/build/lib/omc -lOMPlot -lomqwt

diff --git a/OMNotebook/OMNotebookGUI/cell.cpp b/OMNotebook/OMNotebookGUI/cell.cpp
@@ -33,12 +33,17 @@
 //STD Headers
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QGridLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QMessageBox>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QTextCursor>
+#endif
 
 #include <exception>
 #include <stdexcept>

diff --git a/OMNotebook/OMNotebookGUI/cell.h b/OMNotebook/OMNotebookGUI/cell.h
@@ -45,8 +45,14 @@
 //STD Headers
 #include <vector>
 
-//QT Headers
+// QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QWidget>
+#endif
+
 
 //IAEX Headers
 #include "cellstyle.h"

diff --git a/OMNotebook/OMNotebookGUI/cellapplication.cpp b/OMNotebook/OMNotebookGUI/cellapplication.cpp
@@ -32,12 +32,6 @@
 
 #define RUN_DRMODELICA_CONVERTION    false
 
-//QT Headers
-#include <QtCore/QDir>
-//#include <QtCore/QObject>
-#include <QtGui/QImageWriter>
-#include <QtGui/QMessageBox>
-
 //IAEX Headers
 #include "cellapplication.h"
 #include "celldocument.h"

diff --git a/OMNotebook/OMNotebookGUI/cellapplication.h b/OMNotebook/OMNotebookGUI/cellapplication.h
@@ -34,8 +34,23 @@
 #define _CELLAPPLICATION_H
 
 // QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QtWebKitWidgets>
+#include <QTextCodec>
+#include <QUrlQuery>
+#include <QItemDelegate>
+#include <QMessageBox>
+#include <QImageWriter>
+#else
 #include <QtGui/QApplication>
-#include <QtCore/QObject>
+#include <QtGui/QImageWriter>
+#include <QtGui/QMessageBox>
+#include <QtCore/QDir>
+#endif
 
 // IAEX Headers
 #include "application.h"

diff --git a/OMNotebook/OMNotebookGUI/cellcommandcenter.cpp b/OMNotebook/OMNotebookGUI/cellcommandcenter.cpp
@@ -35,7 +35,12 @@
 #include <iostream>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QMessageBox>
+#endif
 
 //IAEX Headers
 #include "cellcommandcenter.h"

diff --git a/OMNotebook/OMNotebookGUI/cellcursor.cpp b/OMNotebook/OMNotebookGUI/cellcursor.cpp
@@ -43,9 +43,14 @@
 #include <stdexcept>
 
 //Qt Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QApplication>
 #include <QtGui/QLabel>
 #include <QtGui/QPaintEvent>
+#endif
 
 //IAEX Headers
 #include "cellcursor.h"

diff --git a/OMNotebook/OMNotebookGUI/celldocument.cpp b/OMNotebook/OMNotebookGUI/celldocument.cpp
@@ -46,6 +46,10 @@
 #include <algorithm>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QDir>
 #include <QtCore/QEvent>
 #include <QtCore/QFileInfo>
@@ -54,6 +58,7 @@
 #include <QtGui/QImageWriter>
 #include <QtGui/QScrollArea>
 #include <QtGui/QScrollBar>
+#endif
 
 //IAEX Headers
 #include "celldocument.h"

diff --git a/OMNotebook/OMNotebookGUI/celldocument.h b/OMNotebook/OMNotebookGUI/celldocument.h
@@ -42,9 +42,15 @@
 
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QHash>
 #include <QtGui/QScrollArea>
 #include <QtGui/QGridLayout>
+#endif
+
 
 //Forward declaration
 class QDom;

diff --git a/OMNotebook/OMNotebookGUI/cellfactory.cpp b/OMNotebook/OMNotebookGUI/cellfactory.cpp
@@ -38,8 +38,13 @@
 
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QObject>
 #include <QtGui/QMessageBox>
+#endif
 
 #include <exception>
 #include <stdexcept>

diff --git a/OMNotebook/OMNotebookGUI/cellgroup.cpp b/OMNotebook/OMNotebookGUI/cellgroup.cpp
@@ -43,7 +43,13 @@
 #include <stdexcept>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#include <QTextEdit>
+#else
 #include <QtGui/QTextEdit>
+#endif
 
 //IAEX Headers
 #include "cellgroup.h"

diff --git a/OMNotebook/OMNotebookGUI/cellgroup.h b/OMNotebook/OMNotebookGUI/cellgroup.h
@@ -44,11 +44,15 @@
 #include <list>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QWidget>
 #include <QtGui/QLayout>
-//Added by qt3to4:
 #include <QtGui/QMouseEvent>
 #include <QtGui/QGridLayout>
+#endif
 
 //IAEX Headers
 #include "cell.h"

diff --git a/OMNotebook/OMNotebookGUI/documentview.h b/OMNotebook/OMNotebookGUI/documentview.h
@@ -34,7 +34,12 @@
 #define DOCUMENTVIEW_H
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QMainWindow>
+#endif
 
 //IAEX Headers
 #include "document.h"

diff --git a/OMNotebook/OMNotebookGUI/graphcell.cpp b/OMNotebook/OMNotebookGUI/graphcell.cpp
@@ -45,6 +45,10 @@
 #include <cmath>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QDir>
 #include <QtCore/QEvent>
 #include <QtCore/QThread>
@@ -64,6 +68,7 @@
 #include <QTextStream>
 #include <QRegExp>
 #include <QPushButton>
+#endif
 
 //IAEX Headers
 #include "graphcell.h"

diff --git a/OMNotebook/OMNotebookGUI/graphcell.h b/OMNotebook/OMNotebookGUI/graphcell.h
@@ -35,16 +35,21 @@
 
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QAction>
 #include <QtGui/QWidget>
 #include <QtGui/QTextBrowser>
-//Added by qt3to4:
 #include <QtGui/QMouseEvent>
 #include <QtGui/QGridLayout>
 #include <QtGui/QResizeEvent>
 #include <QtCore/QEvent>
 #include <QPushButton>
 #include <QTemporaryFile>
+#endif
+
 //IAEX Headers
 #include "cell.h"
 #include "inputcelldelegate.h"

diff --git a/OMNotebook/OMNotebookGUI/highlighterthread.cpp b/OMNotebook/OMNotebookGUI/highlighterthread.cpp
@@ -40,11 +40,16 @@
 #include <iostream>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QCoreApplication>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextBrowser>
 #include <QtGui/QTextEdit>
 #include <QMessageBox>
+#endif
 
 //IAEX Headers
 #include "highlighterthread.h"

diff --git a/OMNotebook/OMNotebookGUI/inputcell.cpp b/OMNotebook/OMNotebookGUI/inputcell.cpp
@@ -45,6 +45,10 @@
 #include <sstream>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QDir>
 #include <QtCore/QEvent>
 #include <QtCore/QThread>
@@ -58,6 +62,7 @@
 #include <QtGui/QResizeEvent>
 #include <QtGui/QFrame>
 #include <QtGui/QTextFrame>
+#endif
 
 //IAEX Headers
 #include "inputcell.h"

diff --git a/OMNotebook/OMNotebookGUI/inputcell.h b/OMNotebook/OMNotebookGUI/inputcell.h
@@ -43,13 +43,17 @@
 
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QWidget>
 #include <QtGui/QTextBrowser>
-//Added by qt3to4:
 #include <QtGui/QMouseEvent>
 #include <QtGui/QGridLayout>
 #include <QtGui/QResizeEvent>
 #include <QtCore/QEvent>
+#endif
 
 //IAEX Headers
 #include "cell.h"

diff --git a/OMNotebook/OMNotebookGUI/notebook.cpp b/OMNotebook/OMNotebookGUI/notebook.cpp
@@ -45,6 +45,10 @@
 #include <algorithm>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QTimer>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
@@ -67,6 +71,7 @@
 #include <QtGui/QLabel>
 #include <QSettings>
 #include <QToolButton>
+#endif
 
 //IAEX Headers
 #include "command.h"

diff --git a/OMNotebook/OMNotebookGUI/omcinteractiveenvironment.cpp b/OMNotebook/OMNotebookGUI/omcinteractiveenvironment.cpp
@@ -35,12 +35,17 @@
 #include <stdexcept>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QProcess>
 #include <QtCore/QThread>
 #include <QtCore/QMutex>
 #include <QtGui/QMessageBox>
+#endif
 
 //IAEX Headers
 #include "omcinteractiveenvironment.h"

diff --git a/OMNotebook/OMNotebookGUI/printervisitor.cpp b/OMNotebook/OMNotebookGUI/printervisitor.cpp
@@ -39,13 +39,18 @@
 #include <exception>
 
 //QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocumentFragment>
 #include <QtGui/QTextEdit>
 #include <QtGui/QTextTable>
 #include <QtGui/QTextTableCell>
 #include <QtGui/QTextTableFormat>
 #include <QPrinter>
+#endif
 
 //IAEX Headers
 #include "printervisitor.h"

diff --git a/OMNotebook/OMNotebookGUI/qcombobox_search.cpp b/OMNotebook/OMNotebookGUI/qcombobox_search.cpp
@@ -36,10 +36,6 @@
  * \date 2006-08-24
  */
 
-
-// QT Headers
-#include <QtGui/QKeyEvent>
-
 // IAEX Headers
 #include "qcombobox_search.h"
 

diff --git a/OMNotebook/OMNotebookGUI/qcombobox_search.h b/OMNotebook/OMNotebookGUI/qcombobox_search.h
@@ -41,7 +41,13 @@
 
 
 // QT Headers
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#else
 #include <QtGui/QComboBox>
+#include <QtGui/QKeyEvent>
+#endif
 
 
 namespace IAEX