Merge pull request #44204 from nirvn/qt6_2

[qt6] Silence a couple of build warnings
qgis · Jul 17, 2021 · 81e412c · 81e412c
2 parents 56fa230 + 1be1c3d
commit 81e412c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/core/project/qgsproject.cpp b/src/core/project/qgsproject.cpp
@@ -1359,7 +1359,7 @@ bool QgsProject::readProjectFile( const QString &filename, QgsProject::ReadFlags
   if ( QFile( QStringLiteral( "%1/%2.qm" ).arg( QFileInfo( projectFile.fileName() ).absolutePath(), localeFileName ) ).exists() )
   {
     mTranslator.reset( new QTranslator() );
-    mTranslator->load( localeFileName, QFileInfo( projectFile.fileName() ).absolutePath() );
+    ( void )mTranslator->load( localeFileName, QFileInfo( projectFile.fileName() ).absolutePath() );
   }
 
   profile.switchTask( tr( "Reading project file" ) );

diff --git a/src/core/qgsfontutils.cpp b/src/core/qgsfontutils.cpp
@@ -263,8 +263,7 @@ bool QgsFontUtils::loadStandardTestFonts( const QStringList &loadstyles )
         fontsLoaded = ( fontsLoaded || loaded );
         QgsDebugMsgLevel( QStringLiteral( "Test font '%1 %2' %3 from filesystem [%4]" )
                           .arg( fontFamily, fontstyle, loaded ? "loaded" : "FAILED to load", fontPath ), 2 );
-        QFontDatabase db;
-        QgsDebugMsgLevel( QStringLiteral( "font families in %1: %2" ).arg( fontID ).arg( db.applicationFontFamilies( fontID ).join( "," ) ), 2 );
+        QgsDebugMsgLevel( QStringLiteral( "font families in %1: %2" ).arg( fontID ).arg( QFontDatabase().applicationFontFamilies( fontID ).join( "," ) ), 2 );
       }
       else
       {