Diabled backbuffering choice on any other system than X11

qgis · Aug 9, 2012 · 295c464 · 295c464
1 parent 677cea0
commit 295c464
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -230,8 +230,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   cmbScanZipInBrowser->setCurrentIndex( index );
 
   // Set the enable backbuffer state
+#ifdef Q_WS_X11
   chkEnableBackbuffer->setChecked( settings.value( "/Map/enableBackbuffer" ).toBool() );
   toggleEnableBackbuffer( chkEnableBackbuffer->checkState() );
+#endif
 
   // set the display update threshold
   spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
@@ -726,6 +728,7 @@ void QgsOptions::toggleStandardDeviation( int state )
   }
 }
 
+#ifdef Q_WS_X11
 void QgsOptions::toggleEnableBackbuffer( int state )
 {
   if ( Qt::Checked == state )
@@ -739,6 +742,7 @@ void QgsOptions::toggleEnableBackbuffer( int state )
     spinBoxUpdateThreshold->setEnabled( true );
   }
 }
+#endif
 
 QString QgsOptions::theme()
 {

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -957,7 +957,9 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
   //set update threshold before each draw to make sure the current setting is picked up
   QSettings settings;
   mUpdateThreshold = settings.value( "Map/updateThreshold", 0 ).toInt();
+#ifdef Q_WS_X11
   mEnableBackbuffer = settings.value( "/Map/enableBackbuffer", 1 ).toBool();
+#endif
 
   if ( mUsingRendererV2 )
   {

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -371,8 +371,11 @@ void QgsMapCanvas::refresh()
     return;
 
   QSettings settings;
+#ifdef Q_WS_X11
   bool enableBackbufferSetting = settings.value( "/Map/enableBackbuffer", 1 ).toBool();
-
+#else
+  bool enableBackbufferSetting = 0;
+#endif
 
   //disable the update that leads to the resize crash
   if ( viewport() )