mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
7 commits
24ff2970f3
...
2ebb0aee2c
Author | SHA1 | Date | |
---|---|---|---|
2ebb0aee2c | |||
01ce780548 | |||
52430657c3 | |||
f73ac823d4 | |||
72ba96cfb6 | |||
331a5673e2 | |||
bb2d8c9704 |
32
.cirrus.yml
32
.cirrus.yml
|
@ -44,7 +44,7 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
|
||||||
|
|
||||||
linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
|
linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||||
install_script:
|
install_script:
|
||||||
- bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils"
|
- bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils libstdc++6"
|
||||||
build_script:
|
build_script:
|
||||||
- uname -a
|
- uname -a
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
|
@ -125,6 +125,21 @@ linux_task:
|
||||||
container:
|
container:
|
||||||
cpu: 8
|
cpu: 8
|
||||||
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
|
- container:
|
||||||
|
image: dismine/gcc-ubuntu:13
|
||||||
|
env:
|
||||||
|
COMPILER: gcc
|
||||||
|
QMAKE_SPEC: "linux-g++"
|
||||||
|
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||||
|
COMPILER_REGEX: "gcc|g\\+\\+"
|
||||||
|
matrix:
|
||||||
|
- name: 'GCC 13 [Qt5 QMake]'
|
||||||
|
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
||||||
|
env:
|
||||||
|
QT_SELECT: "qt5"
|
||||||
|
container:
|
||||||
|
cpu: 2
|
||||||
|
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
- container:
|
- container:
|
||||||
image: dismine/gcc-ubuntu:latest
|
image: dismine/gcc-ubuntu:latest
|
||||||
env:
|
env:
|
||||||
|
@ -133,13 +148,6 @@ linux_task:
|
||||||
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
GCC_COLORS: 'error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||||
COMPILER_REGEX: "gcc|g\\+\\+"
|
COMPILER_REGEX: "gcc|g\\+\\+"
|
||||||
matrix:
|
matrix:
|
||||||
- name: 'latest GCC [Qt5 QMake]'
|
|
||||||
<< : *LINUX_QT5_QMAKE_TASK_TEMPLATE
|
|
||||||
env:
|
|
||||||
QT_SELECT: "qt5"
|
|
||||||
container:
|
|
||||||
cpu: 2
|
|
||||||
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
|
||||||
- name: 'latest GCC [Qt5 QBS]'
|
- name: 'latest GCC [Qt5 QBS]'
|
||||||
<< : *LINUX_QT5_QBS_TASK_TEMPLATE
|
<< : *LINUX_QT5_QBS_TASK_TEMPLATE
|
||||||
env:
|
env:
|
||||||
|
@ -154,8 +162,8 @@ linux_task:
|
||||||
QT_SELECT: "qt6"
|
QT_SELECT: "qt6"
|
||||||
ENABLE_CCACHE: true
|
ENABLE_CCACHE: true
|
||||||
container:
|
container:
|
||||||
cpu: 3
|
cpu: 4
|
||||||
memory: 12G # Set to 12GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
memory: 16G # Set to 16GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-container
|
||||||
|
|
||||||
macos_task_template: &MACOS_TASK_TEMPLATE
|
macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
<< : *REGULER_TASK_TEMPLATE
|
<< : *REGULER_TASK_TEMPLATE
|
||||||
|
@ -246,6 +254,10 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- qbs --version
|
- qbs --version
|
||||||
|
# Patch Qbs. Remove after Qbs 2.2.1+.
|
||||||
|
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
||||||
|
- patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
||||||
|
- rm $HOME/qbs-pkg-config-probe.patch
|
||||||
build_script:
|
build_script:
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||||
|
|
|
@ -726,6 +726,10 @@ for:
|
||||||
- which qmake
|
- which qmake
|
||||||
- which qbs
|
- which qbs
|
||||||
- qbs --version
|
- qbs --version
|
||||||
|
# Patch Qbs. Remove after Qbs 2.2.1+.
|
||||||
|
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
||||||
|
- patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
||||||
|
- rm $HOME/qbs-pkg-config-probe.patch
|
||||||
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
||||||
- cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
- cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
||||||
|
@ -905,6 +909,10 @@ for:
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- qbs --version
|
- qbs --version
|
||||||
|
# Patch Qbs. Remove after Qbs 2.2.1+.
|
||||||
|
- curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent
|
||||||
|
- patch -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch
|
||||||
|
- rm $HOME/qbs-pkg-config-probe.patch
|
||||||
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
||||||
- cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
- cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
|
@ -56,8 +56,8 @@ Module {
|
||||||
pchSupport = false;
|
pchSupport = false;
|
||||||
}else{
|
}else{
|
||||||
if (clangToolchain) {
|
if (clangToolchain) {
|
||||||
if (Utilities.versionCompare(version, "4.6") < 0) {
|
if (Utilities.versionCompare(version, "4.10") < 0) {
|
||||||
console.info("ccache version < 4.6 is not compatible with Clang and precompiled headers.");
|
console.info("ccache version < 4.10 is not compatible with Clang and precompiled headers.");
|
||||||
pchSupport = false;
|
pchSupport = false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1276,6 +1276,10 @@ void VDxfEngine::ExportAAMADrawFoldLine(const QSharedPointer<dx_ifaceBlock> &det
|
||||||
{
|
{
|
||||||
VFoldLine const fLine = detail.FoldLine();
|
VFoldLine const fLine = detail.FoldLine();
|
||||||
QVector<QVector<QPointF>> points = fLine.FoldLineMarkPoints();
|
QVector<QVector<QPointF>> points = fLine.FoldLineMarkPoints();
|
||||||
|
if (points.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (detail.GetFoldLineType())
|
switch (detail.GetFoldLineType())
|
||||||
{
|
{
|
||||||
|
@ -1728,6 +1732,10 @@ void VDxfEngine::ExportASTMDrawFoldLine(const QSharedPointer<dx_ifaceBlock> &det
|
||||||
{
|
{
|
||||||
VFoldLine const fLine = detail.FoldLine();
|
VFoldLine const fLine = detail.FoldLine();
|
||||||
QVector<QVector<QPointF>> points = fLine.FoldLineMarkPoints();
|
QVector<QVector<QPointF>> points = fLine.FoldLineMarkPoints();
|
||||||
|
if (points.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (detail.GetFoldLineType())
|
switch (detail.GetFoldLineType())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue