Port some more tests to layouts, drop composer tests which

have been ported to layouts

src/core/layout/qgslayoutitemlegend.cpp

@@ -38,7 +38,7 @@ QgsLayoutItemLegend::QgsLayoutItemLegend( QgsLayout *layout )
   : QgsLayoutItem( layout )
   , mLegendModel( new QgsLegendModel( layout->project()->layerTreeRoot() ) )
 {
-#if 0 //TODO
+#if 0 //no longer required?
   connect( &layout->atlasComposition(), &QgsAtlasComposition::renderEnded, this, &QgsLayoutItemLegend::onAtlasEnded );
 #endif
 

src/core/layout/qgslayoutitempolyline.cpp

@@ -199,6 +199,9 @@ void QgsLayoutItemPolyline::updateMarkerSvgSizes()
 
 void QgsLayoutItemPolyline::drawArrowHead( QPainter *p, const double x, const double y, const double angle, const double arrowHeadWidth )
 {
+  if ( !p )
+    return;
+
   double angleRad = angle / 180.0 * M_PI;
   QPointF middlePoint( x, y );
   //rotate both arrow points

src/core/layout/qgslayoutitempolyline.h

@@ -259,6 +259,8 @@ class CORE_EXPORT QgsLayoutItemPolyline: public QgsLayoutNodesItem
     void drawSvgMarker( QPainter *p, QPointF point, double angle, const QString &markerPath, double height ) const;
 
     double computeMarkerMargin() const;
+
+    friend class TestQgsLayoutPolyline;
 };
 
 #endif // QGSLAYOUTITEMPOLYLINE_H

tests/src/core/CMakeLists.txt

@@ -73,7 +73,6 @@ ENDMACRO (ADD_QGIS_TEST)
 SET(TESTS
  testqgs25drenderer.cpp
  testqgsapplication.cpp
- testqgsatlascomposition.cpp
  testqgsauthcrypto.cpp
  testqgsauthcertutils.cpp
  testqgsauthconfig.cpp
@@ -83,23 +82,8 @@ SET(TESTS
  testqgsclipper.cpp
  testqgscolorscheme.cpp
  testqgscolorschemeregistry.cpp
- testqgscomposerdd.cpp
  testqgscomposereffects.cpp
- testqgscomposergroup.cpp
- testqgscomposerlabel.cpp
- testqgscomposermapgrid.cpp
- testqgscomposermapoverview.cpp
- testqgscomposermap.cpp
- testqgscomposermodel.cpp
  testqgscomposermultiframe.cpp
- testqgscomposerobject.cpp
- testqgscomposerpaper.cpp
- testqgscomposerpicture.cpp
- testqgscomposerrotation.cpp
- testqgscomposerscalebar.cpp
- testqgscomposershapes.cpp
- testqgscomposertablev2.cpp
- testqgscomposerutils.cpp
  testqgsconnectionpool.cpp
  testcontrastenhancements.cpp
  testqgscoordinatereferencesystem.cpp
@@ -148,6 +132,7 @@ SET(TESTS
  testqgslayoutobject.cpp
  testqgslayoutpage.cpp
  testqgslayoutpicture.cpp
+ testqgslayoutpolyline.cpp
  testqgslayoutscalebar.cpp
  testqgslayoutshapes.cpp
  testqgslayouttable.cpp
@@ -208,7 +193,6 @@ SET(TESTS
 
 IF(WITH_QTWEBKIT)
   SET(TESTS ${TESTS}
-      testqgscomposerhtml.cpp
       testqgscomposition.cpp
         )
 ENDIF(WITH_QTWEBKIT)