fix windows build

qgis · Oct 29, 2017 · cfba4c4 · cfba4c4
1 parent 5b64af1
commit cfba4c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/core/geometry/qgscurve.cpp b/src/core/geometry/qgscurve.cpp
@@ -206,6 +206,7 @@ QgsPoint QgsCurve::childPoint( int index ) const
   QgsVertexId::VertexType type;
   bool res = pointAt( index, point, type );
   Q_ASSERT( res );
+  Q_UNUSED( res );
   return point;
 }
 

diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -381,7 +381,7 @@ QgsField QgsAuxiliaryLayer::createAuxiliaryField( const QgsPropertyDefinition &d
 
   if ( !def.name().isEmpty() || !def.comment().isEmpty() )
   {
-    QVariant::Type type;
+    QVariant::Type type = QVariant::Invalid;
     QString typeName;
     int len( 0 ), precision( 0 );
     switch ( def.dataType() )

diff --git a/src/core/qgsfeaturefiltermodel.cpp b/src/core/qgsfeaturefiltermodel.cpp
@@ -313,9 +313,9 @@ void QgsFeatureFilterModel::scheduledReload()
     if ( mFilterValue.isEmpty() && !mFilterExpression.isEmpty() )
       filterClause = mFilterExpression;
     else if ( mFilterExpression.isEmpty() && !mFilterValue.isEmpty() )
-      filterClause = QStringLiteral( "(%1) ILIKE '\%%2\%'" ).arg( mDisplayExpression, mFilterValue );
+      filterClause = QStringLiteral( "(%1) ILIKE '%%2%'" ).arg( mDisplayExpression, mFilterValue );
     else if ( !mFilterExpression.isEmpty() && !mFilterValue.isEmpty() )
-      filterClause = QStringLiteral( "(%1) AND ((%2) ILIKE '\%%3\%')" ).arg( mFilterExpression, mDisplayExpression, mFilterValue );
+      filterClause = QStringLiteral( "(%1) AND ((%2) ILIKE '%%3%')" ).arg( mFilterExpression, mDisplayExpression, mFilterValue );
 
     if ( !filterClause.isEmpty() )
       request.setFilterExpression( filterClause );

diff --git a/src/core/qgsvectorlayerutils.h b/src/core/qgsvectorlayerutils.h
@@ -39,7 +39,7 @@ class CORE_EXPORT QgsVectorLayerUtils
      *
      * \since QGIS 3.0
      */
-    class QgsDuplicateFeatureContext
+    class CORE_EXPORT QgsDuplicateFeatureContext
     {
       public: