[composer] Fix guide sizing under qt5 (fix #15432)

nyalldawson · nyalldawson · commit 297664631edd · 2016-08-15T13:47:36.000+10:00
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -1297,7 +1297,9 @@ QGraphicsLineItem* QgsComposerItem::hAlignSnapItem()
   if ( !mHAlignSnapItem )
   {
     mHAlignSnapItem = new QGraphicsLineItem( nullptr );
-    mHAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );
+    QPen pen = QPen( QColor( Qt::red ) );
+    pen.setWidthF( 0.0 );
+    mHAlignSnapItem->setPen( pen );
     scene()->addItem( mHAlignSnapItem );
     mHAlignSnapItem->setZValue( 90 );
   }
@@ -1309,7 +1311,9 @@ QGraphicsLineItem* QgsComposerItem::vAlignSnapItem()
   if ( !mVAlignSnapItem )
   {
     mVAlignSnapItem = new QGraphicsLineItem( nullptr );
-    mVAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );
+    QPen pen = QPen( QColor( Qt::red ) );
+    pen.setWidthF( 0.0 );
+    mVAlignSnapItem->setPen( pen );
     scene()->addItem( mVAlignSnapItem );
     mVAlignSnapItem->setZValue( 90 );
   }
diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp
@@ -1162,7 +1162,9 @@ QGraphicsLineItem* QgsComposerMouseHandles::hAlignSnapItem()
   if ( !mHAlignSnapItem )
   {
     mHAlignSnapItem = new QGraphicsLineItem( nullptr );
-    mHAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );
+    QPen pen = QPen( QColor( Qt::red ) );
+    pen.setWidthF( 0.0 );
+    mHAlignSnapItem->setPen( pen );
     scene()->addItem( mHAlignSnapItem );
     mHAlignSnapItem->setZValue( 90 );
   }
@@ -1174,7 +1176,9 @@ QGraphicsLineItem* QgsComposerMouseHandles::vAlignSnapItem()
   if ( !mVAlignSnapItem )
   {
     mVAlignSnapItem = new QGraphicsLineItem( nullptr );
-    mVAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );
+    QPen pen = QPen( QColor( Qt::red ) );
+    pen.setWidthF( 0.0 );
+    mVAlignSnapItem->setPen( pen );
     scene()->addItem( mVAlignSnapItem );
     mVAlignSnapItem->setZValue( 90 );
   }

Original file line number	Diff line number	Diff line change
`@@ -1297,7 +1297,9 @@ QGraphicsLineItem* QgsComposerItem::hAlignSnapItem()`
`1297`	`1297`	`if ( !mHAlignSnapItem )`
`1298`	`1298`	`{`
`1299`	`1299`	`mHAlignSnapItem = new QGraphicsLineItem( nullptr );`
`1300`		`- mHAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );`
	`1300`	`+ QPen pen = QPen( QColor( Qt::red ) );`
	`1301`	`+ pen.setWidthF( 0.0 );`
	`1302`	`+ mHAlignSnapItem->setPen( pen );`
`1301`	`1303`	`scene()->addItem( mHAlignSnapItem );`
`1302`	`1304`	`mHAlignSnapItem->setZValue( 90 );`
`1303`	`1305`	`}`
`@@ -1309,7 +1311,9 @@ QGraphicsLineItem* QgsComposerItem::vAlignSnapItem()`
`1309`	`1311`	`if ( !mVAlignSnapItem )`
`1310`	`1312`	`{`
`1311`	`1313`	`mVAlignSnapItem = new QGraphicsLineItem( nullptr );`
`1312`		`- mVAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );`
	`1314`	`+ QPen pen = QPen( QColor( Qt::red ) );`
	`1315`	`+ pen.setWidthF( 0.0 );`
	`1316`	`+ mVAlignSnapItem->setPen( pen );`
`1313`	`1317`	`scene()->addItem( mVAlignSnapItem );`
`1314`	`1318`	`mVAlignSnapItem->setZValue( 90 );`
`1315`	`1319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1162,7 +1162,9 @@ QGraphicsLineItem* QgsComposerMouseHandles::hAlignSnapItem()`
`1162`	`1162`	`if ( !mHAlignSnapItem )`
`1163`	`1163`	`{`
`1164`	`1164`	`mHAlignSnapItem = new QGraphicsLineItem( nullptr );`
`1165`		`- mHAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );`
	`1165`	`+ QPen pen = QPen( QColor( Qt::red ) );`
	`1166`	`+ pen.setWidthF( 0.0 );`
	`1167`	`+ mHAlignSnapItem->setPen( pen );`
`1166`	`1168`	`scene()->addItem( mHAlignSnapItem );`
`1167`	`1169`	`mHAlignSnapItem->setZValue( 90 );`
`1168`	`1170`	`}`
`@@ -1174,7 +1176,9 @@ QGraphicsLineItem* QgsComposerMouseHandles::vAlignSnapItem()`
`1174`	`1176`	`if ( !mVAlignSnapItem )`
`1175`	`1177`	`{`
`1176`	`1178`	`mVAlignSnapItem = new QGraphicsLineItem( nullptr );`
`1177`		`- mVAlignSnapItem->setPen( QPen( QColor( Qt::red ) ) );`
	`1179`	`+ QPen pen = QPen( QColor( Qt::red ) );`
	`1180`	`+ pen.setWidthF( 0.0 );`
	`1181`	`+ mVAlignSnapItem->setPen( pen );`
`1178`	`1182`	`scene()->addItem( mVAlignSnapItem );`
`1179`	`1183`	`mVAlignSnapItem->setZValue( 90 );`
`1180`	`1184`	`}`