python/pyspatialite/CMakeLists.txt

@@ -1,12 +1,5 @@
-
 SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
 SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
-file(COPY
-  lib/__init__.py
-  lib/dbapi2.py
-  lib/dump.py
-  DESTINATION
-  ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
 
 
 INCLUDE_DIRECTORIES(
@@ -60,6 +53,18 @@ IF (WIN32)
   SET_TARGET_PROPERTIES(pyspatialite PROPERTIES SUFFIX ".pyd")
 ENDIF (WIN32)
 
+FOREACH(file
+  lib/__init__.py
+  lib/dbapi2.py
+  lib/dump.py
+)
+  ADD_CUSTOM_COMMAND(TARGET pyspatialite
+	  POST_BUILD
+	  COMMAND ${CMAKE_COMMAND} -E copy ${file} ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite/${file}
+	  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  )
+ENDFOREACH(file)
+
 INSTALL(TARGETS pyspatialite DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/pyspatialite")
 INSTALL(FILES
 	lib/__init__.py

src/core/qgsapplication.h

@@ -85,7 +85,7 @@ class CORE_EXPORT QgsApplication: public QApplication
 
     //! Returns the path to the developer image directory.
     //! @deprecated images are not provided anymore :-P
-    static const QString developerPath();
+    Q_DECL_DEPRECATED static const QString developerPath();
 
     //! Returns the path to the help application.
     static const QString helpAppPath();

src/core/symbology-ng/qgsellipsesymbollayerv2.cpp

@@ -164,7 +164,7 @@ void QgsEllipseSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
   mBrush.setColor( mFillColor );
 }
 
-void QgsEllipseSymbolLayerV2::stopRender( QgsSymbolV2RenderContext& context )
+void QgsEllipseSymbolLayerV2::stopRender( QgsSymbolV2RenderContext & )
 {
 }
 

src/core/symbology-ng/qgsellipsesymbollayerv2.h

@@ -90,7 +90,9 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2
     QBrush mBrush;
 
     /**Setup mPainterPath
-      @param feature to render (0 if no data defined rendering)*/
+      @param symbolName name of symbol
+      @param context render context
+      @param f feature f to render (0 if no data defined rendering)*/
     void preparePath( const QString& symbolName, QgsSymbolV2RenderContext& context, const QgsFeature* f = 0 );
 
     /**True if this symbol layer uses a data defined property*/

src/core/symbology-ng/qgsfillsymbollayerv2.cpp

@@ -525,7 +525,7 @@ void QgsLinePatternFillSymbolLayer::startRender( QgsSymbolV2RenderContext& conte
   }
 }
 
-void QgsLinePatternFillSymbolLayer::stopRender( QgsSymbolV2RenderContext& context )
+void QgsLinePatternFillSymbolLayer::stopRender( QgsSymbolV2RenderContext & )
 {
 }
 

src/core/symbology-ng/qgssymbollayerv2registry.h

@@ -26,7 +26,7 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata
     /** create a symbol layer of this type given the map of properties. */
     virtual QgsSymbolLayerV2* createSymbolLayer( const QgsStringMap& map ) = 0;
     /** create widget for symbol layer of this type. Can return NULL if there's no GUI */
-    virtual QgsSymbolLayerV2Widget* createSymbolLayerWidget( const QgsVectorLayer* vl ) { return NULL; }
+    virtual QgsSymbolLayerV2Widget* createSymbolLayerWidget( const QgsVectorLayer * ) { return NULL; }
 
   protected:
     QString mName;