Arch's clang support is atrocious, embrace gcc

Change-Id: I4896b431753237c7247fdc5ccd45bd06e15d03ac

3 files changed, 10 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24419dadf722..342d6ec4bc88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qtcreator-prerelease
 	pkgdesc = Qt Creator prerelease/latest
-	pkgver = 12.0.2
+	pkgver = 13.0.0beta1
 	pkgrel = 1
 	url = http://qt.io/ide
 	install = qtcreator-prerelease.install
@@ -14,9 +14,7 @@ pkgbase = qtcreator-prerelease
 	depends = qt6-tools
 	depends = qt6-declarative
 	depends = qt6-quickcontrols2
-	depends = clang
-	depends = llvm
-	depends = lld
+	depends = gcc
 	optdepends = qt6-doc: integrated Qt documentation
 	optdepends = qt6-examples: welcome page examples
 	optdepends = qt6-translations: for other languages
@@ -30,7 +28,7 @@ pkgbase = qtcreator-prerelease
 	provides = qtcreator
 	conflicts = qtcreator
 	conflicts = litehtml
-	source = https://download.qt.io/official_releases/qtcreator/12.0/12.0.2/qt-creator-opensource-src-12.0.2.tar.xz
-	sha512sums = cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1
+	source = https://download.qt.io/development_releases/qtcreator/13.0/13.0.0-beta1/qt-creator-opensource-src-13.0.0-beta1.tar.xz
+	sha512sums = 55d907cd9112733600edb5fe1a2ef0d8df975899465ee771a88313c5941c64641774a091696ff22a613997954835e277618db44802f63bd937b75b88a62c0cfc
 
 pkgname = qtcreator-prerelease
diff --git a/PKGBUILD b/PKGBUILD
index 94e83f6c0167..95f354edb3b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@
 #_qmake_args="CONFIG+=debug"
 _building=true
 pkgname=qtcreator-prerelease
-_pkgvermajmin=12.0
-_pkgver=${_pkgvermajmin}.2
-_verpostfix=""
+_pkgvermajmin=13.0
+_pkgver=${_pkgvermajmin}.0
+_verpostfix="beta1"
 pkgver="${_pkgver}${_verpostfix}"
 pkgrel=1
 _urlbase="https://download.qt.io/official_releases"
@@ -24,7 +24,7 @@ url='http://qt.io/ide'
 license=('GPL')
 provides=('qtcreator')
 conflicts=('qtcreator' 'litehtml')
-depends=('python-beautifulsoup4' 'qt6-base' 'qt6-tools' 'qt6-declarative' 'qt6-quickcontrols2' 'clang' 'llvm' 'lld')
+depends=('python-beautifulsoup4' 'qt6-base' 'qt6-tools' 'qt6-declarative' 'qt6-quickcontrols2' 'gcc')
 install=qtcreator-prerelease.install
 optdepends=('qt6-doc: integrated Qt documentation'
             'qt6-examples: welcome page examples'
@@ -38,7 +38,7 @@ optdepends=('qt6-doc: integrated Qt documentation'
             'valgrind: analyze support')
 makedepends=('clang' 'qt6-base' 'patchelf')
 source=("${_urlbase}/qtcreator/${_pkgvermajmin}/${_pkgver}/${_source_archive_name}.tar.xz")
-sha512sums=('cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1')
+sha512sums=('55d907cd9112733600edb5fe1a2ef0d8df975899465ee771a88313c5941c64641774a091696ff22a613997954835e277618db44802f63bd937b75b88a62c0cfc')
 
 prepare() {
   local working_dir=${srcdir}/${_source_archive_name}
diff --git a/toolchain.cmake b/toolchain.cmake
index 1c96234d9951..d83bbabd8c4f 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -5,12 +5,8 @@ set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=mold")
 set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=mold")
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=mold")
 
-set(CMAKE_DISABLE_PRECOMPILE_HEADERS 1)
+#set(CMAKE_DISABLE_PRECOMPILE_HEADERS 1)
 # e.g. to use mold with Clang
 #set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
 #set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")
 #set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
-
-set(CMAKE_CXX_COMPILER "clang++")
-set(CMAKE_C_COMPILER "clang")
-set(CMAKE_TOOLCHAIN_PREFIX "llvm-")