Skip to content
Permalink
Browse files

Fix build using mingw

Credit to t-hey
  • Loading branch information
nyalldawson committed Dec 4, 2017
1 parent f180ea4 commit 11f610b7ba79a99e475cf92289cd9640e0b7086b
Showing with 5 additions and 3 deletions.
  1. +1 −1 src/app/main.cpp
  2. +1 −1 src/core/qgsapplication.cpp
  3. +2 −0 src/core/qgsfeaturerequest.cpp
  4. +1 −1 src/core/qgsfeaturerequest.h
@@ -477,7 +477,7 @@ int main( int argc, char *argv[] )
signal( SIGXFSZ, qgisCrash );
#endif

#ifdef Q_OS_WIN
#ifdef _MSC_VER
SetUnhandledExceptionFilter( QgsCrashHandler::handle );
#endif

@@ -847,7 +847,7 @@ QString QgsApplication::userFullName()
//fall back to login name
if ( sUserFullName.isEmpty() )
sUserFullName = userLoginName();
#elif defined(Q_OS_ANDROID)
#elif defined(Q_OS_ANDROID) || defined(__MINGW32__)
sUserFullName = "Not available";
#else
struct passwd *p = getpwuid( getuid() );
@@ -387,6 +387,8 @@ bool QgsFeatureRequest::OrderByClause::prepare( QgsExpressionContext *context )
return mExpression.prepare( context );
}

QgsFeatureRequest::OrderBy::OrderBy() = default;

QgsFeatureRequest::OrderBy::OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other )
{
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, other )
@@ -225,7 +225,7 @@ class CORE_EXPORT QgsFeatureRequest
/**
* Create a new empty order by
*/
CORE_EXPORT OrderBy() = default;
CORE_EXPORT OrderBy();

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

0 comments on commit 11f610b

Please sign in to comment.
You can’t perform that action at this time.