Skip to content

Commit 1fdacc5

Browse files
Matthias Kuhnmhugent
Matthias Kuhn
authored andcommitted
Remove merge conflict
1 parent f5ff7c2 commit 1fdacc5

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/core/qgsvectorlayer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
733733
{
734734
break;
735735
}
736-
736+
#if 0 // MK: disable this totally as it breaks QT painting engine (can result in recursive repaint)
737737
#ifndef Q_WS_MAC //MH: disable this on Mac for now to avoid problems with resizing
738738
if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )
739739
{
@@ -747,6 +747,7 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
747747
qApp->processEvents();
748748
}
749749
#endif //Q_WS_MAC
750+
#endif
750751

751752
bool sel = mSelectedFeatureIds.contains( fet.id() );
752753
bool drawMarker = ( mEditable && ( !vertexMarkerOnlyForSelection || sel ) );

src/gui/qgsmapcanvas.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,15 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent, const char *name )
8484
, mAntiAliasing( false )
8585
{
8686
setObjectName( name );
87+
8788
//disable the update that leads to the resize crash
8889
if ( viewport() )
8990
{
9091
#ifndef ANDROID
9192
viewport()->setAttribute( Qt::WA_PaintOnScreen, true );
9293
#endif //ANDROID
9394
}
95+
#endif
9496

9597
mScene = new QGraphicsScene();
9698
setScene( mScene );

0 commit comments

Comments
 (0)