From 1d19b6761b8bee43f5021cd660471c33c0706946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH] qtcreator: update to 7.0.0.

---
 .../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
 srcpkgs/qtcreator/template                    | 31 +++++++--------
 2 files changed, 15 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff

diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf..0000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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)}
-         {}
- 
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec64..912c6c00c4 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=6.0.2
+version=7.0.0
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="$(vopt_bool qbs BUILD_QBS)"
 hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,24 +18,21 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 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"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
 replaces="qtcreator-data>=0"
 python_version=3
 
+build_options="qbs"
+desc_option_qbs="Build vendored Qbs"
+
+if [ -z "$XBPS_CROSS_BUILD" ]; then
+	build_options_default="qbs"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
-			src/plugins/clangformat/clangformat.pro \
-			-e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-		vsed -i src/plugins/debugger/debugger.pro \
-			-e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-	fi
-}
-
 post_install() {
 	# Install the license with the annotation for
 	# the Qt Company GPL Exception 1.0