Diabled backbuffering choice on any other system than X11

m-kuhn · mhugent · commit 295c464f90f6 · 2012-08-09T11:20:48.000+02:00
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() )

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :`
`230`	`230`	`cmbScanZipInBrowser->setCurrentIndex( index );`
`231`	`231`
`232`	`232`	`// Set the enable backbuffer state`
	`233`	`+#ifdef Q_WS_X11`
`233`	`234`	`chkEnableBackbuffer->setChecked( settings.value( "/Map/enableBackbuffer" ).toBool() );`
`234`	`235`	`toggleEnableBackbuffer( chkEnableBackbuffer->checkState() );`
	`236`	`+#endif`
`235`	`237`
`236`	`238`	`// set the display update threshold`
`237`	`239`	`spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );`
`@@ -726,6 +728,7 @@ void QgsOptions::toggleStandardDeviation( int state )`
`726`	`728`	`}`
`727`	`729`	`}`
`728`	`730`
	`731`	`+#ifdef Q_WS_X11`
`729`	`732`	`void QgsOptions::toggleEnableBackbuffer( int state )`
`730`	`733`	`{`
`731`	`734`	`if ( Qt::Checked == state )`
`@@ -739,6 +742,7 @@ void QgsOptions::toggleEnableBackbuffer( int state )`
`739`	`742`	`spinBoxUpdateThreshold->setEnabled( true );`
`740`	`743`	`}`
`741`	`744`	`}`
	`745`	`+#endif`
`742`	`746`
`743`	`747`	`QString QgsOptions::theme()`
`744`	`748`	`{`
Original file line number	Diff line number	Diff line change
`@@ -957,7 +957,9 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`957`	`957`	`//set update threshold before each draw to make sure the current setting is picked up`
`958`	`958`	`QSettings settings;`
`959`	`959`	`mUpdateThreshold = settings.value( "Map/updateThreshold", 0 ).toInt();`
	`960`	`+#ifdef Q_WS_X11`
`960`	`961`	`mEnableBackbuffer = settings.value( "/Map/enableBackbuffer", 1 ).toBool();`
	`962`	`+#endif`
`961`	`963`
`962`	`964`	`if ( mUsingRendererV2 )`
`963`	`965`	`{`