@@ -79,14 +79,14 @@ typedef SInt32 SRefCon;
79
79
#include " qgsrectangle.h"
80
80
#include " qgslogger.h"
81
81
82
- #if defined(linux ) && !defined(ANDROID)
82
+ #if defined(Q_OS_UNIX ) && !defined(ANDROID)
83
83
#include < unistd.h>
84
84
#include < execinfo.h>
85
85
#include < signal.h>
86
86
#endif
87
87
88
88
// (if Windows/Mac, use icon from resource)
89
- #if ! defined(Q_WS_WIN) && ! defined(Q_WS_MAC)
89
+ #if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
90
90
#include " ../../images/themes/default/qgis.xpm" // Linux
91
91
#include < QIcon>
92
92
#endif
@@ -195,7 +195,7 @@ LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo )
195
195
}
196
196
#endif
197
197
198
- #ifdef Q_OS_UNIX
198
+ #if defined( Q_OS_UNIX) && !defined(ANDROID)
199
199
void qgisCrash ( int signal )
200
200
{
201
201
qFatal ( " QGIS died on signal %d" , signal );
@@ -232,7 +232,7 @@ void myMessageOutput( QtMsgType type, const char *msg )
232
232
|| 0 == strncmp ( msg, " QPainter::" , 10 ) )
233
233
{
234
234
#if 0
235
- #if defined(linux ) && ! defined(ANDROID)
235
+ #if defined(Q_OS_UNIX ) && !defined(ANDROID)
236
236
fprintf( stderr, "Stacktrace (run through c++filt):\n" );
237
237
void *buffer[256];
238
238
int nptrs = backtrace( buffer, sizeof( buffer ) / sizeof( *buffer ) );
@@ -254,7 +254,7 @@ void myMessageOutput( QtMsgType type, const char *msg )
254
254
case QtFatalMsg:
255
255
{
256
256
fprintf ( stderr, " Fatal: %s\n " , msg );
257
- #if defined(linux ) && !defined(ANDROID)
257
+ #if defined(Q_OS_UNIX ) && !defined(ANDROID)
258
258
( void ) write ( STDERR_FILENO, " Stacktrace (run through c++filt):\n " , 34 );
259
259
void *buffer[256 ];
260
260
int nptrs = backtrace ( buffer, sizeof ( buffer ) / sizeof ( *buffer ) );
@@ -276,7 +276,7 @@ int main( int argc, char *argv[] )
276
276
#endif // _MSC_VER
277
277
#endif // WIN32
278
278
279
- #if ! defined(ANDROID ) && !defined(_MSC_VER )
279
+ #if defined(Q_OS_UNIX ) && !defined(ANDROID )
280
280
// Set up the custom qWarning/qDebug custom handler
281
281
qInstallMsgHandler ( myMessageOutput );
282
282
@@ -593,7 +593,7 @@ int main( int argc, char *argv[] )
593
593
QgsApplication myApp ( argc, argv, myUseGuiFlag, configpath );
594
594
595
595
// (if Windows/Mac, use icon from resource)
596
- #if ! defined(Q_WS_WIN) && ! defined(Q_WS_MAC)
596
+ #if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
597
597
myApp.setWindowIcon ( QPixmap ( qgis_xpm ) ); // Linux
598
598
#endif
599
599
0 commit comments