community/qt5-*: change header path to /usr/include/qt5

Previously the Qt5 headers were installed directly in /usr/include (e.g.
/usr/include/QtCore/QString).
With Qt6 having been released recently this needs to be moved to another
directory so the Qt5 and Qt6 headers don't conflict.

32 files changed, 34 insertions, 33 deletions

diff --git a/community/qt5-qt3d/APKBUILD b/community/qt5-qt3d/APKBUILD
index feff7efeabe..a174a6a5844 100644
--- a/community/qt5-qt3d/APKBUILD
+++ b/community/qt5-qt3d/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qt3d
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtbase/APKBUILD b/community/qt5-qtbase/APKBUILD
index 345c47c821a..4bf6075f19f 100644
--- a/community/qt5-qtbase/APKBUILD
+++ b/community/qt5-qtbase/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtbase
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - QtBase components"
 url="https://qt.io/developers/"
 arch="all"
@@ -22,7 +22,7 @@ depends_dev="$_sub
 	openssl-dev
 	perl
 	sqlite-dev
-	zlib-dev	
+	zlib-dev
 	"
 makedepends="$depends_dev
 	at-spi2-atk-dev
@@ -100,6 +100,7 @@ build() {
 		-docdir /usr/share/doc/qt5 \
 		-examplesdir /usr/share/doc/qt5/examples \
 		-glib \
+		-headerdir /usr/include/qt5 \
 		-icu \
 		-importdir "$_qt5_prefix"/imports \
 		-libexecdir "$_qt5_prefix"/libexec \
diff --git a/community/qt5-qtcharts/APKBUILD b/community/qt5-qtcharts/APKBUILD
index 1a776d35f51..17ee1dea7bf 100644
--- a/community/qt5-qtcharts/APKBUILD
+++ b/community/qt5-qtcharts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtcharts
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - Support for rendering and displaying SVG"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtconnectivity/APKBUILD b/community/qt5-qtconnectivity/APKBUILD
index 95204f28cdd..07e403ec31e 100644
--- a/community/qt5-qtconnectivity/APKBUILD
+++ b/community/qt5-qtconnectivity/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtconnectivity
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="QT5 Connectivity Compontents"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtdatavis3d/APKBUILD b/community/qt5-qtdatavis3d/APKBUILD
index 5391a2e79c2..aa66425a0fc 100644
--- a/community/qt5-qtdatavis3d/APKBUILD
+++ b/community/qt5-qtdatavis3d/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtdatavis3d
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtdeclarative/APKBUILD b/community/qt5-qtdeclarative/APKBUILD
index cf78481a700..0ee4fcb2bed 100644
--- a/community/qt5-qtdeclarative/APKBUILD
+++ b/community/qt5-qtdeclarative/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtdeclarative
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - QtDeclarative component"
 # Broken on armhf, upstream bug report https://bugreports.qt.io/browse/QTBUG-65246
 arch="all"
diff --git a/community/qt5-qtgamepad/APKBUILD b/community/qt5-qtgamepad/APKBUILD
index 4b22b0b5019..2d54d0e0aa3 100644
--- a/community/qt5-qtgamepad/APKBUILD
+++ b/community/qt5-qtgamepad/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtgamepad
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://doc.qt.io/qt-5/qtgamepad-index.html"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtlocation/APKBUILD b/community/qt5-qtlocation/APKBUILD
index deb167ad2ea..da6ef6507f4 100644
--- a/community/qt5-qtlocation/APKBUILD
+++ b/community/qt5-qtlocation/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtlocation
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - Location component"
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtlottie/APKBUILD b/community/qt5-qtlottie/APKBUILD
index 6c9fa67d764..7c26d3c8330 100644
--- a/community/qt5-qtlottie/APKBUILD
+++ b/community/qt5-qtlottie/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtlottie
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtmultimedia/APKBUILD b/community/qt5-qtmultimedia/APKBUILD
index bc720cfe114..3827be73fbd 100644
--- a/community/qt5-qtmultimedia/APKBUILD
+++ b/community/qt5-qtmultimedia/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtmultimedia
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - Multimedia support"
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtnetworkauth/APKBUILD b/community/qt5-qtnetworkauth/APKBUILD
index f0cca9efbf5..62eec2a8810 100644
--- a/community/qt5-qtnetworkauth/APKBUILD
+++ b/community/qt5-qtnetworkauth/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtnetworkauth
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtpurchasing/APKBUILD b/community/qt5-qtpurchasing/APKBUILD
index 5eb0ae9c9ff..af1c69faff7 100644
--- a/community/qt5-qtpurchasing/APKBUILD
+++ b/community/qt5-qtpurchasing/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtpurchasing
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtquick3d/APKBUILD b/community/qt5-qtquick3d/APKBUILD
index c453c5e7bc3..5a1aee18abc 100644
--- a/community/qt5-qtquick3d/APKBUILD
+++ b/community/qt5-qtquick3d/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtquick3d
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtquickcontrols2/APKBUILD b/community/qt5-qtquickcontrols2/APKBUILD
index c12b8f812af..7fb0865f4ac 100644
--- a/community/qt5-qtquickcontrols2/APKBUILD
+++ b/community/qt5-qtquickcontrols2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtquickcontrols2
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - module with set of QtQuick controls for embedded"
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtremoteobjects/APKBUILD b/community/qt5-qtremoteobjects/APKBUILD
index 39a756ec1d6..b810ec8e034 100644
--- a/community/qt5-qtremoteobjects/APKBUILD
+++ b/community/qt5-qtremoteobjects/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtremoteobjects
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt Remote Objects (QtRO) is an inter-process communication (IPC) module developed for Qt"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtscript/APKBUILD b/community/qt5-qtscript/APKBUILD
index e38bda2da6e..ba3e3d9d713 100644
--- a/community/qt5-qtscript/APKBUILD
+++ b/community/qt5-qtscript/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtscript
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - QtScript component"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtscxml/APKBUILD b/community/qt5-qtscxml/APKBUILD
index f22476e7894..8a48a091e14 100644
--- a/community/qt5-qtscxml/APKBUILD
+++ b/community/qt5-qtscxml/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtscxml
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtsensors/APKBUILD b/community/qt5-qtsensors/APKBUILD
index 6eee75c2ec2..0bb5b02c515 100644
--- a/community/qt5-qtsensors/APKBUILD
+++ b/community/qt5-qtsensors/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtsensors
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="+The Qt Sensors API provides access to sensor hardware via QML and C++"
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtserialbus/APKBUILD b/community/qt5-qtserialbus/APKBUILD
index 9d68571aac6..36849270c4f 100644
--- a/community/qt5-qtserialbus/APKBUILD
+++ b/community/qt5-qtserialbus/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtserialbus
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtserialport/APKBUILD b/community/qt5-qtserialport/APKBUILD
index 3345fd2edee..5eb052494f9 100644
--- a/community/qt5-qtserialport/APKBUILD
+++ b/community/qt5-qtserialport/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtserialport
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - QtSerialPort module"
 url="https://wiki.qt.io/QtSerialPort"
 arch="all"
diff --git a/community/qt5-qtspeech/APKBUILD b/community/qt5-qtspeech/APKBUILD
index 7e88db6b8b7..94b11a8ebe3 100644
--- a/community/qt5-qtspeech/APKBUILD
+++ b/community/qt5-qtspeech/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtspeech
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt module to make text to speech and speech recognition easy"
 url="https://qt.io"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtsvg/APKBUILD b/community/qt5-qtsvg/APKBUILD
index ddf3c6a1489..c7c4805dbf5 100644
--- a/community/qt5-qtsvg/APKBUILD
+++ b/community/qt5-qtsvg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtsvg
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - Support for rendering and displaying SVG"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtusb/APKBUILD b/community/qt5-qtusb/APKBUILD
index a407d8cf6c6..4419f9b51cb 100644
--- a/community/qt5-qtusb/APKBUILD
+++ b/community/qt5-qtusb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: TBK <alpine@jjtc.eu>
 pkgname=qt5-qtusb
 pkgver=0.6.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - a cross-platform USB Module for Qt."
 url="https://github.com/fpoussin/QtUsb/"
 arch="all"
diff --git a/community/qt5-qtvirtualkeyboard/APKBUILD b/community/qt5-qtvirtualkeyboard/APKBUILD
index 578eb3bc0ff..62c6c2940ba 100644
--- a/community/qt5-qtvirtualkeyboard/APKBUILD
+++ b/community/qt5-qtvirtualkeyboard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtvirtualkeyboard
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Virtual keyboard framework"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
diff --git a/community/qt5-qtwayland/APKBUILD b/community/qt5-qtwayland/APKBUILD
index 5afd3e71822..d2eded26c2e 100644
--- a/community/qt5-qtwayland/APKBUILD
+++ b/community/qt5-qtwayland/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwayland
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://www.qt.io/developers/"
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
diff --git a/community/qt5-qtwebchannel/APKBUILD b/community/qt5-qtwebchannel/APKBUILD
index 0da92bba064..3daafc26c54 100644
--- a/community/qt5-qtwebchannel/APKBUILD
+++ b/community/qt5-qtwebchannel/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwebchannel
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="library for seamless integration of C++ +and QML applications with HTML/JavaScript clients."
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD
index 55e94490e48..6a5188c6722 100644
--- a/community/qt5-qtwebengine/APKBUILD
+++ b/community/qt5-qtwebengine/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwebengine
 pkgver=5.15.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt5 - QtWebEngine components"
 url="https://www.qt.io/developers/"
 # ppc64le and s390x are not supported
diff --git a/community/qt5-qtwebkit/APKBUILD b/community/qt5-qtwebkit/APKBUILD
index 36c3a3855e1..d2766395ee5 100644
--- a/community/qt5-qtwebkit/APKBUILD
+++ b/community/qt5-qtwebkit/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=qt5-qtwebkit
 pkgver=5.212.0_alpha4
 _pkgver=${pkgver/_/-}
-pkgrel=13
+pkgrel=14
 pkgdesc="Qt5 - QtWebKit components"
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
diff --git a/community/qt5-qtwebsockets/APKBUILD b/community/qt5-qtwebsockets/APKBUILD
index eb5ff6fa1c0..6156a1087e4 100644
--- a/community/qt5-qtwebsockets/APKBUILD
+++ b/community/qt5-qtwebsockets/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwebsockets
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Provides WebSocket communication compliant with RFC 6455"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtwebview/APKBUILD b/community/qt5-qtwebview/APKBUILD
index 332f227ca55..b09023cab59 100644
--- a/community/qt5-qtwebview/APKBUILD
+++ b/community/qt5-qtwebview/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwebview
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 # ppc64le and s390x blocked by qt5-qtwebengine
 # armhf blocked by qt5-qtdeclarative
 arch="all !ppc64le !s390x !armhf !mips !mips64"
diff --git a/community/qt5-qtx11extras/APKBUILD b/community/qt5-qtx11extras/APKBUILD
index 674d6725da9..0ca49d7019e 100644
--- a/community/qt5-qtx11extras/APKBUILD
+++ b/community/qt5-qtx11extras/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtx11extras
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Provides platform-specific APIs for X11"
 url="https://www.qt.io/developers/"
 arch="all"
diff --git a/community/qt5-qtxmlpatterns/APKBUILD b/community/qt5-qtxmlpatterns/APKBUILD
index 5e3aa4c67e7..29d6ba3ec72 100644
--- a/community/qt5-qtxmlpatterns/APKBUILD
+++ b/community/qt5-qtxmlpatterns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtxmlpatterns
 pkgver=5.15.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt5 - QtXmlPatterns component"
 url="https://www.qt.io/developers/"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative