summaryrefslogtreecommitdiff
path: root/dev-qt/qt-creator/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-10-11 00:10:45 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-10-11 00:10:45 +0100
commit82002be95de85b10f5953f5e10ced81a40ec1fba (patch)
tree3e95915eeab9799a67d9b0c508260ca31a4694ab /dev-qt/qt-creator/files
parentfc6ff4de73d70ead4ce3a005b4f5328f2b23129b (diff)
gentoo auto-resync : 11:10:2023 - 00:10:45
Diffstat (limited to 'dev-qt/qt-creator/files')
-rw-r--r--dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch31
-rw-r--r--dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch29
2 files changed, 0 insertions, 60 deletions
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
deleted file mode 100644
index 7cbfc534bab6..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Uses private parts of the QtQuick3D api which added a namespace in [1].
-
-Update: upstream has done a better fix in [2] (but can stick to the
-simple version check until next release).
-
-[1] https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
-[2] https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
---- 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
- }
-
diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
deleted file mode 100644
index c06a2733b484..000000000000
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/914732
-https://bugreports.qt.io/browse/QTCREATORBUG-29537
-
-https://github.com/qt-creator/qt-creator/commit/170f9acfb41704b68e2ba98690fd6d5e98addd85
-From: Eike Ziller <eike.ziller@qt.io>
-Date: Thu, 24 Aug 2023 13:41:33 +0200
-Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8
-
-They renamed their target from `yaml-cpp`
-to `yaml-cpp::yaml-cpp`
-
-Still support < 0.8 though.
---- a/cmake/Findyaml-cpp.cmake
-+++ b/cmake/Findyaml-cpp.cmake
-@@ -16,5 +16,13 @@
- find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
- endif()
-- set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
-+ if(TARGET yaml-cpp::yaml-cpp)
-+ # yaml-cpp >= 0.8
-+ set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
-+ add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
-+ set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
-+ else()
-+ set(yaml-cpp_TARGET yaml-cpp)
-+ endif()
-+ set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
- else()
- if(TARGET yaml-cpp)