Skip to content

Commit 8c768bc

Browse files
committed
fix #7902
1 parent 8053129 commit 8c768bc

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/app/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ typedef SInt32 SRefCon;
7979
#include "qgsrectangle.h"
8080
#include "qgslogger.h"
8181

82-
#if defined(linux) && !defined(ANDROID)
82+
#if defined(Q_OS_UNIX) && !defined(ANDROID)
8383
#include <unistd.h>
8484
#include <execinfo.h>
8585
#include <signal.h>
8686
#endif
8787

8888
// (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)
9090
#include "../../images/themes/default/qgis.xpm" // Linux
9191
#include <QIcon>
9292
#endif
@@ -195,7 +195,7 @@ LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo )
195195
}
196196
#endif
197197

198-
#ifdef Q_OS_UNIX
198+
#if defined(Q_OS_UNIX) && !defined(ANDROID)
199199
void qgisCrash( int signal )
200200
{
201201
qFatal( "QGIS died on signal %d", signal );
@@ -232,7 +232,7 @@ void myMessageOutput( QtMsgType type, const char *msg )
232232
|| 0 == strncmp( msg, "QPainter::", 10 ) )
233233
{
234234
#if 0
235-
#if defined(linux) && ! defined(ANDROID)
235+
#if defined(Q_OS_UNIX) && !defined(ANDROID)
236236
fprintf( stderr, "Stacktrace (run through c++filt):\n" );
237237
void *buffer[256];
238238
int nptrs = backtrace( buffer, sizeof( buffer ) / sizeof( *buffer ) );
@@ -254,7 +254,7 @@ void myMessageOutput( QtMsgType type, const char *msg )
254254
case QtFatalMsg:
255255
{
256256
fprintf( stderr, "Fatal: %s\n", msg );
257-
#if defined(linux) && !defined(ANDROID)
257+
#if defined(Q_OS_UNIX) && !defined(ANDROID)
258258
( void ) write( STDERR_FILENO, "Stacktrace (run through c++filt):\n", 34 );
259259
void *buffer[256];
260260
int nptrs = backtrace( buffer, sizeof( buffer ) / sizeof( *buffer ) );
@@ -276,7 +276,7 @@ int main( int argc, char *argv[] )
276276
#endif // _MSC_VER
277277
#endif // WIN32
278278

279-
#if !defined(ANDROID) && !defined(_MSC_VER)
279+
#if defined(Q_OS_UNIX) && !defined(ANDROID)
280280
// Set up the custom qWarning/qDebug custom handler
281281
qInstallMsgHandler( myMessageOutput );
282282

@@ -593,7 +593,7 @@ int main( int argc, char *argv[] )
593593
QgsApplication myApp( argc, argv, myUseGuiFlag, configpath );
594594

595595
// (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)
597597
myApp.setWindowIcon( QPixmap( qgis_xpm ) ); // Linux
598598
#endif
599599

src/providers/delimitedtext/qgsdelimitedtextfile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsdelimitedtextfile.cpp - Data provider for delimted text
2+
qgsdelimitedtextfile.cpp - Data provider for delimited text
33
-------------------
44
begin : 2012-01-20
55
copyright : (C) 201 by Chris Crook

src/providers/delimitedtext/qgsdelimitedtextprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsdelimitedtextprovider.cpp - Data provider for delimted text
2+
qgsdelimitedtextprovider.cpp - Data provider for delimited text
33
-------------------
44
begin : 2004-02-27
55
copyright : (C) 2004 by Gary E.Sherman

src/providers/delimitedtext/qgsdelimitedtextprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsdelimitedtextprovider.h - Data provider for delimted text
2+
qgsdelimitedtextprovider.h - Data provider for delimited text
33
-------------------
44
begin : 2004-02-27
55
copyright : (C) 2004 by Gary E.Sherman

0 commit comments

Comments
 (0)