From de94a6db845817e5dd9576eb6bf221658e769a21 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Aug 2022 11:51:17 +0300 Subject: [PATCH] Fix build on Windows. --- src/libs/vlayout/dialogs/watermarkwindow.cpp | 6 +++++- src/libs/vlayout/dialogs/watermarkwindow.h | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/vlayout/dialogs/watermarkwindow.cpp b/src/libs/vlayout/dialogs/watermarkwindow.cpp index 035d8d199..78cd079c4 100644 --- a/src/libs/vlayout/dialogs/watermarkwindow.cpp +++ b/src/libs/vlayout/dialogs/watermarkwindow.cpp @@ -37,12 +37,16 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) + #include "../vmisc/def.h" #include "../vmisc/vabstractapplication.h" #include "../vpropertyexplorer/checkablemessagebox.h" #include "../ifc/exception/vexception.h" #include "../ifc/xml/vwatermarkconverter.h" -#include "../vmisc/vvalentinasettings.h" +#include "../vformat/vwatermark.h" //--------------------------------------------------------------------------------------------------------------------- WatermarkWindow::WatermarkWindow(const QString &patternPath, QWidget *parent) : diff --git a/src/libs/vlayout/dialogs/watermarkwindow.h b/src/libs/vlayout/dialogs/watermarkwindow.h index cd7204645..447721e25 100644 --- a/src/libs/vlayout/dialogs/watermarkwindow.h +++ b/src/libs/vlayout/dialogs/watermarkwindow.h @@ -31,7 +31,6 @@ #include #include "../ifc/ifcdef.h" -#include "../vformat/vwatermark.h" #include "../vmisc/vlockguard.h" namespace Ui