From a2c7e1efa2cc78e1adcff7b614c57601633f40af Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 23 Oct 2023 18:16:45 +0300 Subject: [PATCH] Fix qmake script. --- src/app/valentina/core/core.pri | 6 ++++-- src/app/valentina/valentina.pri | 6 ++---- src/libs/vmisc/dialogs/vshortcutdialog.cpp | 1 + src/libs/vmisc/vmisc.pri | 7 +++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/valentina/core/core.pri b/src/app/valentina/core/core.pri index f77f5e908..a5628e4ec 100644 --- a/src/app/valentina/core/core.pri +++ b/src/app/valentina/core/core.pri @@ -6,11 +6,13 @@ HEADERS += \ $$PWD/vformulaproperty.h \ $$PWD/vformulapropertyeditor.h \ $$PWD/vtooloptionspropertybrowser.h \ - $$PWD/vcmdexport.h + $$PWD/vcmdexport.h \ + $$PWD/vvalentinashortcutmanager.h SOURCES += \ $$PWD/vapplication.cpp \ $$PWD/vformulaproperty.cpp \ $$PWD/vformulapropertyeditor.cpp \ $$PWD/vtooloptionspropertybrowser.cpp \ - $$PWD/vcmdexport.cpp + $$PWD/vcmdexport.cpp \ + $$PWD/vvalentinashortcutmanager.cpp diff --git a/src/app/valentina/valentina.pri b/src/app/valentina/valentina.pri index e5b425f6d..ee92ea3db 100644 --- a/src/app/valentina/valentina.pri +++ b/src/app/valentina/valentina.pri @@ -10,8 +10,7 @@ include(core/core.pri) SOURCES += \ $$PWD/main.cpp \ $$PWD/mainwindow.cpp \ - $$PWD/mainwindowsnogui.cpp \ - $$PWD/vvalentinashortcutmanager.cpp + $$PWD/mainwindowsnogui.cpp *msvc*:SOURCES += $$PWD/stable.cpp @@ -20,8 +19,7 @@ HEADERS += \ $$PWD/mainwindow.h \ $$PWD/stable.h \ $$PWD/version.h \ - $$PWD/mainwindowsnogui.h \ - $$PWD/vvalentinashortcutmanager.h + $$PWD/mainwindowsnogui.h # Main forms FORMS += \ diff --git a/src/libs/vmisc/dialogs/vshortcutdialog.cpp b/src/libs/vmisc/dialogs/vshortcutdialog.cpp index a2cd9eaf9..d1cbf56f1 100644 --- a/src/libs/vmisc/dialogs/vshortcutdialog.cpp +++ b/src/libs/vmisc/dialogs/vshortcutdialog.cpp @@ -29,6 +29,7 @@ #include "../vabstractapplication.h" #include "ui_vshortcutdialog.h" +#include #include #if QT_VERSION < QT_VERSION_CHECK(6, 4, 0) diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri index 0ba183d27..ff913cd6d 100644 --- a/src/libs/vmisc/vmisc.pri +++ b/src/libs/vmisc/vmisc.pri @@ -4,6 +4,7 @@ SOURCES += \ $$PWD/def.cpp \ $$PWD/dialogs/dialogaskcollectstatistic.cpp \ + $$PWD/dialogs/vshortcutdialog.cpp \ $$PWD/svgfont/svgdef.cpp \ $$PWD/svgfont/vsvgfont.cpp \ $$PWD/svgfont/vsvgfontdatabase.cpp \ @@ -76,6 +77,7 @@ HEADERS += \ $$PWD/bpstd/variant.hpp \ $$PWD/compatibility.h \ $$PWD/dialogs/dialogaskcollectstatistic.h \ + $$PWD/dialogs/vshortcutdialog.h \ $$PWD/lambdaconstants.h \ $$PWD/stable.h \ $$PWD/def.h \ @@ -125,7 +127,7 @@ HEADERS += \ $$PWD/dialogs/dialogselectlanguage.h \ $$PWD/fpm/fixed.hpp \ $$PWD/fpm/math.hpp \ - $$PWD/vabstractshortcutmanager.cpp + $$PWD/vabstractshortcutmanager.h contains(DEFINES, APPIMAGE) { SOURCES += \ @@ -147,4 +149,5 @@ contains(QT_VERSION, ^5\\.[0-2]\\.[0-2]$) { # Since Qt 5.3.0 FORMS += \ $$PWD/dialogs/dialogaskcollectstatistic.ui \ $$PWD/dialogs/dialogexporttocsv.ui \ - $$PWD/dialogs/dialogselectlanguage.ui + $$PWD/dialogs/dialogselectlanguage.ui \ + $$PWD/dialogs/vshortcutdialog.ui