mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "3fad6bc5f942d439ba5f0729769d808a894a228f" and "09d09b5a873ff04adfd08f042ee17815388e313c" have entirely different histories.
3fad6bc5f9
...
09d09b5a87
18
appveyor.yml
18
appveyor.yml
|
@ -168,6 +168,21 @@ environment:
|
||||||
MSYS2_PACKAGES: false
|
MSYS2_PACKAGES: false
|
||||||
DEPLOY: false
|
DEPLOY: false
|
||||||
|
|
||||||
|
- job_name: Windows_Qt_6_4_(MSVC_arm64)
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||||
|
COMPILER: msvc
|
||||||
|
QT: Qt\6.4\msvc2019_arm64
|
||||||
|
QT_VERSION: Qt6_4
|
||||||
|
BUILD_SYSTEM: "qbs"
|
||||||
|
QMAKE: qmake.bat
|
||||||
|
ENABLE_PCH: true
|
||||||
|
MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\bin\\Hostx64\\arm64"
|
||||||
|
ARCH: arm64
|
||||||
|
PYTHON: "C:\\Python311"
|
||||||
|
PLATFORM: "Windows10+"
|
||||||
|
MSYS2_PACKAGES: false
|
||||||
|
DEPLOY: false
|
||||||
|
|
||||||
- job_name: Windows_Qt_5_15_(qbs_GCC_x64)
|
- job_name: Windows_Qt_5_15_(qbs_GCC_x64)
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||||
COMPILER: mingw
|
COMPILER: mingw
|
||||||
|
@ -254,6 +269,8 @@ matrix:
|
||||||
job_name: Windows_Qt_6_4_(GCC_x64)
|
job_name: Windows_Qt_6_4_(GCC_x64)
|
||||||
- platform: x86
|
- platform: x86
|
||||||
job_name: Windows_Qt_6_4_(MSVC_x64)
|
job_name: Windows_Qt_6_4_(MSVC_x64)
|
||||||
|
- platform: x86
|
||||||
|
job_name: Windows_Qt_6_4_(MSVC_arm64)
|
||||||
- platform: x86
|
- platform: x86
|
||||||
job_name: Windows_Qt_5_15_(make_GCC_x64)
|
job_name: Windows_Qt_5_15_(make_GCC_x64)
|
||||||
- platform: x86
|
- platform: x86
|
||||||
|
@ -292,6 +309,7 @@ for:
|
||||||
only:
|
only:
|
||||||
- job_name: Windows_Qt_6_4_(GCC_x64)
|
- job_name: Windows_Qt_6_4_(GCC_x64)
|
||||||
- job_name: Windows_Qt_6_4_(MSVC_x64)
|
- job_name: Windows_Qt_6_4_(MSVC_x64)
|
||||||
|
- job_name: Windows_Qt_6_4_(MSVC_arm64)
|
||||||
- job_name: Windows_Qt_5_15_(qbs_GCC_x64)
|
- job_name: Windows_Qt_5_15_(qbs_GCC_x64)
|
||||||
- job_name: Windows_Qt_5_15_(qbs_MSVC_x64)
|
- job_name: Windows_Qt_5_15_(qbs_MSVC_x64)
|
||||||
- job_name: Windows_Qt_5_15_(qbs_GCC_x86)
|
- job_name: Windows_Qt_5_15_(qbs_GCC_x86)
|
||||||
|
|
|
@ -442,7 +442,7 @@ void DialogFlippingByLine::ShowSourceDetails(int row)
|
||||||
{
|
{
|
||||||
ui->labelAlias->setText(tr("Alias:"));
|
ui->labelAlias->setText(tr("Alias:"));
|
||||||
|
|
||||||
auto SetValue = [](QComboBox *box, const QString &value, const QString &def)
|
auto SetValue = [sourceItem](QComboBox *box, const QString &value, const QString &def)
|
||||||
{
|
{
|
||||||
box->blockSignals(true);
|
box->blockSignals(true);
|
||||||
|
|
||||||
|
@ -463,7 +463,8 @@ void DialogFlippingByLine::ShowSourceDetails(int row)
|
||||||
SetValue(ui->comboBoxPenStyle, sourceItem.penStyle, TypeLineDefault);
|
SetValue(ui->comboBoxPenStyle, sourceItem.penStyle, TypeLineDefault);
|
||||||
|
|
||||||
if (sourceItem.penStyle.isEmpty() || sourceItem.penStyle == TypeLineDefault)
|
if (sourceItem.penStyle.isEmpty() || sourceItem.penStyle == TypeLineDefault)
|
||||||
{;
|
{
|
||||||
|
const QSharedPointer<VAbstractCurve> curve = data->GeometricObject<VAbstractCurve>(sourceItem.id);
|
||||||
int index = ui->comboBoxPenStyle->currentIndex();
|
int index = ui->comboBoxPenStyle->currentIndex();
|
||||||
ui->comboBoxPenStyle->setItemText(index, '<' + tr("Default") + '>');
|
ui->comboBoxPenStyle->setItemText(index, '<' + tr("Default") + '>');
|
||||||
}
|
}
|
||||||
|
|
|
@ -679,7 +679,7 @@ void DialogRotation::ShowSourceDetails(int row)
|
||||||
{
|
{
|
||||||
ui->labelAlias->setText(tr("Alias:"));
|
ui->labelAlias->setText(tr("Alias:"));
|
||||||
|
|
||||||
auto SetValue = [](QComboBox *box, const QString &value, const QString &def)
|
auto SetValue = [sourceItem](QComboBox *box, const QString &value, const QString &def)
|
||||||
{
|
{
|
||||||
box->blockSignals(true);
|
box->blockSignals(true);
|
||||||
|
|
||||||
|
@ -701,6 +701,7 @@ void DialogRotation::ShowSourceDetails(int row)
|
||||||
|
|
||||||
if (sourceItem.penStyle.isEmpty() || sourceItem.penStyle == TypeLineDefault)
|
if (sourceItem.penStyle.isEmpty() || sourceItem.penStyle == TypeLineDefault)
|
||||||
{
|
{
|
||||||
|
const QSharedPointer<VAbstractCurve> curve = data->GeometricObject<VAbstractCurve>(sourceItem.id);
|
||||||
int index = ui->comboBoxPenStyle->currentIndex();
|
int index = ui->comboBoxPenStyle->currentIndex();
|
||||||
ui->comboBoxPenStyle->setItemText(index, '<' + tr("Default") + '>');
|
ui->comboBoxPenStyle->setItemText(index, '<' + tr("Default") + '>');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue