Skip to content

Commit ebd9726

Browse files
committed
fix windows build
1 parent 9ef4bd6 commit ebd9726

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/core/composer/qgscomposermapgrid.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ void QgsComposerMapGrid::drawGridNoTransform( QgsRenderContext &context, double
456456
{
457457
if ( mGridStyle == QgsComposerMap::Cross )
458458
{
459-
//apply a treshold to avoid calculate point if the two points are very close together (can lead to artifacts)
459+
//apply a threshold to avoid calculate point if the two points are very close together (can lead to artifacts)
460460
crossEnd1 = (( intersectionPoint - vIt->second.p1() ).manhattanLength() > 0.01 ) ?
461461
QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, vIt->second.p1(), mCrossLength ) : intersectionPoint;
462462
crossEnd2 = (( intersectionPoint - vIt->second.p2() ).manhattanLength() > 0.01 ) ?
@@ -496,7 +496,7 @@ void QgsComposerMapGrid::drawGridNoTransform( QgsRenderContext &context, double
496496
{
497497
if ( vIt->second.intersect( hIt->second, &intersectionPoint ) == QLineF::BoundedIntersection )
498498
{
499-
//apply a treshold to avoid calculate point if the two points are very close together (can lead to artifacts)
499+
//apply a threshold to avoid calculate point if the two points are very close together (can lead to artifacts)
500500
crossEnd1 = (( intersectionPoint - hIt->second.p1() ).manhattanLength() > 0.01 ) ?
501501
QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, hIt->second.p1(), mCrossLength ) : intersectionPoint;
502502
crossEnd2 = (( intersectionPoint - hIt->second.p2() ).manhattanLength() > 0.01 ) ?

src/gui/qgscolorschemelist.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class QMimeData;
2828
* @see QgsColorSchemeList
2929
* @note introduced in QGIS 2.5
3030
*/
31-
class QgsColorSwatchDelegate : public QAbstractItemDelegate
31+
class GUI_EXPORT QgsColorSwatchDelegate : public QAbstractItemDelegate
3232
{
3333
Q_OBJECT
3434

@@ -54,7 +54,7 @@ class QgsColorSwatchDelegate : public QAbstractItemDelegate
5454
* @see QgsColorSchemeList
5555
* @note introduced in QGIS 2.5
5656
*/
57-
class CORE_EXPORT QgsColorSchemeModel: public QAbstractItemModel
57+
class GUI_EXPORT QgsColorSchemeModel: public QAbstractItemModel
5858
{
5959
Q_OBJECT
6060

0 commit comments

Comments
 (0)