- adapt to Qt5 and mingw64

- updated qjson to latest from: https://github.com/flavio/qjson
OpenModelica · Jul 23, 2015 · abed5f4 · abed5f4
1 parent 118cfe8
commit abed5f4
Show file tree

Hide file tree

Showing 91 changed files with 10,898 additions and 1,520 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -21,12 +21,12 @@ endif
 
 mkbuilddirs:
 	mkdir -p build/bin @OMBUILDDIR@/share/omedit/nls @OMBUILDDIR@/lib/@host_short@/omc
-omedit: mkbuilddirs qjson
+omedit: mkbuilddirs qjson-build
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix
 clean:
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix clean
-	test ! -f qjson-0.8.1/build/Makefile || $(MAKE) -C qjson-0.8.1/build clean
-	rm -f qjson-0.8.1/build/Makefile
+	test ! -f qjson/build/Makefile || $(MAKE) -C qjson/build clean
+	rm -f qjson/build/Makefile
 distclean: clean
 	rm -f config.status configure Makefile OMEdit/OMEditGUI/Makefile.unix OMEdit/OMEditGUI/OMEdit.config
 Makefile: Makefile.in config.status
@@ -36,11 +36,11 @@ config.status: configure
 configure: configure.ac common/m4/corba.m4 common/m4/omhome.m4 common/m4/qmake.m4
 	autoconf
 
-qjson:
-	test -d qjson-0.8.1
-	mkdir -p qjson-0.8.1/build/include/qjson
-	(cd qjson-0.8.1/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" .. -G $(CMAKE_TARGET))
-	test -f qjson-0.8.1/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson-0.8.1/build
-	test "(" ! `uname` = Darwin ")" -o "(" ! -f qjson-0.8.1/build/lib/libqjson$(SHREXT) ")" || install_name_tool -id @rpath/libqjson$(SHREXT) 3rdParty/qjson-0.8.1/build/lib/libqjson$(SHREXT)
-	cp -a qjson-0.8.1/build/lib/libqjson*$(SHREXT)* @OMBUILDDIR@/lib/@host_short@/omc/
-	cp -a qjson-0.8.1/src/*.h qjson-0.8.1/build/include/qjson
+qjson-build:
+	test -d qjson
+	mkdir -p qjson/build/include/qjson
+	(cd qjson/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" .. -G $(CMAKE_TARGET))
+	test -f qjson/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson/build
+	test "(" ! `uname` = Darwin ")" -o "(" ! -f qjson/build/lib/libqjson$(SHREXT) ")" || install_name_tool -id @rpath/libqjson$(SHREXT) 3rdParty/qjson/build/lib/libqjson$(SHREXT)
+	cp -a qjson/build/lib/libqjson*$(SHREXT)* @OMBUILDDIR@/lib/@host_short@/omc/
+	cp -a qjson/src/*.h qjson/build/include/qjson
diff --git a/Makefile.omdev.mingw b/Makefile.omdev.mingw
@@ -9,9 +9,9 @@ all: omedit
 
 CC = gcc
 CXX = g++
-CFLAGS =-O2 -falign-functions
+CFLAGS =-g -falign-functions -fstack-protector-all
 AR = ar
-CMAKE=CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(OMDEV)/bin/cmake/bin/cmake
+CMAKE=cmake
 CMAKE_TARGET = "MSYS Makefiles"
 SHREXT=.dll
 
@@ -20,18 +20,18 @@ mkbuilddirs:
 	mkdir -p $(buildlib)
 	mkdir -p $(buildbin)
 
-omedit: mkbuilddirs qjson
+omedit: mkbuilddirs qjson-build
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw
 	cp -puf common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit
 
 clean:
-	cd qjson-0.8.1 && rm -rf build
+	cd qjson && rm -rf build
 	$(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw clean
 
-qjson:
-	test -d qjson-0.8.1
-	mkdir -p qjson-0.8.1/build/include/qjson
-	(cd qjson-0.8.1/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" .. -G $(CMAKE_TARGET))
-	test -f qjson-0.8.1/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson-0.8.1/build
-	cp -a qjson-0.8.1/build/lib/libqjson*$(SHREXT)* $(OMBUILDDIR)/lib/omc/
-	cp -a qjson-0.8.1/src/*.h qjson-0.8.1/build/include/qjson
+qjson-build:
+	test -d qjson
+	mkdir -p qjson/build/include/qjson
+	(cd qjson/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" .. -G $(CMAKE_TARGET) -DCMAKE_INSTALL_PREFIX:PATH=`pwd`)
+	test -f qjson/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson/build install
+	cp -a qjson/build/lib/libqjson*$(SHREXT)* $(OMBUILDDIR)/lib/omc/
+	cp -a qjson/src/*.h qjson/build/include/qjson
diff --git a/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp b/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp
@@ -355,7 +355,11 @@ ShapePropertiesDialog::ShapePropertiesDialog(ShapeAnnotation *pShapeAnnotation,
   mpPointsTableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
   mpPointsTableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
   mpPointsTableWidget->setColumnCount(2);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+  mpPointsTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+#else /* Qt4 */
   mpPointsTableWidget->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+#endif
   QStringList headerLabels;
   headerLabels << "X" << "Y";
   mpPointsTableWidget->setHorizontalHeaderLabels(headerLabels);

diff --git a/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.h b/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.h
@@ -38,10 +38,7 @@
 #ifndef CRASHREPORTDIALOG_H
 #define CRASHREPORTDIALOG_H
 
-#include <QtCore>
-#include <QtGui>
-#include <QtNetwork>
-
+#include "MainWindow.h"
 #include "Utilities.h"
 
 class CrashReportDialog : public QDialog

diff --git a/OMEdit/OMEditGUI/CrashReport/backtrace.c b/OMEdit/OMEditGUI/CrashReport/backtrace.c
@@ -8,6 +8,10 @@
   as listed at <url: http://www.opensource.org/licenses/bsd-license.php >.
 */
 
+#define GCC_VERSION (__GNUC__ * 10000 \
+                               + __GNUC_MINOR__ * 100 \
+                               + __GNUC_PATCHLEVEL__)
+
 #ifdef QT_NO_DEBUG
 #ifdef WIN32
 #include "backtrace.h"
