Mingw fixes

qgis · Nov 7, 2017 · e47479b · e47479b
1 parent 89bfe40
commit e47479b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,9 +9,9 @@ IF (WITH_GUI)
 ENDIF (WITH_GUI)
 ADD_SUBDIRECTORY(providers)
 ADD_SUBDIRECTORY(crssync)
-IF(WIN32)
+IF(WIN32 AND NOT MINGW)
   ADD_SUBDIRECTORY(crashhandler)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT MINGW)
 ADD_SUBDIRECTORY(test)
 
 IF (WITH_DESKTOP)

diff --git a/src/crashhandler/qgsstacktrace.h b/src/crashhandler/qgsstacktrace.h
@@ -71,15 +71,13 @@ class QgsStackTrace
 #ifdef _MSC_VER
     HANDLE process;
     HANDLE thread;
-#endif
 
-#ifdef Q_OS_WIN
     /**
      * Return a demangled stack backtrace of the caller function.
      *
      * \since QGIS 3.0
      */
-    static QgsStackTrace* trace( DWORD processID, DWORD threadID, struct _EXCEPTION_POINTERS *ExceptionInfo, QString symbolPath );
+    static QgsStackTrace *trace( DWORD processID, DWORD threadID, struct _EXCEPTION_POINTERS *ExceptionInfo, QString symbolPath );
 #endif
 
 #ifdef Q_OS_LINUX