From 869a7b7970b068e0630e69eecd036d20e1c13e1d Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Fri, 10 Nov 2023 08:07:27 +0200
Subject: [PATCH] Fix building.

---
 src/app/valentina/valentina.pro    | 5 -----
 src/libs/vformat/vmeasurements.cpp | 5 ++---
 src/libs/vmisc/vlockguard.h        | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
index 9c72ac934..35f1e1e03 100644
--- a/src/app/valentina/valentina.pro
+++ b/src/app/valentina/valentina.pro
@@ -319,10 +319,6 @@ unix{
             icns_resources.files += $$PWD/../../../dist/macx/pattern.icns
             icns_resources.files += $$PWD/../../../dist/macx/layout.icns
 
-            # Copy to bundle multisize measurements files
-            # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually.
-            QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$RESOURCES_DIR/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t)
-
             QMAKE_BUNDLE_DATA += \
                 templates \
                 svgfonts \
@@ -343,7 +339,6 @@ win32:*g++* {
         $${OUT_PWD}/$${DESTDIR}/valentina.exe \
         $${OUT_PWD}/../tape/$${DESTDIR}/tape.exe \
         $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.exe \
-        $${OUT_PWD}/../tape/$${DESTDIR}/diagrams.rcc \
         $$PWD/../../../dist/win/valentina.ico \
         $$PWD/../../../dist/win/i-measurements.ico \
         $$PWD/../../../dist/win/s-measurements.ico \
diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp
index c54a92c20..b7917c556 100644
--- a/src/libs/vformat/vmeasurements.cpp
+++ b/src/libs/vformat/vmeasurements.cpp
@@ -37,6 +37,7 @@
 #include <QMessageLogger>
 #include <QScopedPointer>
 #include <QSet>
+#include <QUuid>
 #include <QtDebug>
 #include <qnumeric.h>
 
@@ -47,13 +48,11 @@
 #include "../ifc/xml/vvstconverter.h"
 #include "../qmuparser/qmuparsererror.h"
 #include "../qmuparser/qmutokenparser.h"
+#include "../vmisc/def.h"
 #include "../vmisc/projectversion.h"
 #include "../vpatterndb/calculator.h"
 #include "../vpatterndb/variables/vmeasurement.h"
 #include "../vpatterndb/vcontainer.h"
-#include "def.h"
-#include "qstringliteral.h"
-#include "quuid.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
 #include "../vmisc/compatibility.h"
diff --git a/src/libs/vmisc/vlockguard.h b/src/libs/vmisc/vlockguard.h
index 20ebd273d..66491f1a6 100644
--- a/src/libs/vmisc/vlockguard.h
+++ b/src/libs/vmisc/vlockguard.h
@@ -142,7 +142,7 @@ template <typename Guarded> inline auto VLockGuard<Guarded>::GetLockError() cons
 //---------------------------------------------------------------------------------------------------------------------
 template <typename Guarded> inline auto VLockGuard<Guarded>::IsLocked() const -> bool
 {
-    return not holder.isNull();
+    return !holder.isNull();
 }
 
 //---------------------------------------------------------------------------------------------------------------------