Skip to content
Permalink
Browse files

Remove merge conflict

  • Loading branch information
Matthias Kuhn authored and mhugent committed Aug 9, 2012
1 parent f5ff7c2 commit 1fdacc5feb96da58f43be603a634da74ff54b816
Showing with 4 additions and 1 deletion.
  1. +2 −1 src/core/qgsvectorlayer.cpp
  2. +2 −0 src/gui/qgsmapcanvas.cpp
@@ -733,7 +733,7 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
{
break;
}

#if 0 // MK: disable this totally as it breaks QT painting engine (can result in recursive repaint)
#ifndef Q_WS_MAC //MH: disable this on Mac for now to avoid problems with resizing
if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )
{
@@ -747,6 +747,7 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
qApp->processEvents();
}
#endif //Q_WS_MAC
#endif

bool sel = mSelectedFeatureIds.contains( fet.id() );
bool drawMarker = ( mEditable && ( !vertexMarkerOnlyForSelection || sel ) );
@@ -84,13 +84,15 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent, const char *name )
, mAntiAliasing( false )
{
setObjectName( name );

//disable the update that leads to the resize crash
if ( viewport() )
{
#ifndef ANDROID
viewport()->setAttribute( Qt::WA_PaintOnScreen, true );
#endif //ANDROID
}
#endif

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

0 comments on commit 1fdacc5

Please sign in to comment.
You can’t perform that action at this time.