Compare commits

...

6 commits

Author SHA1 Message Date
Roman Telezhynskyi cb4c1aa10b Treat warnings as errors not only when debug. 2023-03-08 18:54:47 +02:00
Roman Telezhynskyi 004f46847c Fix conflicting settings. 2023-03-08 18:48:30 +02:00
Roman Telezhynskyi 37541b600e Fix MSVC warnings. 2023-03-08 18:45:42 +02:00
Roman Telezhynskyi 973f4d6b0d Enable utf8 literals for MSVC. 2023-03-08 18:44:07 +02:00
Roman Telezhynskyi 7a8d18569a Remove buggy test case. 2023-03-08 18:41:49 +02:00
Roman Telezhynskyi d622821b9f Use with call. 2023-03-07 17:32:30 +02:00
21 changed files with 69 additions and 754 deletions

View file

@ -377,7 +377,8 @@ for:
- del /F "C:\Program Files\Git\bin\sh.exe"
- dir "%QTDIR%\bin"
- |
"%QTDIR%\\bin\\%QMAKE%" -v
echo "%QTDIR%\\bin\\%QMAKE%" -v
call "%QTDIR%\\bin\\%QMAKE%" -v
- qbs --version
before_build:

View file

@ -24,15 +24,25 @@ CppApplication {
cpp.compilerWrapper: "ccache"
}
Properties {
condition: Qt.core.versionMajor >= 5 && Qt.core.versionMinor < 12
cpp.cxxLanguageVersion: "c++11"
cpp.cxxLanguageVersion: {
if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
return "c++20";
else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
return "c++17";
return "c++11";
}
// Since Qt 5.12 available support for C++17
Properties {
condition: Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12
cpp.cxxLanguageVersion: "c++17"
condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.minimumWindowsVersion: {
if (Qt.core.versionMajor >= 6)
return "6.02"; // should be 10.0
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
return "6.00";
return "5.01";
}
}
Group {

View file

@ -23,6 +23,27 @@ Library {
cpp.compilerWrapper: "ccache"
}
cpp.cxxLanguageVersion: {
if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
return "c++20";
else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
return "c++17";
return "c++11";
}
Properties {
condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.minimumWindowsVersion: {
if (Qt.core.versionMajor >= 6)
return "6.02"; // should be 10.0
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
return "6.00";
return "5.01";
}
}
install: false
installDebugInformation: false

View file

@ -134,27 +134,6 @@ Module {
cpp.visibility: "minimal"
cpp.cxxLanguageVersion: {
if (Qt.core.versionMajor >= 6) // Start building with C++20 since Qt 6.0
return "c++20";
else if(Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12) // Since Qt 5.12 available support for C++17
return "c++17";
return "c++11";
}
Properties {
condition: qbs.targetOS.contains("windows") && qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
cpp.minimumWindowsVersion: {
if (Qt.core.versionMajor >= 6)
return "6.02"; // should be 10.0
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 7)
return "6.00";
return "5.01";
}
}
readonly property string minimumMacosVersion: {
if (project.minimumMacosVersion !== undefined)
return project.minimumMacosVersion;
@ -205,12 +184,7 @@ Module {
}
cpp.separateDebugInformation: true
Properties {
condition: qbs.buildVariant === "debug"
cpp.warningLevel: "all"
cpp.treatWarningsAsErrors: treatWarningsAsErrors
}
cpp.treatWarningsAsErrors: treatWarningsAsErrors
property stringList debugFlags: {
var debugFlags = [];
@ -808,8 +782,13 @@ Module {
"-wd5204", // class has virtual functions, but its trivial destructor is not virtual; instances of objects derived
// from this class may not be destructed correctly
"-wd5219", // implicit conversion from '<type>' to '<type>', possible loss of data
"-wd5243" // 'type-name': using incomplete class 'class-name' can cause potential one definition rule violation due
"-wd5243", // 'type-name': using incomplete class 'class-name' can cause potential one definition rule violation due
// to ABI limitation
"-wd4464", // relative include path contains '..'
"-wd4458", // declaration of 'X' hides class member
"-wd4456", // declaration of 'X' hides previous local declaration
"-wd4459", // declaration of 'X' hides global declaration
"-wd4457" // declaration of 'X' hides function parameter
)
}
return debugFlags;
@ -817,9 +796,11 @@ Module {
cpp.cxxFlags: {
var flags = debugFlags;
if (qbs.toolchain.contains("gcc") && enableAddressSanitizer) {
if (qbs.toolchain.contains("gcc") && enableAddressSanitizer)
flags.push("-fno-omit-frame-pointer");
}
if (qbs.toolchain.contains("msvc"))
flags.push("/utf-8");
return flags;
}

View file

@ -1672,7 +1672,7 @@ void VPMainWindow::ReadSettings()
if (settings->status() == QSettings::NoError)
{
restoreGeometry(settings->GetGeometry());
restoreState(settings->GetToolbarsState(), AppVersion());
restoreState(settings->GetToolbarsState(), static_cast<int>(AppVersion()));
// Text under tool buton icon
ToolBarStyles();
@ -1697,7 +1697,7 @@ void VPMainWindow::WriteSettings()
{
VPSettings *settings = VPApplication::VApp()->PuzzleSettings();
settings->SetGeometry(saveGeometry());
settings->SetToolbarsState(saveState(AppVersion()));
settings->SetToolbarsState(saveState(static_cast<int>(AppVersion())));
settings->SetDockWidgetPropertiesActive(ui->dockWidgetProperties->isEnabled());
settings->SetDockWidgetPropertiesContentsActive(ui->dockWidgetPropertiesContents->isEnabled());

View file

@ -3611,7 +3611,7 @@ void TMainWindow::ReadSettings()
if (settings->status() == QSettings::NoError)
{
restoreGeometry(settings->GetGeometry());
restoreState(settings->GetToolbarsState(), AppVersion());
restoreState(settings->GetToolbarsState(), static_cast<int>(AppVersion()));
// Text under tool buton icon
ToolBarStyles();
@ -3630,7 +3630,7 @@ void TMainWindow::WriteSettings()
{
VTapeSettings *settings = MApplication::VApp()->TapeSettings();
settings->SetGeometry(saveGeometry());
settings->SetToolbarsState(saveState(AppVersion()));
settings->SetToolbarsState(saveState(static_cast<int>(AppVersion())));
settings->SetTapeSearchOptionMatchCase(m_search->IsMatchCase());
settings->SetTapeSearchOptionWholeWord(m_search->IsMatchWord());

View file

@ -5204,7 +5204,7 @@ void MainWindow::ReadSettings()
if (settings->status() == QSettings::NoError)
{
restoreGeometry(settings->GetGeometry());
restoreState(settings->GetToolbarsState(), AppVersion());
restoreState(settings->GetToolbarsState(), static_cast<int>(AppVersion()));
m_groupsActive = settings->IsDockWidgetGroupsActive();
m_toolOptionsActive = settings->IsDockWidgetToolOptionsActive();
@ -5248,7 +5248,7 @@ void MainWindow::WriteSettings()
VValentinaSettings *settings = VAbstractValApplication::VApp()->ValentinaSettings();
settings->SetGeometry(saveGeometry());
settings->SetToolbarsState(saveState(AppVersion()));
settings->SetToolbarsState(saveState(static_cast<int>(AppVersion())));
settings->SetDockWidgetGroupsActive(ui->dockWidgetGroups->isVisible());
settings->SetDockWidgetToolOptionsActive(ui->dockWidgetToolOptions->isVisible());

View file

@ -26,7 +26,6 @@
#include <QString>
#include <QtGlobal>
#include "../qmuparser/qmuparser_global.h"
#include "qmuparser.h"
#include "qmuparser_global.h"

View file

@ -32,13 +32,13 @@
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#include "../vmisc/defglobal.h"
namespace qmu
{
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Weffc++")
QT_WARNING_DISABLE_GCC("-Wnon-virtual-dtor")
namespace qmu
{
class QmuParserCallbackData : public QSharedData
{
public:
@ -94,5 +94,7 @@ private:
Q_DISABLE_ASSIGN(QmuParserCallbackData)
};
QT_WARNING_POP
}
#endif // QMUPARSERCALLBACK_P_H

View file

@ -31,7 +31,6 @@
#include <QtGlobal>
#include <sstream>
#include "../qmuparser/qmuparser_global.h"
#include "qmuparser_global.h"
#include "qmuparserdef.h"
#include "qmutranslation.h"

View file

@ -34,7 +34,6 @@
# include <QRandomGenerator>
#endif
#include "../qmuparser/qmuparser_global.h"
#include "qmuparser.h"
#include "qmuparser_global.h"
#include "qmuparserdef.h"

View file

@ -26,7 +26,6 @@
#include <QString>
#include <QtGlobal>
#include "../qmuparser/qmuparser_global.h"
#include "qmuformulabase.h"
#include "qmuparser_global.h"

View file

@ -22,7 +22,7 @@
#ifndef QMUTRANSLATION_H
#define QMUTRANSLATION_H
#include "../qmuparser/qmuparser_global.h"
#include "qmuparser_global.h"
#include <QString>
namespace qmu

View file

@ -83,4 +83,6 @@ private:
Q_DISABLE_ASSIGN(VBestSquareData)
};
QT_WARNING_POP
#endif // VBESTSQUARE_P_H

View file

@ -26,6 +26,7 @@ namespace detail
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wsign-conversion")
QT_WARNING_DISABLE_GCC("-Wconversion")
QT_WARNING_DISABLE_MSVC(4365)
// Returns the index of the most-signifcant set bit
inline auto find_highest_bit(unsigned long long value) noexcept -> long

View file

@ -262,8 +262,9 @@ void VAbstractApplication::WinAttachConsole()
auto stdout_type = GetFileType(GetStdHandle(STD_OUTPUT_HANDLE));
if (stdout_type == FILE_TYPE_UNKNOWN && AttachConsole(ATTACH_PARENT_PROCESS))
{
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
FILE *fp = nullptr;
freopen_s(&fp, "CONOUT$", "w", stdout);
freopen_s(&fp, "CONOUT$", "w", stderr);
}
}
#endif

View file

@ -591,6 +591,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default")
{
case ContextMenuOption::LAST_ONE_DO_NOT_USE:
Q_UNREACHABLE();
break;
case ContextMenuOption::NoSelection:
return;
case ContextMenuOption::Option:

View file

@ -1,482 +0,0 @@
{
"vector": [
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 204.35338582677167,
"y": 730.1419842519686
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 198.26332677165357,
"y": 676.5494645669291
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 192.346280757874,
"y": 619.635094488189
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 189.75108513779531,
"y": 588.0775157480316
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 187.46731299212598,
"y": 542.7896220472442
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 186.6368503937008,
"y": 465.72269291338586
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 186.6368503937008,
"y": 408.88214173228346
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 186.6368503937008,
"y": 408.88214173228346
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 186.6368503937008,
"y": 408.88214173228346
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 186.85865388652775,
"y": 401.9728053734631
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 188.84085342812114,
"y": 386.7976196768927
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 194.1169611768659,
"y": 362.5979893990439
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 202.93458571296594,
"y": 331.9482604161107
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 208.15480908861204,
"y": 314.3257252276737
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 210.07604385955227,
"y": 306.3255523559161
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 210.2588976377953,
"y": 304.0002519685039
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 210.2588976377953,
"y": 304.0002519685039
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 210.2588976377953,
"y": 304.0002519685039
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 210.10781119555043,
"y": 300.71635788532535
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 208.3654577463414,
"y": 294.640423893857
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 205.02211856338138,
"y": 289.1655002549779
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 200.21916136212846,
"y": 284.30357068282433
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 194.09795385804082,
"y": 280.0666188915326
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 186.79986376657644,
"y": 276.46662859523906
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 178.46625880319345,
"y": 273.5155835080799
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 169.23850668334993,
"y": 271.2254673441915
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 154.0971854462626,
"y": 268.9693881780884
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 131.97321085330947,
"y": 268.49853395957217
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 108.81726651275976,
"y": 270.88710228859264
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 91.4830095620298,
"y": 274.7072960360051
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 80.1913179469932,
"y": 278.1360249671903
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 74.69714943577341,
"y": 280.17021609073447
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 74.69714943577341,
"y": 280.17021609073447
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": -15.239495457873012,
"y": 314.761233357522
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": -40.78363128565394,
"y": 165.7537743621286
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": -40.78363128565394,
"y": 165.7537743621286
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 145.47569245858736,
"y": 133.82360457740234
},
{
"curvePoint": true,
"type": "VSAPoint",
"x": 238.60535433070868,
"y": 117.85851968503937
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 239.24750707132483,
"y": 117.7484363580766
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 238.60535433070868,
"y": 117.85851968503937
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 238.60535433070868,
"y": 117.85851968503937
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 304.7470866141732,
"y": 106.519937007874
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 304.7470866141732,
"y": 106.519937007874
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 305.2942453334244,
"y": 109.34899935311245
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 306.9048459848872,
"y": 114.50235141446748
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 310.35018184997693,
"y": 121.2287733899588
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 316.92140911194485,
"y": 128.2794363551129
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 325.40387019373645,
"y": 133.49126641884465
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 335.5398716397215,
"y": 137.12975254404603
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 347.07171999426987,
"y": 139.46038369360906
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 366.32904938677143,
"y": 141.16537601600902
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 380.3376377952756,
"y": 141.29159055118112
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 380.3376377952756,
"y": 141.29159055118112
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 380.3376377952756,
"y": 574.2364724409449
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 380.3376377952756,
"y": 574.2364724409449
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 377.3698228346457,
"y": 574.2364724409449
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 373.7242096764272,
"y": 574.8074154773622
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 371.6718943774606,
"y": 575.8351129429134
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 369.9158535310039,
"y": 577.6621306594488
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 368.43013518085627,
"y": 580.5168458415355
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 366.6259621062992,
"y": 587.0255964566929
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 364.9650369094488,
"y": 601.6417381889764
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 363.91826648622043,
"y": 624.4794596456694
},
{
"angle": 6,
"curvePoint": true,
"type": "VSAPoint",
"x": 363.03360236220476,
"y": 676.5494645669291
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 362.6211023622048,
"y": 730.1419842519686
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 362.6211023622048,
"y": 730.1419842519686
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 362.6211023622048,
"y": 730.1419842519686
},
{
"curvePoint": true,
"turnPoint": true,
"type": "VSAPoint",
"x": 362.6211023622048,
"y": 730.1419842519686
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 254.7470866141744,
"y": 730.1419842519686
},
{
"turnPoint": true,
"type": "VSAPoint",
"x": 204.35338582677167,
"y": 730.1419842519686
}
]
}

View file

@ -1,209 +0,0 @@
{
"vector": [
{
"type": "QPointF",
"x": 180.61562597334427,
"y": 756.5986771653544
},
{
"type": "QPointF",
"x": 172.22529556863017,
"y": 679.3786218901527
},
{
"type": "QPointF",
"x": 166.04439060694392,
"y": 622.4929213551636
},
{
"type": "QPointF",
"x": 163.38340296051783,
"y": 590.2459106639249
},
{
"type": "QPointF",
"x": 161.0441953495721,
"y": 544.122083664304
},
{
"type": "QPointF",
"x": 160.18169341160475,
"y": 466.0077700360383
},
{
"type": "QPointF",
"x": 160.40794669733856,
"y": 400.2063871299499
},
{
"type": "QPointF",
"x": 162.7523565987428,
"y": 382.2582164961856
},
{
"type": "QPointF",
"x": 168.26750754855107,
"y": 356.9621800489317
},
{
"type": "QPointF",
"x": 177.5091543749583,
"y": 324.63361475213793
},
{
"type": "QPointF",
"x": 182.65797637538827,
"y": 307.2492376039128
},
{
"type": "QPointF",
"x": 183.26949554131917,
"y": 304.8885371427236
},
{
"type": "QPointF",
"x": 180.64445450073126,
"y": 302.93068035793937
},
{
"type": "QPointF",
"x": 176.4964093006996,
"y": 300.8845392057267
},
{
"type": "QPointF",
"x": 170.84634888385776,
"y": 298.8837744576332
},
{
"type": "QPointF",
"x": 164.0909826454473,
"y": 297.20724769199745
},
{
"type": "QPointF",
"x": 151.85722755932034,
"y": 295.38440016496565
},
{
"type": "QPointF",
"x": 133.05321319026447,
"y": 294.98420310934574
},
{
"type": "QPointF",
"x": 113.03530576126391,
"y": 297.04907850354175
},
{
"type": "QPointF",
"x": 98.18367337174476,
"y": 300.3221413959734
},
{
"type": "QPointF",
"x": 88.78565018946433,
"y": 303.1758567718099
},
{
"type": "QPointF",
"x": -35.867011362121275,
"y": 351.01606207706516
},
{
"type": "QPointF",
"x": -71.33016037970899,
"y": 144.14769280779646
},
{
"type": "QPointF",
"x": 234.13513056084665,
"y": 91.78221436084601
},
{
"type": "QPointF",
"x": 234.13513056084665,
"y": 91.7822143608459
},
{
"type": "QPointF",
"x": 325.80435893876364,
"y": 76.06748949606025
},
{
"type": "QPointF",
"x": 330.9882848734929,
"y": 102.87077188278468
},
{
"type": "QPointF",
"x": 332.2173315417802,
"y": 105.88700933180093
},
{
"type": "QPointF",
"x": 333.82899906607446,
"y": 107.61626386412401
},
{
"type": "QPointF",
"x": 336.9203884569167,
"y": 109.51568857241766
},
{
"type": "QPointF",
"x": 342.6672073225278,
"y": 111.57860468564039
},
{
"type": "QPointF",
"x": 350.87058826068295,
"y": 113.23653969817072
},
{
"type": "QPointF",
"x": 367.61689142449274,
"y": 114.71921248944548
},
{
"type": "QPointF",
"x": 406.79433070866145,
"y": 115.07219325697825
},
{
"type": "QPointF",
"x": 406.79433070866145,
"y": 600.6931653543307
},
{
"type": "QPointF",
"x": 391.76715482476385,
"y": 600.6931653543307
},
{
"type": "QPointF",
"x": 391.35317542637785,
"y": 603.7434162907966
},
{
"type": "QPointF",
"x": 390.36466617897366,
"y": 625.3100352443169
},
{
"type": "QPointF",
"x": 389.4864776516507,
"y": 676.9988962460882
},
{
"type": "QPointF",
"x": 388.8749425918069,
"y": 756.5986771653544
},
{
"type": "QPointF",
"x": 180.61562597334427,
"y": 756.5986771653544
}
]
}

View file

@ -107,8 +107,6 @@
<file>Issue_923_test7_2/output.json</file>
<file>Issue_923_test7_3/input.json</file>
<file>Issue_923_test7_3/output.json</file>
<file>doll/input.json</file>
<file>doll/output.json</file>
<file>Issue_937_case_1a/input.json</file>
<file>Issue_937_case_1a/output.json</file>
<file>Issue_604/input.json</file>

View file

@ -979,14 +979,6 @@ void TST_VAbstractPiece::BrokenDetailEquidistant_data()
QStringLiteral("://Issue_883_prong/output.json"),
37.795275590551185 /*seam allowance width*/);
#if !defined(Q_CC_GNU)
// See the file "valentina_private_collection/bugs/doll/doll.val"
ASSERT_TEST_CASE("Doll.",
QStringLiteral("://doll/input.json"),
QStringLiteral("://doll/output.json"),
26.45669291338583 /*seam allowance width 0.7 cm*/);
#endif
// See the file "collection/bugs/smart_pattern_#145.val"
ASSERT_TEST_CASE("Issue #145",
QStringLiteral("://smart_pattern_#145/input.json"),