From a946a20f632bbce1a08f1eefdba83e2eb896e909 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 4 Jul 2011 09:01:42 +0200 Subject: [PATCH] fix lenny build --- src/app/composer/qgscomposer.cpp | 2 ++ src/mapserver/qgswmsserver.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index a09690fb68e..64f2e418f52 100755 --- 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 index fb54ba54b1f..46e01607e87 100755 --- 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 ); }