Fix build using mingw

Theuns · nyalldawson · commit d269f34b5833 · 2017-11-06T08:26:03.000+10:00
Changes many  #if defined (Q_OS_WIN) to #ifdef _MSC_VER, where
they relate specifically to msvc compiler
diff --git a/src/app/mainwin.cpp b/src/app/mainwin.cpp
@@ -105,7 +105,13 @@ int CALLBACK WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
     }
   }
 
+#ifdef _MSC_VER
   HINSTANCE hGetProcIDDLL = LoadLibrary( "qgis_app.dll" );
+#else
+  // MinGW
+  HINSTANCE hGetProcIDDLL = LoadLibrary( "libqgis_app.dll" );
+#endif
+
   if ( !hGetProcIDDLL )
   {
     std::cerr << "Could not load the qgis_app.dll" << std::endl;
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -12090,7 +12090,7 @@ void QgisApp::keyPressEvent( QKeyEvent *e )
   {
     stopRendering();
   }
-#if defined(Q_OS_WIN) && defined(QGISDEBUG)
+#if defined(_MSC_VER) && defined(QGISDEBUG)
   else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )
   {
     QgsCrashHandler::handle( 0 );
diff --git a/src/app/qgscrashhandler.cpp b/src/app/qgscrashhandler.cpp
@@ -23,7 +23,7 @@
 #include "qgscrashreport.h"
 #include "qgsstacktrace.h"
 
-#ifdef Q_OS_WIN
+#ifdef _MSC_VER
 LONG WINAPI QgsCrashHandler::handle( struct _EXCEPTION_POINTERS *ExceptionInfo )
 {
   QgsStackLines stack = QgsStackTrace::trace( ExceptionInfo );
diff --git a/src/app/qgscrashhandler.h b/src/app/qgscrashhandler.h
@@ -32,7 +32,7 @@ class APP_EXPORT QgsCrashHandler
 {
 
   public:
-#ifdef Q_OS_WIN
+#ifdef _MSC_VER
     static LONG WINAPI handle( struct _EXCEPTION_POINTERS *ExceptionInfo );
 #endif
 
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -732,7 +732,7 @@ QString QgsApplication::userLoginName()
   if ( !sUserName.isEmpty() )
     return sUserName;
 
-#ifdef Q_OS_WIN
+#ifdef _MSC_VER
   TCHAR name [ UNLEN + 1 ];
   DWORD size = UNLEN + 1;
 
@@ -767,7 +767,7 @@ QString QgsApplication::userFullName()
   if ( !sUserFullName.isEmpty() )
     return sUserFullName;
 
-#ifdef Q_OS_WIN
+#ifdef _MSC_VER
   TCHAR name [ UNLEN + 1 ];
   DWORD size = UNLEN + 1;
 
diff --git a/src/core/qgsoptionalexpression.h b/src/core/qgsoptionalexpression.h
@@ -77,9 +77,11 @@ class CORE_EXPORT QgsOptionalExpression : public QgsOptional<QgsExpression>
 };
 
 
-#if defined(Q_OS_WIN)
+#if defined(_MSC_VER)
+#ifndef SIP_RUN
 template CORE_EXPORT QgsOptional<QgsExpression>;
 #endif
+#endif
 
 
 #endif // QGSOPTIONALEXPRESSION_H
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -60,10 +60,10 @@
 #include <QDir>
 #include <QUrl>
 
-#ifdef Q_OS_UNIX
-#include <utime.h>
-#elif _MSC_VER
+#ifdef _MSC_VER
 #include <sys/utime.h>
+#else
+#include <utime.h>
 #endif
 
 // canonical project instance
diff --git a/src/core/qgsstacktrace.cpp b/src/core/qgsstacktrace.cpp
@@ -28,7 +28,7 @@
 
 ///@cond PRIVATE
 
-#ifdef Q_OS_WIN
+#ifdef _MSC_VER
 QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( _EXCEPTION_POINTERS *ExceptionInfo )
 {
   QgsStackLines stack;
@@ -145,7 +145,7 @@ void QgsStackTrace::setSymbolPath( QString symbolPaths )
   mSymbolPaths = symbolPaths;
 }
 
-#endif // Q_OS_WIN
+#endif // _MSC_VER
 
 #ifdef Q_OS_LINUX
 QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( unsigned int maxFrames )
diff --git a/src/core/qgsstacktrace.h b/src/core/qgsstacktrace.h
@@ -62,7 +62,7 @@ class CORE_EXPORT QgsStackTrace
       bool isValid() const;
     };
 
-#ifdef Q_OS_WIN
+#ifdef _MSC_VER
 
     /**
      * Return a demangled stack backtrace of the caller function.

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,13 @@ int CALLBACK WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
	`108`	`+#ifdef _MSC_VER`
`108`	`109`	`HINSTANCE hGetProcIDDLL = LoadLibrary( "qgis_app.dll" );`
	`110`	`+#else`
	`111`	`+ // MinGW`
	`112`	`+ HINSTANCE hGetProcIDDLL = LoadLibrary( "libqgis_app.dll" );`
	`113`	`+#endif`
	`114`	`+`
`109`	`115`	`if ( !hGetProcIDDLL )`
`110`	`116`	`{`
`111`	`117`	`std::cerr << "Could not load the qgis_app.dll" << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -12090,7 +12090,7 @@ void QgisApp::keyPressEvent( QKeyEvent *e )`
`12090`	`12090`	`{`
`12091`	`12091`	`stopRendering();`
`12092`	`12092`	`}`
`12093`		`-#if defined(Q_OS_WIN) && defined(QGISDEBUG)`
	`12093`	`+#if defined(_MSC_VER) && defined(QGISDEBUG)`
`12094`	`12094`	`else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )`
`12095`	`12095`	`{`
`12096`	`12096`	`QgsCrashHandler::handle( 0 );`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#include "qgscrashreport.h"`
`24`	`24`	`#include "qgsstacktrace.h"`
`25`	`25`
`26`		`-#ifdef Q_OS_WIN`
	`26`	`+#ifdef _MSC_VER`
`27`	`27`	`LONG WINAPI QgsCrashHandler::handle( struct _EXCEPTION_POINTERS *ExceptionInfo )`
`28`	`28`	`{`
`29`	`29`	`QgsStackLines stack = QgsStackTrace::trace( ExceptionInfo );`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class APP_EXPORT QgsCrashHandler`
`32`	`32`	`{`
`33`	`33`
`34`	`34`	`public:`
`35`		`-#ifdef Q_OS_WIN`
	`35`	`+#ifdef _MSC_VER`
`36`	`36`	`static LONG WINAPI handle( struct _EXCEPTION_POINTERS *ExceptionInfo );`
`37`	`37`	`#endif`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`///@cond PRIVATE`
`30`	`30`
`31`		`-#ifdef Q_OS_WIN`
	`31`	`+#ifdef _MSC_VER`
`32`	`32`	`QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( _EXCEPTION_POINTERS *ExceptionInfo )`
`33`	`33`	`{`
`34`	`34`	`QgsStackLines stack;`
`@@ -145,7 +145,7 @@ void QgsStackTrace::setSymbolPath( QString symbolPaths )`
`145`	`145`	`mSymbolPaths = symbolPaths;`
`146`	`146`	`}`
`147`	`147`
`148`		`-#endif // Q_OS_WIN`
	`148`	`+#endif // _MSC_VER`
`149`	`149`
`150`	`150`	`#ifdef Q_OS_LINUX`
`151`	`151`	`QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( unsigned int maxFrames )`