blumia/pineapple-pictures
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore!: drop Qt version lower than 5.15.2

Browse Source
This commit is contained in:
Gary Wang
2023-05-21 00:36:24 +08:00
parent 235e50439f
commit 5aeb0f821f
4 changed files with 6 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/graphicsview.cpp
View File

@ -13,13 +13,6 @@
#include <QImageReader>
#include <QStyleOptionGraphicsItem>
// TODO: remove this once we drop older Qt support.
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
#define COMPAT_CONSTCOLOR constexpr
#else
#define COMPAT_CONSTCOLOR const
#endif
GraphicsView::GraphicsView(QWidget *parent)
: QGraphicsView (parent)
{
@ -387,8 +380,8 @@ void GraphicsView::setCheckerboardEnabled(bool enabled, bool invertColor)
QPixmap tilePixmap(0x20, 0x20);
tilePixmap.fill(invertColor ? QColor(220, 220, 220, 170) : QColor(35, 35, 35, 170));
QPainter tilePainter(&tilePixmap);
COMPAT_CONSTCOLOR QColor color(45, 45, 45, 170);
COMPAT_CONSTCOLOR QColor invertedColor(210, 210, 210, 170);
constexpr QColor color(45, 45, 45, 170);
constexpr QColor invertedColor(210, 210, 210, 170);
tilePainter.fillRect(0, 0, 0x10, 0x10, invertColor ? invertedColor : color);
tilePainter.fillRect(0x10, 0x10, 0x10, 0x10, invertColor ? invertedColor : color);
tilePainter.end();

4
app/mainwindow.cpp
View File

@ -309,13 +309,9 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
void MainWindow::mouseMoveEvent(QMouseEvent *event)
{
if (event->buttons() & Qt::LeftButton && m_clickedOnWindow && !isMaximized()) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
if (!window()->windowHandle()->startSystemMove()) {
move(event->globalPos() - m_oldMousePos);
}
#else
move(event->globalPos() - m_oldMousePos);
#endif // QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
event->accept();
}