Reenable test and fix compiler warnings

qgis · Nov 11, 2019 · 0c4d1f7 · 0c4d1f7
1 parent 8611a37
commit 0c4d1f7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -61,6 +61,8 @@
 
 #include <QIODevice>
 
+QgsDxfExport::QgsDxfExport() = default;
+
 QgsDxfExport::~QgsDxfExport()
 {
   qDeleteAll( mJobs );

diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
@@ -138,7 +138,7 @@ class CORE_EXPORT QgsDxfExport
     /**
      * Constructor for QgsDxfExport.
      */
-    QgsDxfExport() = default;
+    QgsDxfExport();
 
     ~QgsDxfExport();
 

diff --git a/src/core/dxf/qgsdxfexport_p.h b/src/core/dxf/qgsdxfexport_p.h
@@ -30,8 +30,6 @@
  */
 struct DxfLayerJob
 {
-  DxfLayerJob() = default;
-
   DxfLayerJob( QgsVectorLayer *vl, const QString &layerStyleOverride, QgsRenderContext &renderContext, QgsDxfExport *dxfExport, const QString &splitLayerAttribute )
     : styleOverride( vl )
     , expressionContext( renderContext.expressionContext() )

diff --git a/tests/src/core/testqgsdxfexport.cpp b/tests/src/core/testqgsdxfexport.cpp
@@ -341,14 +341,14 @@ void TestQgsDxfExport::testMtext_data()
   QTest::addColumn<QString>( "layerName" );
 
   QString filename = QStringLiteral( TEST_DATA_DIR ) + "/points.shp";
-#if 0
+
   QgsVectorLayer *pointLayer = new QgsVectorLayer( filename, QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
   QVERIFY( pointLayer->isValid() );
 
   QTest::newRow( "MText" )
       << pointLayer
       << QStringLiteral( "mtext_dxf" );
-#endif
+
   QgsVectorLayer *pointLayerNoSymbols = new QgsVectorLayer( filename, QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
   QVERIFY( pointLayerNoSymbols->isValid() );
   pointLayerNoSymbols->setRenderer( new QgsNullSymbolRenderer() );