Merge pull request #33836 from kadas-albireo/serverbuild

Fix server mingw build
qgis · Feb 7, 2020 · ddaf839 · ddaf839
2 parents 578616c + 6742826
commit ddaf839
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -290,11 +290,14 @@ bool QgsServer::init()
 
 void QgsServer::putenv( const QString &var, const QString &val )
 {
-#ifdef _MSC_VER
+  if ( val.isEmpty() )
-  _putenv_s( var.toStdString().c_str(), val.toStdString().c_str() );
+  {
-#else
+    qunsetenv( var.toUtf8().data() );
-  setenv( var.toStdString().c_str(), val.toStdString().c_str(), 1 );
+  }
-#endif
+  else
+  {
+    qputenv( var.toUtf8().data(), val.toUtf8() );
+  }
   sSettings()->load( var );
 }