Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #4876 from nyalldawson/upstream_ftw
Upstream some sourcepole fork commits
- Loading branch information
Showing
with
8 additions
and
3 deletions.
-
+2
−2
src/app/main.cpp
-
+5
−1
src/gui/qgsmapcanvas.cpp
-
+1
−0
src/gui/qgsmapcanvas.h
|
@@ -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 ) ); |
|
|
} |
|
|
} |
|
|
|
|
|
|
@@ -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() |
|
|
|
@@ -814,6 +814,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView |
|
|
QgsMapRendererCache *mCache = nullptr; |
|
|
|
|
|
QTimer *mResizeTimer = nullptr; |
|
|
QTimer *mRefreshTimer = nullptr; |
|
|
|
|
|
QgsPreviewEffect *mPreviewEffect = nullptr; |
|
|
|
|
|