8 changes: 7 additions & 1 deletion cmake/Flex.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ MACRO(ADD_FLEX_FILES _sources )

SET(_out ${CMAKE_CURRENT_BINARY_DIR}/flex_${_basename}.cpp)


# -d option for flex means that it will produce output to stderr while analyzing

ADD_CUSTOM_COMMAND(
Expand All @@ -45,6 +44,13 @@ MACRO(ADD_FLEX_FILES _sources )
)

SET(${_sources} ${${_sources}} ${_out} )

# Disable warnings
IF(MSVC)
SET_SOURCE_FILES_PROPERTIES(${_out} PROPERTIES COMPILE_FLAGS /W0)
ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(${_out} PROPERTIES COMPILE_FLAGS -w)
ENDIF(MSVC)
ENDFOREACH (_current_FILE)
ENDMACRO(ADD_FLEX_FILES)

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolpinlabels.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "qgscoordinatetransform.h"

class QgsHighlight;
struct QgsLabelPosition;
class QgsLabelPosition;

/**A map tool for pinning (writing to attribute table) and unpinning labelpositions and rotation*/
class QgsMapToolPinLabels: public QgsMapToolLabel
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolshowhidelabels.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@


/**A map tool for showing or hidding a feature's label*/
class QgsMapToolShowHideLabels: public QgsMapToolLabel
class QgsMapToolShowHideLabels : public QgsMapToolLabel
{
Q_OBJECT

Expand Down
1 change: 1 addition & 0 deletions src/core/composer/qgscomposerattributetable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap>& at
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse );
return false;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/diagram/qgsdiagram.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

class QPainter;
class QPointF;
struct QgsDiagramSettings;
struct QgsDiagramInterpolationSettings;
class QgsDiagramSettings;
class QgsDiagramInterpolationSettings;

class QgsRenderContext;

Expand Down
4 changes: 2 additions & 2 deletions src/core/diagram/qgshistogramdiagram.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

class QPainter;
class QPointF;
struct QgsDiagramSettings;
struct QgsDiagramInterpolationSettings;
class QgsDiagramSettings;
class QgsDiagramInterpolationSettings;

class QgsRenderContext;

Expand Down
4 changes: 2 additions & 2 deletions src/core/diagram/qgspiediagram.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

class QPainter;
class QPointF;
struct QgsDiagramSettings;
struct QgsDiagramInterpolationSettings;
class QgsDiagramSettings;
class QgsDiagramInterpolationSettings;

class QgsRenderContext;

Expand Down
4 changes: 2 additions & 2 deletions src/core/diagram/qgstextdiagram.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

class QPainter;
class QPointF;
struct QgsDiagramSettings;
struct QgsDiagramInterpolationSettings;
class QgsDiagramSettings;
class QgsDiagramInterpolationSettings;

class QgsRenderContext;

Expand Down