From e9626fb58a47a93eae5007fbd7aeeb56d98c5ba8 2015-09-07 10:19:24 From: Miikka Heikkinen Date: 2015-09-07 10:19:24 Subject: [PATCH] Fix compile errors/warnings in linux Change-Id: I4fd8021675a6c1b9717539f8697e3469d747a834 Reviewed-by: Titta Heikkala --- diff --git a/src/charts/themes/chartthemesystem_p.h b/src/charts/themes/chartthemesystem_p.h index 4b7fb5f..d5acb61 100644 --- a/src/charts/themes/chartthemesystem_p.h +++ b/src/charts/themes/chartthemesystem_p.h @@ -122,7 +122,7 @@ public: m_labelBrush = QBrush(QRgb(0x404044)); m_gridLinePen = QPen(QRgb(0xe2e2e2)); m_gridLinePen.setWidth(1); - m_minorGridLinePen = QBrush(QRgb(0x404044)); + m_minorGridLinePen = QPen(QRgb(0x404044)); m_minorGridLinePen.setWidth(1); m_minorGridLinePen.setStyle(Qt::DashLine); m_backgroundShades = BackgroundShadesNone; diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 36592eb..9bc5003 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -100,9 +100,8 @@ DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosit void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position) { - QCategoryAxis::AxisLabelsPosition labelsPosition = (QCategoryAxis::AxisLabelsPosition) position; - if (labelsPosition != m_labelsPosition) { - QCategoryAxis::setLabelsPosition(labelsPosition); + if (position != m_labelsPosition) { + QCategoryAxis::setLabelsPosition((QCategoryAxis::AxisLabelsPosition)position); emit labelsPositionChanged(position); } }