Server adjustments (allow usage from build dir, new API)

Author: wonder-sk

src/mapserver/qgis_map_serv.cpp

@@ -169,18 +169,7 @@ int main( int argc, char * argv[] )
   QgsApplication qgsapp( argc, argv, getenv( "DISPLAY" ) );
 
   //Default prefix path may be altered by environment variable
-  char* prefixPath = getenv( "QGIS_PREFIX_PATH" );
-  if ( prefixPath )
-  {
-    QgsApplication::setPrefixPath( prefixPath, TRUE );
-  }
-#if !defined(Q_OS_WIN)
-  else
-  {
-    // init QGIS's paths - true means that all path will be inited from prefix
-    QgsApplication::setPrefixPath( CMAKE_INSTALL_PREFIX, TRUE );
-  }
-#endif
+  QgsApplication::init();
 
 #if defined(MAPSERVER_SKIP_ECW)
   QgsDebugMsg( "Skipping GDAL ECW drivers in server." );

src/mapserver/qgsprojectparser.cpp

@@ -2240,7 +2240,7 @@ QgsComposition* QgsProjectParser::initComposition( const QString& composerTempla
     return 0;
   }
 
-  QgsComposition* composition = new QgsComposition( mapRenderer ); //set resolution, paper size from composer element attributes
+  QgsComposition* composition = new QgsComposition( mapRenderer->mapSettings() ); //set resolution, paper size from composer element attributes
   if ( !composition->readXML( compositionElem, *mXMLDoc ) )
   {
     delete composition;

src/mapserver/qgswmsserver.cpp

@@ -1461,7 +1461,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     }
 
     //check if feature is rendered at all
-    r2->startRender( renderContext, layer );
+    r2->startRender( renderContext, layer->pendingFields() );
     bool renderV2 = r2->willRenderFeature( feature );
     r2->stopRender( renderContext );
     if ( !renderV2 )