Skip to content

Commit e47479b

Browse files
committedNov 7, 2017
Mingw fixes
1 parent 89bfe40 commit e47479b

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed
 

‎src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ IF (WITH_GUI)
99
ENDIF (WITH_GUI)
1010
ADD_SUBDIRECTORY(providers)
1111
ADD_SUBDIRECTORY(crssync)
12-
IF(WIN32)
12+
IF(WIN32 AND NOT MINGW)
1313
ADD_SUBDIRECTORY(crashhandler)
14-
ENDIF(WIN32)
14+
ENDIF(WIN32 AND NOT MINGW)
1515
ADD_SUBDIRECTORY(test)
1616

1717
IF (WITH_DESKTOP)

‎src/crashhandler/qgsstacktrace.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,13 @@ class QgsStackTrace
7171
#ifdef _MSC_VER
7272
HANDLE process;
7373
HANDLE thread;
74-
#endif
7574

76-
#ifdef Q_OS_WIN
7775
/**
7876
* Return a demangled stack backtrace of the caller function.
7977
*
8078
* \since QGIS 3.0
8179
*/
82-
static QgsStackTrace* trace( DWORD processID, DWORD threadID, struct _EXCEPTION_POINTERS *ExceptionInfo, QString symbolPath );
80+
static QgsStackTrace *trace( DWORD processID, DWORD threadID, struct _EXCEPTION_POINTERS *ExceptionInfo, QString symbolPath );
8381
#endif
8482

8583
#ifdef Q_OS_LINUX

0 commit comments

Comments
 (0)
Please sign in to comment.