workaround for moc issue with app tests

qgis · Sep 10, 2018 · 3effd9c · 3effd9c
1 parent 8b606ce
commit 3effd9c
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 5 deletions.
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -121,7 +121,6 @@ class QgsDiagramProperties;
 #include "qgswelcomepageitemsmodel.h"
 #include "qgsruntimeprofiler.h"
 
-
 #include "ui_qgisapp.h"
 
 #ifdef HAVE_TOUCH

diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
@@ -19,7 +19,10 @@
 #include <QStringList>
 #include <QtTest/QtTest>
 
-#include <qgisapp.h>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
+#endif
+
 #include <qgsapplication.h>
 #include <qgsfeature.h>
 #include <qgsfield.h>

diff --git a/tests/src/app/testqgisapppython.cpp b/tests/src/app/testqgisapppython.cpp
@@ -19,7 +19,10 @@
 #include <QStringList>
 #include <QtTest/QtTest>
 
-#include <qgisapp.h>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
+#endif
+
 #include <qgsapplication.h>
 
 /** \ingroup UnitTests

diff --git a/tests/src/app/testqgsattributetable.cpp b/tests/src/app/testqgsattributetable.cpp
@@ -13,7 +13,9 @@
  *                                                                         *
  ***************************************************************************/
 #include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
 #include "qgisapp.h"
+#endif
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeature.h"
@@ -25,6 +27,7 @@
 #include "qgsunittypes.h"
 #include "qgsvectorfilewriter.h"
 
+
 /** \ingroup UnitTests
  * This is a unit test for the attribute table dialog
  */

diff --git a/tests/src/app/testqgsfieldcalculator.cpp b/tests/src/app/testqgsfieldcalculator.cpp
@@ -13,7 +13,9 @@
  *                                                                         *
  ***************************************************************************/
 #include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
 #include "qgisapp.h"
+#endif
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeature.h"

diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -14,6 +14,8 @@
  ***************************************************************************/
 
 #include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsrasterlayer.h"
@@ -24,9 +26,9 @@
 #include "qgsmapcanvas.h"
 #include "qgsunittypes.h"
 #include "qgsmaptoolidentifyaction.h"
-#include "qgisapp.h"
 #include "qgsidentifymenu.h"
 #include "qgsidentifyresultsdialog.h"
+#endif
 
 #include "cpl_conv.h"
 

diff --git a/tests/src/app/testqgsmaptoolreshape.cpp b/tests/src/app/testqgsmaptoolreshape.cpp
@@ -14,14 +14,16 @@ Email                : paul.blottiere@oslandia.com
  ***************************************************************************/
 
 #include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
+#include "qgisapp.h"
+#endif
 #include "qgsapplication.h"
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
 #include "qgslinestringv2.h"
 #include "qgsmaptoolreshape.h"
 #include "qgsvectordataprovider.h"
 #include "qgsmaplayerregistry.h"
-#include "qgisapp.h"
 
 class TestQgsMapToolReshape : public QObject
 {

diff --git a/tests/src/app/testqgsmeasuretool.cpp b/tests/src/app/testqgsmeasuretool.cpp
@@ -13,7 +13,9 @@
  *                                                                         *
  ***************************************************************************/
 #include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
 #include "qgisapp.h"
+#endif
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeature.h"

diff --git a/tests/src/app/testqgsvectorlayersaveasdialog.cpp b/tests/src/app/testqgsvectorlayersaveasdialog.cpp
@@ -13,7 +13,9 @@
  *                                                                         *
  ***************************************************************************/
 #include <QtTest/QtTest>
+#ifndef Q_MOC_RUN
 #include "qgisapp.h"
+#endif
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeature.h"
@@ -24,6 +26,7 @@
 #include "qgsproject.h"
 #include "qgsmapcanvas.h"
 
+
 /** \ingroup UnitTests
  * This is a unit test for the save as dialog
  */