qtcreator: update to 6.0.2.

This commit is contained in:
Piotr Wójcik 2022-02-25 22:23:59 +01:00 committed by Piotr
parent 55a692320b
commit c53b0657ca
3 changed files with 86 additions and 3 deletions

View file

@ -0,0 +1,44 @@
From 722d84fee5321ee6909f12c1d10b097c24ba1adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 22 Jan 2022 17:29:59 +0100
Subject: [PATCH] backtrace
diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp
index 560df43a..87ca6fd5 100644
--- a/src/libs/utils/qtcassert.cpp
+++ b/src/libs/utils/qtcassert.cpp
@@ -40,7 +40,7 @@ void dumpBacktrace(int maxdepth)
{
if (maxdepth == -1)
maxdepth = 1000;
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
void *bt[1000] = {nullptr};
int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));
char **lines = backtrace_symbols(bt, size);
diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
index a3a9806f..bb6cc30d 100644
--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
@@ -99,7 +99,7 @@ bool Exception::warnAboutException()
#endif
}
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_UNIX) && defined(__GLIBC__)
static QString getBackTrace()
{
QString backTrace;
@@ -137,7 +137,7 @@ Exception::Exception(int line, const QByteArray &function,
, m_function(QString::fromUtf8(function))
, m_file(QString::fromUtf8(file))
, m_description(description)
- #ifdef Q_OS_LINUX
+ #if defined(Q_OS_UNIX) && defined(__GLIBC__)
, m_backTrace(getBackTrace())
#endif
{
--
2.34.1

View file

@ -0,0 +1,39 @@
From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Mon, 24 Jan 2022 14:38:29 +0100
Subject: [PATCH] QmlDesigner: Fix 32 bit
Because std::ptrdiff_t and int are the same under 32 bit the constructor
is changed to a template. The class is private so it is very unlikely
that it leads to errors.
Task-number: QTCREATORBUG-26910
Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
index 747c3d9..27d2905 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
@@ -67,15 +67,8 @@
StorageCacheIndex(const char *) = delete;
- constexpr explicit StorageCacheIndex(int id) noexcept
- : id{id}
- {}
-
- constexpr explicit StorageCacheIndex(std::size_t id) noexcept
- : id{static_cast<int>(id)}
- {}
-
- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
+ template<typename IntegerType>
+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept
: id{static_cast<int>(id)}
{}

View file

@ -1,6 +1,6 @@
# Template file for 'qtcreator' # Template file for 'qtcreator'
pkgname=qtcreator pkgname=qtcreator
version=5.0.3 version=6.0.2
revision=1 revision=1
wrksrc="qt-creator-opensource-src-${version}" wrksrc="qt-creator-opensource-src-${version}"
build_style=qmake build_style=qmake
@ -8,7 +8,7 @@ make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
qt5-host-tools" qt5-host-tools"
makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
qt5-quickcontrols clang llvm" qt5-quickcontrols qt5-svg-devel clang llvm"
depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite" depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
short_desc="Cross-platform IDE for Qt developers" short_desc="Cross-platform IDE for Qt developers"
maintainer="Piotr Wójcik <chocimier@tlen.pl>" maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@ -16,7 +16,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
homepage="https://wiki.qt.io/Category:Tools::QtCreator" homepage="https://wiki.qt.io/Category:Tools::QtCreator"
changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md" changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
checksum=7fd3b14310bcecee6b134f8cb7f4c0ed2385d7f4cecd48d756c5c1fd650ce2eb checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
replaces="qtcreator-data>=0" replaces="qtcreator-data>=0"
python_version=3 python_version=3