Compare commits

...

3 Commits

Author SHA1 Message Date
Roman Telezhynskyi 56859de79d Add missing themeDef.cpp. 2024-04-23 09:12:11 +03:00
Roman Telezhynskyi ce82eb53f7 Fix AppImage script. 2024-04-23 09:10:08 +03:00
Roman Telezhynskyi 064bd33397 Fix build errors. 2024-04-23 08:28:16 +03:00
4 changed files with 18 additions and 27 deletions

View File

@ -90,20 +90,20 @@ AppDir:
- opt/qt515/plugins/egldeviceintegrations
- opt/qt515/plugins/platforminputcontexts
- opt/qt515/plugins/sqldrivers
- /opt/qt515/translations/assistant*.qm
- /opt/qt515/translations/designer*.qm
- /opt/qt515/translations/linguist*.qm
- /opt/qt515/translations/qt_help*.qm
- /opt/qt515/translations/qtconnectivity*.qm
- /opt/qt515/translations/qtdeclarative*.qm
- /opt/qt515/translations/qtlocation*.qm
- /opt/qt515/translations/qtmultimedia*.qm
- /opt/qt515/translations/qtquickcontrols2*.qm
- /opt/qt515/translations/qtquickcontrols*.qm
- /opt/qt515/translations/qtscript*.qm
- /opt/qt515/translations/qtserialport*.qm
- /opt/qt515/translations/qtwebengine*.qm
- /opt/qt515/translations/qtwebsockets*.qm
- opt/qt515/translations/assistant*.qm
- opt/qt515/translations/designer*.qm
- opt/qt515/translations/linguist*.qm
- opt/qt515/translations/qt_help*.qm
- opt/qt515/translations/qtconnectivity*.qm
- opt/qt515/translations/qtdeclarative*.qm
- opt/qt515/translations/qtlocation*.qm
- opt/qt515/translations/qtmultimedia*.qm
- opt/qt515/translations/qtquickcontrols2*.qm
- opt/qt515/translations/qtquickcontrols*.qm
- opt/qt515/translations/qtscript*.qm
- opt/qt515/translations/qtserialport*.qm
- opt/qt515/translations/qtwebengine*.qm
- opt/qt515/translations/qtwebsockets*.qm
runtime:
env:
APPDIR_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/opt/qt515/lib:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders:$APPDIR/usr/local/lib/valentina"

View File

@ -460,7 +460,8 @@ auto VPPiece::ClosestDistance(const QVector<QPointF> &path1, const QVector<QPoin
}
};
auto CalculateClosestDistanceForChunk = [&](const QVector<QPointF> &chunk) -> QLineF
std::function<QLineF(const QVector<QPointF> &)> const CalculateClosestDistanceForChunk =
[&](const QVector<QPointF> &chunk)
{
qreal minLocalDistance = std::numeric_limits<qreal>::max();
QLineF localClosestDistance;

View File

@ -887,7 +887,7 @@ void VPMainWindow::InitPropertyTabCurrentPiece()
const QIcon warningIcon = FromTheme(VThemeIcon::DialogWarning);
auto WarningIcon = [warningIcon](QLabel *label)
{
const int size = qRound(16 * label->devicePixelRatio());
const int size = qRound(16. * label->devicePixelRatio());
label->setPixmap(warningIcon.pixmap(size, size));
};

View File

@ -13,6 +13,7 @@ SOURCES += \
$$PWD/svgfont/vsvgglyph.cpp \
$$PWD/svgfont/vsvgpathtokenizer.cpp \
$$PWD/testpath.cpp \
$$PWD/theme/themeDef.cpp \
$$PWD/theme/vapplicationstyle.cpp \
$$PWD/theme/vmanuallayoutstyle.cpp \
$$PWD/theme/vpatternpiecestyle.cpp \
@ -104,17 +105,6 @@ contains(DEFINES, APPIMAGE) {
$$PWD/appimage.h
}
# Qt's versions
# 5.2.0, 5.2.1
# 5.3.0, 5.3.1, 5.3.2
contains(QT_VERSION, ^5\\.[0-2]\\.[0-2]$) { # Since Qt 5.3.0
HEADERS +=
SOURCES +=
}
FORMS += \
$$PWD/dialogs/dialogaskcollectstatistic.ui \
$$PWD/dialogs/dialogexporttocsv.ui \