- copy libqjson.dll from its new place to build/bin

- more Qt5 adaptation
- use the linking flags just for linking, not for compiling

Makefile.omdev.mingw

@@ -34,4 +34,7 @@ qjson-build:
 	(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/build/bin/libqjson*$(SHREXT)* $(OMBUILDDIR)/lib/omc/
+	cp -a qjson/build/lib/libqjson*$(SHREXT)* $(OMBUILDDIR)/bin/
+	cp -a qjson/build/bin/libqjson*$(SHREXT)* $(OMBUILDDIR)/bin/
 	cp -a qjson/src/*.h qjson/build/include/qjson

OMEdit/OMEditGUI/CrashReport/CrashReportDialog.h

@@ -41,6 +41,8 @@
 #include <QtGlobal>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QtWidgets>
+#include <QNetworkReply>
+#include <QHttpMultiPart>
 #else
 #include <QtCore>
 #include <QtGui>

OMEdit/OMEditGUI/MainWindow.h

@@ -48,6 +48,7 @@
 #include <QTextCodec>
 #include <QUrlQuery>
 #include <QItemDelegate>
+#include <QDomDocument>
 #else
 #include <QtGui>
 #include <QtWebKit>

OMEdit/OMEditGUI/OMEditGUI.pro

@@ -54,12 +54,10 @@ evil_hack_to_fool_lupdate {
 # Windows libraries and includes
 win32 {
   OPENMODELICAHOME = $$(OPENMODELICAHOME)
-  QMAKE_LFLAGS += -Wl,--enable-auto-import
+  QMAKE_LFLAGS += -Wl,--stack,16777216,--enable-auto-import
 
   DEFINES += IMPORT_INTO=1
 
-  QMAKE_CXXFLAGS += -Wl,--stack,16777216
-
   CONFIG(release, debug|release) {
     # In order to get the stack trace in Windows we must add -g flag. Qt automatically adds the -O2 flag for optimization.
     # We should also unset the QMAKE_LFLAGS_RELEASE define because it is defined as QMAKE_LFLAGS_RELEASE = -Wl,-s in qmake.conf file for MinGW