Skip to content

Commit

Permalink
Fix build with Qt 5.15 (missing QPainterPath includes)
Browse files Browse the repository at this point in the history
Thanks-to: Petr Zima <zima@matfyz.cz>
  • Loading branch information
a17r authored and 4lex4 committed May 31, 2020
1 parent e04e60a commit 3d1e74e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/core/ImageViewBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include <QGLWidget>
#include <QMouseEvent>
#include <QPaintEngine>
#include <QPainter>
#include <QPainterPath>
#include <QPointer>
#include <QScrollBar>
#include <QtWidgets/QMainWindow>
Expand Down
3 changes: 2 additions & 1 deletion src/core/filters/output/OutputGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <QColor>
#include <QDebug>
#include <QPainter>
#include <QPainterPath>
#include <QPointF>
#include <QPolygonF>
#include <QSize>
Expand Down Expand Up @@ -2632,4 +2633,4 @@ DistortionModel OutputGenerator::Processor::buildMarginalDistortionModel() const
}
return distortionModel;
}
} // namespace output
} // namespace output
3 changes: 2 additions & 1 deletion src/core/filters/page_layout/ImageView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <QMouseEvent>
#include <QPainter>
#include <QPainterPath>
#include <boost/bind.hpp>
#include <boost/lambda/lambda.hpp>

Expand Down Expand Up @@ -1074,4 +1075,4 @@ void ImageView::enableMiddleRectInteraction(const bool state) {
bool ImageView::isShowingMiddleRectEnabled() const {
return (!m_nullContentRect && m_settings->isShowingMiddleRectEnabled()) || m_alignment.isNull();
}
} // namespace page_layout
} // namespace page_layout
3 changes: 2 additions & 1 deletion src/core/filters/select_content/ContentBoxFinder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <QDebug>
#include <QPainter>
#include <QPainterPath>
#include <cmath>
#include <queue>

Expand Down Expand Up @@ -1327,4 +1328,4 @@ const SEDM& ContentBoxFinder::Garbage::sedm() {
}
return m_sedm;
}
} // namespace select_content
} // namespace select_content
1 change: 1 addition & 0 deletions src/core/zones/ZoneContextMenuInteraction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <QMenu>
#include <QMessageBox>
#include <QPainter>
#include <QPainterPath>
#include <boost/bind.hpp>

#include "ImageViewBase.h"
Expand Down

2 comments on commit 3d1e74e

@4lex4
Copy link
Owner

@4lex4 4lex4 commented on 3d1e74e May 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

closes #133

@anoteng
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are also missing one QPainterPath include in src/core/zones/ZoneDefaultInteraction.cpp

Please sign in to comment.