Merge pull request #4876 from nyalldawson/upstream_ftw

nyalldawson · web-flow · commit d70f53c40564 · 2017-07-18T11:02:52.000+10:00
Upstream some sourcepole fork commits
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1034,7 +1034,7 @@ int main( int argc, char *argv[] )
     }
     else
     {
-      qWarning( "loading of qgis translation failed [%s]", QStringLiteral( "%1/qgis_%2" ).arg( i18nPath, myTranslationCode ).toLocal8Bit().constData() );
+      QgsDebugMsg( QStringLiteral( "loading of qgis translation failed %1/qgis_%2" ).arg( i18nPath, myTranslationCode ) );
     }
 
     /* Translation file for Qt.
@@ -1048,7 +1048,7 @@ int main( int argc, char *argv[] )
     }
     else
     {
-      qWarning( "loading of qt translation failed [%s]", QStringLiteral( "%1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ).toLocal8Bit().constData() );
+      QgsDebugMsg( QStringLiteral( "loading of qt translation failed %1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ) );
     }
   }
 
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -133,6 +133,10 @@ QgsMapCanvas::QgsMapCanvas( QWidget *parent )
   mResizeTimer->setSingleShot( true );
   connect( mResizeTimer, &QTimer::timeout, this, &QgsMapCanvas::refresh );
 
+  mRefreshTimer = new QTimer( this );
+  mRefreshTimer->setSingleShot( true );
+  connect( mRefreshTimer, &QTimer::timeout, this, &QgsMapCanvas::refreshMap );
+
   // create map canvas item which will show the map
   mMap = new QgsMapCanvasMap( this );
 
@@ -493,7 +497,7 @@ void QgsMapCanvas::refresh()
   QgsDebugMsg( "CANVAS refresh scheduling" );
 
   // schedule a refresh
-  QTimer::singleShot( 1, this, SLOT( refreshMap() ) );
+  mRefreshTimer->start( 1 );
 } // refresh
 
 void QgsMapCanvas::refreshMap()
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -814,6 +814,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     QgsMapRendererCache *mCache = nullptr;
 
     QTimer *mResizeTimer = nullptr;
+    QTimer *mRefreshTimer = nullptr;
 
     QgsPreviewEffect *mPreviewEffect = nullptr;
 

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ int main( int argc, char *argv[] )`
`1034`	`1034`	`}`
`1035`	`1035`	`else`
`1036`	`1036`	`{`
`1037`		`- qWarning( "loading of qgis translation failed [%s]", QStringLiteral( "%1/qgis_%2" ).arg( i18nPath, myTranslationCode ).toLocal8Bit().constData() );`
	`1037`	`+ QgsDebugMsg( QStringLiteral( "loading of qgis translation failed %1/qgis_%2" ).arg( i18nPath, myTranslationCode ) );`
`1038`	`1038`	`}`
`1039`	`1039`
`1040`	`1040`	`/* Translation file for Qt.`
`@@ -1048,7 +1048,7 @@ int main( int argc, char *argv[] )`
`1048`	`1048`	`}`
`1049`	`1049`	`else`
`1050`	`1050`	`{`
`1051`		`- qWarning( "loading of qt translation failed [%s]", QStringLiteral( "%1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ).toLocal8Bit().constData() );`
	`1051`	`+ QgsDebugMsg( QStringLiteral( "loading of qt translation failed %1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ) );`
`1052`	`1052`	`}`
`1053`	`1053`	`}`
`1054`	`1054`