Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Aug 17, 2014
1 parent 9ef4bd6 commit ebd9726d6498ed176bab423022bc4fbbbd8cc765
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/core/composer/qgscomposermapgrid.cpp
  2. +2 −2 src/gui/qgscolorschemelist.h
@@ -456,7 +456,7 @@ void QgsComposerMapGrid::drawGridNoTransform( QgsRenderContext &context, double
{
if ( mGridStyle == QgsComposerMap::Cross )
{
//apply a treshold to avoid calculate point if the two points are very close together (can lead to artifacts)
//apply a threshold to avoid calculate point if the two points are very close together (can lead to artifacts)
crossEnd1 = (( intersectionPoint - vIt->second.p1() ).manhattanLength() > 0.01 ) ?
QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, vIt->second.p1(), mCrossLength ) : intersectionPoint;
crossEnd2 = (( intersectionPoint - vIt->second.p2() ).manhattanLength() > 0.01 ) ?
@@ -496,7 +496,7 @@ void QgsComposerMapGrid::drawGridNoTransform( QgsRenderContext &context, double
{
if ( vIt->second.intersect( hIt->second, &intersectionPoint ) == QLineF::BoundedIntersection )
{
//apply a treshold to avoid calculate point if the two points are very close together (can lead to artifacts)
//apply a threshold to avoid calculate point if the two points are very close together (can lead to artifacts)
crossEnd1 = (( intersectionPoint - hIt->second.p1() ).manhattanLength() > 0.01 ) ?
QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, hIt->second.p1(), mCrossLength ) : intersectionPoint;
crossEnd2 = (( intersectionPoint - hIt->second.p2() ).manhattanLength() > 0.01 ) ?
@@ -28,7 +28,7 @@ class QMimeData;
* @see QgsColorSchemeList
* @note introduced in QGIS 2.5
*/
class QgsColorSwatchDelegate : public QAbstractItemDelegate
class GUI_EXPORT QgsColorSwatchDelegate : public QAbstractItemDelegate
{
Q_OBJECT

@@ -54,7 +54,7 @@ class QgsColorSwatchDelegate : public QAbstractItemDelegate
* @see QgsColorSchemeList
* @note introduced in QGIS 2.5
*/
class CORE_EXPORT QgsColorSchemeModel: public QAbstractItemModel
class GUI_EXPORT QgsColorSchemeModel: public QAbstractItemModel
{
Q_OBJECT

0 comments on commit ebd9726

Please sign in to comment.
You can’t perform that action at this time.