fix lenny build

qgis · Jul 4, 2011 · a946a20 · a946a20
1 parent 55a1778
commit a946a20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -508,7 +508,9 @@ class QgsPaintEngineHack : public QPaintEngine
                   // | QPaintEngine::PerspectiveTransform
                   | QPaintEngine::BlendModes
                   // | QPaintEngine::ObjectBoundingModeGradients
+#if QT_VERSION >= 0x040500
                   | QPaintEngine::RasterOpModes
+#endif
                   | QPaintEngine::PaintOutsidePaintEvent
                 );
     }

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -209,13 +209,15 @@ QDomDocument QgsWMSServer::getCapabilities()
   }
   QgsDebugMsg( "layersAndStylesCapabilities returned" );
 
+#if 0
   //for debugging: save the document to disk
-  /*QFile capabilitiesFile( QDir::tempPath() + "/capabilities.txt" );
+  QFile capabilitiesFile( QDir::tempPath() + "/capabilities.txt" );
   if ( capabilitiesFile.open( QIODevice::WriteOnly | QIODevice::Text ) )
   {
     QTextStream capabilitiesStream( &capabilitiesFile );
     doc.save( capabilitiesStream, 4 );
-  }*/
+  }
+#endif
   return doc;
 }
 
@@ -362,7 +364,9 @@ class QgsPaintEngineHack : public QPaintEngine
                   // | QPaintEngine::PerspectiveTransform
                   | QPaintEngine::BlendModes
                   // | QPaintEngine::ObjectBoundingModeGradients
+#if QT_VERSION >= 0x040500
                   | QPaintEngine::RasterOpModes
+#endif
                   | QPaintEngine::PaintOutsidePaintEvent
                 );
     }