From d4859b7604da534bfc80e352e182b6e89e2d2e3b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 8 Aug 2023 16:52:07 +0300 Subject: [PATCH] Fix compatibility with Qt 5.6. --- src/app/valentina/dialogs/vwidgetbackgroundimages.cpp | 7 +++---- src/app/valentina/dialogs/vwidgetgroups.cpp | 1 - src/app/valentina/mainwindow.cpp | 1 - .../vtools/dialogs/tools/piece/dialogseamallowance.cpp | 1 - .../tools/backgroundimage/vbackgroundimagecontrols.cpp | 3 +-- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp b/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp index bd49f42b3..a42d8a38e 100644 --- a/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp +++ b/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp @@ -26,14 +26,11 @@ ** *************************************************************************/ #include "vwidgetbackgroundimages.h" -#include "qstringliteral.h" -#include "theme/vtheme.h" -#include "ui_vwidgetbackgroundimages.h" - #include "../ifc/xml/vabstractpattern.h" #include "../ifc/xml/vbackgroundpatternimage.h" #include "../vmisc/def.h" #include "../vmisc/lambdaconstants.h" +#include "../vmisc/theme/vtheme.h" #include "../vmisc/vabstractapplication.h" #include "../vtools/undocommands/image/hideallbackgroundimages.h" #include "../vtools/undocommands/image/hidebackgroundimage.h" @@ -45,6 +42,8 @@ #include "../vtools/undocommands/image/rotatebackgroundimage.h" #include "../vtools/undocommands/image/scalebackgroundimage.h" #include "../vtools/undocommands/image/zvaluemovebackgroundimage.h" +#include "ui_vwidgetbackgroundimages.h" + #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vmisc/backport/qoverload.h" #endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) diff --git a/src/app/valentina/dialogs/vwidgetgroups.cpp b/src/app/valentina/dialogs/vwidgetgroups.cpp index bcfc53168..f7874d824 100644 --- a/src/app/valentina/dialogs/vwidgetgroups.cpp +++ b/src/app/valentina/dialogs/vwidgetgroups.cpp @@ -32,7 +32,6 @@ #include "../vpatterndb/vcontainer.h" #include "../vtools/dialogs/tools/dialoggroup.h" #include "../vtools/undocommands/undogroup.h" -#include "qstringliteral.h" #include "ui_vwidgetgroups.h" #include diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 86eb81b4e..76b8445d0 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -189,7 +189,6 @@ #include "dialogs/vwidgetbackgroundimages.h" #include "dialogs/vwidgetdetails.h" #include "dialogs/vwidgetgroups.h" -#include "qstringliteral.h" #include "ui_mainwindow.h" #include "vabstractapplication.h" #include "vsinglelineoutlinechar.h" diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 7d6a767ba..f21b41e57 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -51,7 +51,6 @@ #include "dialogpatternmaterials.h" #include "dialogpiecepath.h" #include "dialogplacelabel.h" -#include "qstringliteral.h" #include "ui_dialogseamallowance.h" #include "ui_tabgrainline.h" #include "ui_tablabels.h" diff --git a/src/libs/vtools/tools/backgroundimage/vbackgroundimagecontrols.cpp b/src/libs/vtools/tools/backgroundimage/vbackgroundimagecontrols.cpp index 1e82684aa..2c678f155 100644 --- a/src/libs/vtools/tools/backgroundimage/vbackgroundimagecontrols.cpp +++ b/src/libs/vtools/tools/backgroundimage/vbackgroundimagecontrols.cpp @@ -39,12 +39,11 @@ #include "../../undocommands/image/rotatebackgroundimage.h" #include "../../undocommands/image/scalebackgroundimage.h" #include "../ifc/xml/vabstractpattern.h" +#include "../vmisc/theme/vtheme.h" #include "../vmisc/vabstractvalapplication.h" #include "../vmisc/vmath.h" #include "../vwidgets/global.h" #include "../vwidgets/vmaingraphicsview.h" -#include "qstringliteral.h" -#include "theme/vtheme.h" #include "vbackgroundimageitem.h" namespace