@@ -172,14 +176,16 @@ _backtrace(struct output_buffer *ob, struct bfd_set *set, int depth , LPCONTEXT
 
   STACKFRAME frame;
   memset(&frame,0,sizeof(frame));
-
+#if defined(__MINGW32__) && GCC_VERSION > 40900
+  /* adrpo: this doesn't seem to be working for MinGW GCC 4.9.2 */
+#else
   frame.AddrPC.Offset = context->Eip;
   frame.AddrPC.Mode = AddrModeFlat;
   frame.AddrStack.Offset = context->Esp;
   frame.AddrStack.Mode = AddrModeFlat;
   frame.AddrFrame.Offset = context->Ebp;
   frame.AddrFrame.Mode = AddrModeFlat;
-
+#endif
   HANDLE process = GetCurrentProcess();
   HANDLE thread = GetCurrentThread();
 

diff --git a/OMEdit/OMEditGUI/CrashReport/backtrace.h b/OMEdit/OMEditGUI/CrashReport/backtrace.h
@@ -20,7 +20,8 @@ extern "C" {
 #include <windows.h>
 #include <excpt.h>
 #include <imagehlp.h>
-#include <bfd.h>
+#define PACKAGE OMEdit
+#include <binutils/bfd.h>
 #include <psapi.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.h b/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.h
@@ -38,8 +38,16 @@
 
 #include <QIcon>
 #include <QFileInfo>
+
+#include <QtGlobal>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#include <QtWidgets>
+#include <QTextBlockUserData>
+#include <QPlainTextDocumentLayout>
+#else
 #include <QtGui/QTextBlockUserData>
 #include <QtGui/QPlainTextDocumentLayout>
+#endif
 
 class ModelicaTextEditor;
 class BreakpointsTreeModel;

diff --git a/OMEdit/OMEditGUI/MainWindow.h b/OMEdit/OMEditGUI/MainWindow.h
@@ -39,8 +39,21 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtCore>
+#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>
+#else
 #include <QtGui>
+#include <QtWebKit>
+#endif
+
+#include <QtCore>
 #include <QDomDocument>
 
 #if (QT_VERSION < QT_VERSION_CHECK(4, 6, 0))

diff --git a/OMEdit/OMEditGUI/Makefile.omdev.mingw b/OMEdit/OMEditGUI/Makefile.omdev.mingw
@@ -21,7 +21,7 @@ install: build Resources/nls/qm.stamp
 	cp -puf $(OMDEV)/tools/OMTools/dll/mingwm10.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/mingw/bin/libintl-8.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/mingw/bin/libiconv-2.dll $(builddir_bin)
-	cp -puf ../../qjson-0.8.1/build/lib/libqjson*$(SHREXT)* $(builddir_bin)
+	cp -puf ../../qjson/build/lib/libqjson*$(SHREXT)* $(builddir_bin)
 	cp -puf $(OMDEV)/tools/OMTools/dll/QtCore4.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/OMTools/dll/QtGui4.dll $(builddir_bin)
 	cp -puf $(OMDEV)/tools/OMTools/dll/QtNetwork4.dll $(builddir_bin)

diff --git a/OMEdit/OMEditGUI/Modeling/DocumentationWidget.h b/OMEdit/OMEditGUI/Modeling/DocumentationWidget.h
@@ -39,10 +39,8 @@
 #ifndef DOCUMENTATIONWIDGET_H
 #define DOCUMENTATIONWIDGET_H
 
-#include <QtWebKit>
 #include "MainWindow.h"
 
-
 class DocumentationHistory
 {
 public:

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -110,7 +110,11 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
   value = index.data(Qt::CheckStateRole);
   if (value.isValid()) {
     checkState = static_cast<Qt::CheckState>(value.toInt());
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    checkRect = doCheck(opt, opt.rect, value);
+#else /* Qt4 */
     checkRect = check(opt, opt.rect, value);
+#endif
   }
   // do the layout
   doLayout(opt, &checkRect, &decorationRect, &displayRect, false);

diff --git a/OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp b/OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp
@@ -263,7 +263,12 @@ void MessagesWidget::openErrorMessageClass(QUrl url)
     mpMainWindow->getLibraryTreeWidget()->showModelWidget(pLibraryTreeNode);
     ModelWidget *pModelWidget = pLibraryTreeNode->getModelWidget();
     if (pModelWidget && pModelWidget->getEditor()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+      QUrlQuery query(url);
+	  int lineNumber = query.queryItemValue("lineNumber").toInt();
+#else /* Qt4 */
       int lineNumber = url.queryItemValue("lineNumber").toInt();
+#endif
       pModelWidget->getTextViewToolButton()->setChecked(true);
       pModelWidget->getEditor()->goToLineNumber(lineNumber);
     }

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -29,6 +29,9 @@
  #/
 
 QT += network core gui webkit xml xmlpatterns svg
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT *= printsupport widgets webkitwidgets
+}
 
 TRANSLATIONS = Resources/nls/OMEdit_de.ts \
   Resources/nls/OMEdit_es.ts \
@@ -51,7 +54,7 @@ evil_hack_to_fool_lupdate {
 # Windows libraries and includes
 win32 {
   OPENMODELICAHOME = $$(OPENMODELICAHOME)
-  QMAKE_LFLAGS += -enable-auto-import
+  QMAKE_LFLAGS += -Wl,--enable-auto-import
 
   DEFINES += IMPORT_INTO=1
 
@@ -64,7 +67,7 @@ win32 {
     QMAKE_CXXFLAGS += -g
     QMAKE_LFLAGS_RELEASE =
     # required for backtrace
-    LIBS += -L$$(OMDEV)/tools/mingw/bin -lintl-8 -lbfd -liberty -limagehlp
+    LIBS += -L$$(OMDEV)/tools/mingw/bin -limagehlp -lbfd -LF:/msys/mingw64/lib/binutils -lintl -liberty
   }
   LIBS += -L../OMEditGUI/Debugger/Parser -lGDBMIParser \
     -L$$(OMBUILDDIR)/lib/omc -lomantlr3 -lOMPlot -lomqwt \
@@ -217,7 +220,7 @@ HEADERS  += Util/Helper.h \
   OMC/Parser/OMCOutputLexer.h
 
 LIBS += -lqjson
-INCLUDEPATH += ../../qjson-0.8.1/build/include
+INCLUDEPATH += ../../qjson/build/include
 
 INCLUDEPATH += . \
   Annotations \

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp b/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp
@@ -457,12 +457,18 @@ void SimulationOutputWidget::simulationProcessStarted()
   */
 void SimulationOutputWidget::writeSimulationOutput(QString output, StringHandler::SimulationMessageType type, bool textFormat)
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+  QString escaped = QString(output).toHtmlEscaped();
+#else /* Qt4 */
+  QString escaped = Qt::escape(output);
+#endif
+
   mpGeneratedFilesTabWidget->setTabEnabled(0, true);
   if (isOutputStructured()) {
     if (textFormat) {
       output = QString("<message stream=\"stdout\" type=\"%1\" text=\"%2\" />")
           .arg(StringHandler::getSimulationMessageTypeString(type))
-          .arg(Qt::escape(output));
+          .arg(escaped);
     }
     if (!mpSimulationOutputHandler) {
       mpSimulationOutputHandler = new SimulationOutputHandler(this, output);
@@ -554,7 +560,12 @@ void SimulationOutputWidget::openTransformationBrowser(QUrl url)
   /* open the model_info.json file */
   if (QFileInfo(fileName).exists()) {
     TransformationsWidget *pTransformationsWidget = mpMainWindow->showTransformationsWidget(fileName);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+    QUrlQuery query(url);
+    int equationIndex = query.queryItemValue("index").toInt();
+#else /* Qt4 */
     int equationIndex = url.queryItemValue("index").toInt();
+#endif
     QTreeWidgetItem *pTreeWidgetItem = pTransformationsWidget->findEquationTreeItem(equationIndex);
     if (pTreeWidgetItem) {
       pTransformationsWidget->getEquationsTreeWidget()->clearSelection();

diff --git a/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp b/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp
@@ -49,7 +49,11 @@ QString OMOperation::toString()
 
 QString OMOperation::toHtml()
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+  return QString(toString()).toHtmlEscaped();
+#else /* Qt4 */
   return Qt::escape(toString());
+#endif
 }
 
 QString OMOperation::diffHtml(QString &before, QString &after)

diff --git a/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp b/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp
@@ -985,7 +985,13 @@ QTreeWidgetItem* TransformationsWidget::makeEquationTreeWidgetItem(int equationI
   QTreeWidgetItem *pEquationTreeItem = new IntegerTreeWidgetItem(values, mpEquationsTreeWidget);
   pEquationTreeItem->setToolTip(0, values[0]);
   pEquationTreeItem->setToolTip(1, values[1]);
-  pEquationTreeItem->setToolTip(2, "<html><div style=\"margin:3px;\">" + Qt::escape(values[2]) + "</div></html>");
+  pEquationTreeItem->setToolTip(2, "<html><div style=\"margin:3px;\">" +
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+  QString(values[2]).toHtmlEscaped()
+#else /* Qt4 */
+  Qt::escape(values[2])
+#endif
+  + "</div></html>");
   pEquationTreeItem->setToolTip(4, "Maximum execution time in a single step");
   pEquationTreeItem->setToolTip(5, "Total time excluding the overhead of measuring.");
   pEquationTreeItem->setToolTip(6, "Fraction of time, 100% is the total time of all non-child equations.");