Skip to content

Commit 5a1bcf3

Browse files
committed
fix build error on windows and some warnings
1 parent ac50183 commit 5a1bcf3

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

src/core/dxf/qgsdxfexport.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -1669,11 +1669,14 @@ void QgsDxfExport::writeLinestyleAC1018( QTextStream& stream, const QString& sty
16691669

16701670
void QgsDxfExport::writeEntitiesAC1018( QTextStream& stream )
16711671
{
1672+
Q_UNUSED( stream );
16721673
//todo...
16731674
}
16741675

16751676
void QgsDxfExport::writeEntitiesSymbolLevelsAC1018( QTextStream& stream, QgsVectorLayer* layer )
16761677
{
1678+
Q_UNUSED( stream );
1679+
Q_UNUSED( layer );
16771680
//todo...
16781681
}
16791682

src/core/symbology-ng/qgssymbollayerv2.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@
3131
#include <QDomElement>
3232

3333
#include "qgssymbolv2.h"
34-
3534
#include "qgssymbollayerv2utils.h" // QgsStringMap
35+
#include "qgsdxfexport.h"
3636

3737
class QPainter;
3838
class QSize;
3939
class QPolygonF;
4040

41-
class QgsDxfExport;
4241
class QgsExpression;
4342
class QgsRenderContext;
4443

src/gui/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ INCLUDE_DIRECTORIES(
392392
../core/composer
393393
../core/raster
394394
../core/symbology-ng
395+
../core/dxf
395396
${CMAKE_CURRENT_BINARY_DIR}
396397
${CMAKE_CURRENT_BINARY_DIR}/../ui
397398
${QWT_INCLUDE_DIR}

src/ui/qgsoptionsbase.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -3882,9 +3882,9 @@
38823882
<property name="title">
38833883
<string>Default datum transformations</string>
38843884
</property>
3885-
<layout class="QGridLayout" name="gridLayout_8">
3885+
<layout class="QGridLayout" name="gridLayout_10">
38863886
<item row="0" column="0">
3887-
<layout class="QHBoxLayout" name="horizontalLayout_4">
3887+
<layout class="QHBoxLayout" name="horizontalLayout_38">
38883888
<item>
38893889
<widget class="QPushButton" name="mAddDefaultTransformButton">
38903890
<property name="text">

0 commit comments

Comments
 (0)