mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-18 23:04:03 +02:00
Compare commits
No commits in common. "47937245a6e4ed5eaf589461094f5002cd7874f5" and "4b19565d4e518e98c47c4cd4c9eb36fb08d237e8" have entirely different histories.
47937245a6
...
4b19565d4e
8
dist/AppImage/AppImageBuilder.yml
vendored
8
dist/AppImage/AppImageBuilder.yml
vendored
|
@ -81,14 +81,22 @@ AppDir:
|
|||
- opt/qt515/lib/libQt5EglSupport.*
|
||||
- opt/qt515/lib/libQt5EventDispatcherSupport.*
|
||||
- opt/qt515/lib/libQt5FbSupport.*
|
||||
- opt/qt515/lib/libQt5FontDatabaseSupport.*
|
||||
- opt/qt515/lib/libQt5GlxSupport.*
|
||||
- opt/qt515/lib/libQt5InputSupport.*
|
||||
- opt/qt515/lib/libQt5LinuxAccessibilitySupport.*
|
||||
- opt/qt515/lib/libQt5OpenGL.*
|
||||
- opt/qt515/lib/libQt5OpenGLExtensions.*
|
||||
- opt/qt515/lib/libQt5PlatformCompositorSupport.*
|
||||
- opt/qt515/lib/libQt5ServiceSupport.*
|
||||
- opt/qt515/lib/libQt5ThemeSupport.*
|
||||
- opt/qt515/lib/libQt5VulkanSupport.*
|
||||
- opt/qt515/lib/libQt5XcbQpa.*
|
||||
- opt/qt515/lib/libQt5XkbCommonSupport.*
|
||||
- opt/qt515/plugins/egldeviceintegrations
|
||||
- opt/qt515/plugins/platforminputcontexts
|
||||
- opt/qt515/plugins/sqldrivers
|
||||
- opt/qt515/plugins/xcbglintegrations
|
||||
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"
|
||||
|
|
|
@ -25,7 +25,7 @@ if [[ "$DEPLOY" == "true" ]]; then
|
|||
check_failure "Unable to clean stale artifacts.";
|
||||
|
||||
print_info "Start uploading.";
|
||||
python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/Valentina-continuous-x86_64.AppImage "/0.7.x/Linux/valentina-${TARGET_PLATFORM}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.AppImage";
|
||||
python3 $CIRRUS_WORKING_DIR/scripts/deploy.py upload $ACCESS_TOKEN $CIRRUS_WORKING_DIR/build/Valentina-continuous-x86_64.AppImage "/0.7.x/Linux/valentina-${TARGET_PLATFORM}-${ARCH}-${CIRRUS_BRANCH}-${CIRRUS_CHANGE_IN_REPO}.AppImage";
|
||||
check_failure "Unable to upload Valentina's AppImage.";
|
||||
|
||||
print_info "Successfully uploaded.";
|
||||
|
|
|
@ -77,10 +77,6 @@
|
|||
#include "xml/vplayoutfilereader.h"
|
||||
#include "xml/vplayoutfilewriter.h"
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
|
||||
#include "../vmisc/compatibility.h"
|
||||
#endif
|
||||
|
||||
QT_WARNING_PUSH
|
||||
QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
|
||||
QT_WARNING_DISABLE_INTEL(1418)
|
||||
|
@ -90,6 +86,11 @@ Q_LOGGING_CATEGORY(pWindow, "p.window") // NOLINT
|
|||
QT_WARNING_POP
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
|
||||
#include "../vmisc/compatibility.h"
|
||||
#endif
|
||||
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
|
||||
namespace
|
||||
|
|
|
@ -217,11 +217,12 @@
|
|||
#include <QMimeData>
|
||||
#endif // defined(Q_OS_MAC)
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
|
||||
#include "../vmisc/compatibility.h"
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
|
||||
QT_WARNING_PUSH
|
||||
|
@ -4348,9 +4349,9 @@ void MainWindow::on_actionUpdateManualLayout_triggered()
|
|||
|
||||
rldFile.setAutoRemove(false);
|
||||
|
||||
const QString puzzlePath = VApplication::PuzzleFilePath();
|
||||
qDebug("Opening Puzzle: path = %s.", qUtf8Printable(puzzlePath));
|
||||
VApplication::StartDetachedProcess(puzzlePath, arguments);
|
||||
const QString path = VApplication::PuzzleFilePath();
|
||||
qDebug("Opening Puzzle: path = %s.", qUtf8Printable(path));
|
||||
VApplication::StartDetachedProcess(path, arguments);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -580,19 +580,19 @@ auto DRW_LWPolyline::parseCode(int code, const std::unique_ptr<dxfReader> &reade
|
|||
break;
|
||||
}
|
||||
case 20:
|
||||
if (vertex != nullptr)
|
||||
if (vertex != NULL)
|
||||
vertex->y = reader->getDouble();
|
||||
break;
|
||||
case 40:
|
||||
if (vertex != nullptr)
|
||||
if (vertex != NULL)
|
||||
vertex->stawidth = reader->getDouble();
|
||||
break;
|
||||
case 41:
|
||||
if (vertex != nullptr)
|
||||
if (vertex != NULL)
|
||||
vertex->endwidth = reader->getDouble();
|
||||
break;
|
||||
case 42:
|
||||
if (vertex != nullptr)
|
||||
if (vertex != NULL)
|
||||
vertex->bulge = reader->getDouble();
|
||||
break;
|
||||
case 38:
|
||||
|
@ -1038,11 +1038,11 @@ auto DRW_Spline::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -
|
|||
break;
|
||||
}
|
||||
case 20:
|
||||
if (controlpoint != nullptr)
|
||||
if (controlpoint != NULL)
|
||||
controlpoint->y = reader->getDouble();
|
||||
break;
|
||||
case 30:
|
||||
if (controlpoint != nullptr)
|
||||
if (controlpoint != NULL)
|
||||
controlpoint->z = reader->getDouble();
|
||||
break;
|
||||
case 11:
|
||||
|
@ -1053,11 +1053,11 @@ auto DRW_Spline::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -
|
|||
break;
|
||||
}
|
||||
case 21:
|
||||
if (fitpoint != nullptr)
|
||||
if (fitpoint != NULL)
|
||||
fitpoint->y = reader->getDouble();
|
||||
break;
|
||||
case 31:
|
||||
if (fitpoint != nullptr)
|
||||
if (fitpoint != NULL)
|
||||
fitpoint->z = reader->getDouble();
|
||||
break;
|
||||
case 40:
|
||||
|
@ -1279,11 +1279,11 @@ auto DRW_Leader::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -
|
|||
break;
|
||||
}
|
||||
case 20:
|
||||
if (vertexpoint != nullptr)
|
||||
if (vertexpoint != NULL)
|
||||
vertexpoint->y = reader->getDouble();
|
||||
break;
|
||||
case 30:
|
||||
if (vertexpoint != nullptr)
|
||||
if (vertexpoint != NULL)
|
||||
vertexpoint->z = reader->getDouble();
|
||||
break;
|
||||
case 340:
|
||||
|
|
|
@ -1649,7 +1649,7 @@ auto dxfRW::writeImage(DRW_Image *ent, const std::string &name) -> DRW_ImageDef
|
|||
id = imageDef.at(i);
|
||||
}
|
||||
}
|
||||
if (id == nullptr)
|
||||
if (id == NULL)
|
||||
{
|
||||
id = new DRW_ImageDef();
|
||||
imageDef.push_back(id);
|
||||
|
|
|
@ -57,11 +57,12 @@
|
|||
#include <sys/sysinfo.h>
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
|
||||
#include "../vmisc/compatibility.h"
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
|
||||
namespace
|
||||
|
|
|
@ -386,8 +386,10 @@ auto VGObject::LineIntersectRect(const QRectF &rec, const QLineF &line) -> QPoin
|
|||
QLineF const leftLine(QPointF(x1, y1), QPointF(x1, y2));
|
||||
QLineF const rightLine(QPointF(x2, y1), QPointF(x2, y2));
|
||||
|
||||
QPointF point;
|
||||
|
||||
// Check intersections with each side of the rectangle
|
||||
if (QPointF point; line.intersects(topLine, &point) == QLineF::BoundedIntersection ||
|
||||
if (line.intersects(topLine, &point) == QLineF::BoundedIntersection ||
|
||||
line.intersects(bottomLine, &point) == QLineF::BoundedIntersection ||
|
||||
line.intersects(leftLine, &point) == QLineF::BoundedIntersection ||
|
||||
line.intersects(rightLine, &point) == QLineF::BoundedIntersection)
|
||||
|
|
|
@ -48,6 +48,8 @@
|
|||
#include <QStyleHints>
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
#include "../vabstractapplication.h"
|
||||
#include "vapplicationstyle.h"
|
||||
#include "vscenestylesheet.h"
|
||||
|
@ -56,7 +58,6 @@
|
|||
#include "../compatibility.h"
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
|
||||
namespace
|
||||
|
@ -596,7 +597,8 @@ VTheme::VTheme(QObject *parent)
|
|||
isProcessingColorSchemeChange = true;
|
||||
QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
|
||||
|
||||
if (bool darkTheme = IsInDarkTheme(); m_darkTheme != darkTheme)
|
||||
bool darkTheme = IsInDarkTheme();
|
||||
if (m_darkTheme != darkTheme)
|
||||
{
|
||||
m_darkTheme = darkTheme;
|
||||
ResetThemeSettings();
|
||||
|
|
|
@ -109,7 +109,7 @@ public:
|
|||
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
|
||||
//! to fill all the data into container. This can also be used when subclassing this function.
|
||||
//! \return Returns the newly created property (or container, if it was not NULL)
|
||||
virtual auto clone(bool include_children = true, VProperty *container = nullptr) const -> VProperty * override;
|
||||
virtual auto clone(bool include_children = true, VProperty *container = NULL) const -> VProperty * override;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant &value) override;
|
||||
|
|
|
@ -80,7 +80,7 @@ public:
|
|||
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
|
||||
//! to fill all the data into container. This can also be used when subclassing this function.
|
||||
//! \return Returns the newly created property (or container, if it was not NULL)
|
||||
auto clone(bool include_children = true, VProperty *container = nullptr) const -> VProperty * override;
|
||||
auto clone(bool include_children = true, VProperty *container = NULL) const -> VProperty * override;
|
||||
|
||||
public slots:
|
||||
void StateChanged();
|
||||
|
|
|
@ -70,7 +70,7 @@ public:
|
|||
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
|
||||
//! to fill all the data into container. This can also be used when subclassing this function.
|
||||
//! \return Returns the newly created property (or container, if it was not NULL)
|
||||
virtual auto clone(bool include_children = true, VProperty *container = nullptr) const -> VProperty * override;
|
||||
virtual auto clone(bool include_children = true, VProperty *container = NULL) const -> VProperty * override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY_MOVE(VColorProperty) // NOLINT
|
||||
|
|
|
@ -743,8 +743,9 @@ auto DialogSeamAllowance::GetMirrorLineEndPoint() const -> quint32
|
|||
nextIndex = 0;
|
||||
}
|
||||
|
||||
if (const int next = FindNotExcludedNeighborNodeDown(uiTabPaths->listWidgetMainPath, nextIndex);
|
||||
next >= 0 && RowNode(uiTabPaths->listWidgetMainPath, next).GetId() == startPoint)
|
||||
const int next = FindNotExcludedNeighborNodeDown(uiTabPaths->listWidgetMainPath, nextIndex);
|
||||
|
||||
if (next >= 0 && RowNode(uiTabPaths->listWidgetMainPath, next).GetId() == startPoint)
|
||||
{
|
||||
return startPoint;
|
||||
}
|
||||
|
|
|
@ -37,11 +37,12 @@
|
|||
|
||||
#include "../vmisc/defglobal.h"
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
|
||||
#include "../vmisc/compatibility.h"
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
|
||||
namespace
|
||||
|
|
Loading…
Reference in a new issue