aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-11-10 08:07:27 +02:00
parent 19d632a094
commit 869a7b7970
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/valentina/valentina.pro
View File

@ -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 \

5
src/libs/vformat/vmeasurements.cpp
View File

@ -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"

2
src/libs/vmisc/vlockguard.h
View File

@ -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();
}
//---------------------------------------------------------------------------------------------------------------------