Skip to content

Commit 11f610b

Browse files
committed
Fix build using mingw
Credit to t-hey
1 parent f180ea4 commit 11f610b

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

src/app/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ int main( int argc, char *argv[] )
477477
signal( SIGXFSZ, qgisCrash );
478478
#endif
479479

480-
#ifdef Q_OS_WIN
480+
#ifdef _MSC_VER
481481
SetUnhandledExceptionFilter( QgsCrashHandler::handle );
482482
#endif
483483

src/core/qgsapplication.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ QString QgsApplication::userFullName()
847847
//fall back to login name
848848
if ( sUserFullName.isEmpty() )
849849
sUserFullName = userLoginName();
850-
#elif defined(Q_OS_ANDROID)
850+
#elif defined(Q_OS_ANDROID) || defined(__MINGW32__)
851851
sUserFullName = "Not available";
852852
#else
853853
struct passwd *p = getpwuid( getuid() );

src/core/qgsfeaturerequest.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ bool QgsFeatureRequest::OrderByClause::prepare( QgsExpressionContext *context )
387387
return mExpression.prepare( context );
388388
}
389389

390+
QgsFeatureRequest::OrderBy::OrderBy() = default;
391+
390392
QgsFeatureRequest::OrderBy::OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other )
391393
{
392394
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, other )

src/core/qgsfeaturerequest.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ class CORE_EXPORT QgsFeatureRequest
225225
/**
226226
* Create a new empty order by
227227
*/
228-
CORE_EXPORT OrderBy() = default;
228+
CORE_EXPORT OrderBy();
229229

230230
/**
231231
* Create a new order by from a list of clauses

0 commit comments

Comments
 (0)