diff options
Diffstat (limited to 'dev-qt/qt-creator/files')
3 files changed, 83 insertions, 0 deletions
diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch new file mode 100644 index 000000000000..b36cfef2d4e7 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch @@ -0,0 +1,47 @@ +execinfo is unavailable with musl (unless opted to package+use libexecinfo) +--- a/src/libs/utils/qtcassert.cpp ++++ b/src/libs/utils/qtcassert.cpp +@@ -9,5 +9,5 @@ + #include <QTime> + +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + #include <stdio.h> + #include <signal.h> +@@ -30,5 +30,5 @@ + if (maxdepth < 0 || maxdepth > ArraySize) + maxdepth = ArraySize; +-#if defined(Q_OS_UNIX) ++#if defined(Q_OS_UNIX) && defined(__GLIBC__) + void *bt[ArraySize] = {nullptr}; + int size = backtrace(bt, maxdepth); +--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp ++++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp +@@ -4,5 +4,5 @@ + #include "exception.h" + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + #include <execinfo.h> + #include <cxxabi.h> +@@ -31,5 +31,5 @@ + namespace QmlDesigner { + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + const char* demangle(const char* name) + { +@@ -76,5 +76,5 @@ + } + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + static QString getBackTrace() + { +@@ -114,5 +114,5 @@ + , m_file(QString::fromUtf8(file)) + , m_description(description) +- #ifdef Q_OS_LINUX ++ #if defined(Q_OS_LINUX) && defined(__GLIBC__) + , m_backTrace(getBackTrace()) + #endif diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch new file mode 100644 index 000000000000..d4936882d4d2 --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch @@ -0,0 +1,10 @@ +malloc_trim() is unavailable with musl +--- a/src/plugins/coreplugin/mainwindow.cpp ++++ b/src/plugins/coreplugin/mainwindow.cpp +@@ -222,5 +222,5 @@ + m_trimTimer.setInterval(60000); + // glibc may not actually free memory in free(). +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) && defined(__GLIBC__) + connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); }); + #endif diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch new file mode 100644 index 000000000000..1ad23a207d9b --- /dev/null +++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch @@ -0,0 +1,26 @@ +Uses private parts of the QtQuick3D api which added a namespace in: +https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e +--- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp ++++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp +@@ -803,5 +803,9 @@ + const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform; + ++#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3)) ++ return QSSGUtils::mat44::getPosition(sceneTransform); ++#else + return mat44::getPosition(sceneTransform); ++#endif + } + +--- a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp ++++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp +@@ -738,5 +738,9 @@ + const QMatrix4x4 sceneTransform = parent->sceneTransform() * localTransform; + ++#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3)) ++ return QSSGUtils::mat44::getPosition(sceneTransform); ++#else + return mat44::getPosition(sceneTransform); ++#endif + } + |