Compare commits
3 Commits
7de604a63b
...
56859de79d
Author | SHA1 | Date |
---|---|---|
Roman Telezhynskyi | 56859de79d | |
Roman Telezhynskyi | ce82eb53f7 | |
Roman Telezhynskyi | 064bd33397 |
|
@ -90,20 +90,20 @@ AppDir:
|
||||||
- opt/qt515/plugins/egldeviceintegrations
|
- opt/qt515/plugins/egldeviceintegrations
|
||||||
- opt/qt515/plugins/platforminputcontexts
|
- opt/qt515/plugins/platforminputcontexts
|
||||||
- opt/qt515/plugins/sqldrivers
|
- opt/qt515/plugins/sqldrivers
|
||||||
- /opt/qt515/translations/assistant*.qm
|
- opt/qt515/translations/assistant*.qm
|
||||||
- /opt/qt515/translations/designer*.qm
|
- opt/qt515/translations/designer*.qm
|
||||||
- /opt/qt515/translations/linguist*.qm
|
- opt/qt515/translations/linguist*.qm
|
||||||
- /opt/qt515/translations/qt_help*.qm
|
- opt/qt515/translations/qt_help*.qm
|
||||||
- /opt/qt515/translations/qtconnectivity*.qm
|
- opt/qt515/translations/qtconnectivity*.qm
|
||||||
- /opt/qt515/translations/qtdeclarative*.qm
|
- opt/qt515/translations/qtdeclarative*.qm
|
||||||
- /opt/qt515/translations/qtlocation*.qm
|
- opt/qt515/translations/qtlocation*.qm
|
||||||
- /opt/qt515/translations/qtmultimedia*.qm
|
- opt/qt515/translations/qtmultimedia*.qm
|
||||||
- /opt/qt515/translations/qtquickcontrols2*.qm
|
- opt/qt515/translations/qtquickcontrols2*.qm
|
||||||
- /opt/qt515/translations/qtquickcontrols*.qm
|
- opt/qt515/translations/qtquickcontrols*.qm
|
||||||
- /opt/qt515/translations/qtscript*.qm
|
- opt/qt515/translations/qtscript*.qm
|
||||||
- /opt/qt515/translations/qtserialport*.qm
|
- opt/qt515/translations/qtserialport*.qm
|
||||||
- /opt/qt515/translations/qtwebengine*.qm
|
- opt/qt515/translations/qtwebengine*.qm
|
||||||
- /opt/qt515/translations/qtwebsockets*.qm
|
- opt/qt515/translations/qtwebsockets*.qm
|
||||||
runtime:
|
runtime:
|
||||||
env:
|
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"
|
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"
|
||||||
|
|
|
@ -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();
|
qreal minLocalDistance = std::numeric_limits<qreal>::max();
|
||||||
QLineF localClosestDistance;
|
QLineF localClosestDistance;
|
||||||
|
|
|
@ -887,7 +887,7 @@ void VPMainWindow::InitPropertyTabCurrentPiece()
|
||||||
const QIcon warningIcon = FromTheme(VThemeIcon::DialogWarning);
|
const QIcon warningIcon = FromTheme(VThemeIcon::DialogWarning);
|
||||||
auto WarningIcon = [warningIcon](QLabel *label)
|
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));
|
label->setPixmap(warningIcon.pixmap(size, size));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ SOURCES += \
|
||||||
$$PWD/svgfont/vsvgglyph.cpp \
|
$$PWD/svgfont/vsvgglyph.cpp \
|
||||||
$$PWD/svgfont/vsvgpathtokenizer.cpp \
|
$$PWD/svgfont/vsvgpathtokenizer.cpp \
|
||||||
$$PWD/testpath.cpp \
|
$$PWD/testpath.cpp \
|
||||||
|
$$PWD/theme/themeDef.cpp \
|
||||||
$$PWD/theme/vapplicationstyle.cpp \
|
$$PWD/theme/vapplicationstyle.cpp \
|
||||||
$$PWD/theme/vmanuallayoutstyle.cpp \
|
$$PWD/theme/vmanuallayoutstyle.cpp \
|
||||||
$$PWD/theme/vpatternpiecestyle.cpp \
|
$$PWD/theme/vpatternpiecestyle.cpp \
|
||||||
|
@ -104,17 +105,6 @@ contains(DEFINES, APPIMAGE) {
|
||||||
$$PWD/appimage.h
|
$$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 += \
|
FORMS += \
|
||||||
$$PWD/dialogs/dialogaskcollectstatistic.ui \
|
$$PWD/dialogs/dialogaskcollectstatistic.ui \
|
||||||
$$PWD/dialogs/dialogexporttocsv.ui \
|
$$PWD/dialogs/dialogexporttocsv.ui \
|
||||||
|
|
Loading…
Reference in New Issue