diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD
index 04a4126d..07b09bac 100644
--- a/qt5-base/mingw-w64-angle/PKGBUILD
+++ b/qt5-base/mingw-w64-angle/PKGBUILD
@@ -44,25 +44,21 @@
 
 # Helper functions for the split builds
 isDefault() {
-  [[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
 }
 isStatic() {
-  [[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
+  [ "${pkgname##*-}" = 'static' ]
 }
 isOpenGL() {
   isDefault || \ # currently use native OpenGL by default
-  [[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
+  [[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
 }
 isANGLE() {
   [[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
 }
 isDynamic() {
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
 }
 isNoOpenGL() {
   [[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
@@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
          'bab00ccc19d888997f323c80354a7c3f'
          'f7e1487de6e85116d9c6bde2eac4fb73'
          'bc99c4cc6998295d76f37ed681c20d47'
-         '370218fd439f25ab3f35bd1f14652988'
+         'e2ffff39673b37c4d9974e92fcf7213c'
          '4fe6523dd1c34398df3aa5a8763530cc'
          'f32a768e1acb9785c79c8e93aa266db2'
          '3bd322551924543553a2bf81b4419a09'
@@ -299,7 +295,9 @@ build() {
       -system-libpng \
       -system-libjpeg \
       -system-sqlite \
+      -system-freetype \
       -system-harfbuzz \
+      -system-pcre \
       -no-fontconfig \
       -iconv \
       -openssl \
@@ -326,7 +324,10 @@ build() {
       -device-option CROSS_COMPILE=${_arch}-"
 
     # Fix include directory of dbus
-    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
+
+    # Fix include directory of freetype2
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
 
     # Configure usage of ANGLE/OpenGL
     if isOpenGL; then
diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD
index 97fae179..9ae47ac8 100644
--- a/qt5-base/mingw-w64-dynamic/PKGBUILD
+++ b/qt5-base/mingw-w64-dynamic/PKGBUILD
@@ -44,25 +44,21 @@
 
 # Helper functions for the split builds
 isDefault() {
-  [[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
 }
 isStatic() {
-  [[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
+  [ "${pkgname##*-}" = 'static' ]
 }
 isOpenGL() {
   isDefault || \ # currently use native OpenGL by default
-  [[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
+  [[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
 }
 isANGLE() {
   [[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
 }
 isDynamic() {
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
 }
 isNoOpenGL() {
   [[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
@@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
          'bab00ccc19d888997f323c80354a7c3f'
          'f7e1487de6e85116d9c6bde2eac4fb73'
          'bc99c4cc6998295d76f37ed681c20d47'
-         '370218fd439f25ab3f35bd1f14652988'
+         'e2ffff39673b37c4d9974e92fcf7213c'
          '4fe6523dd1c34398df3aa5a8763530cc'
          'f32a768e1acb9785c79c8e93aa266db2'
          '3bd322551924543553a2bf81b4419a09'
@@ -299,7 +295,9 @@ build() {
       -system-libpng \
       -system-libjpeg \
       -system-sqlite \
+      -system-freetype \
       -system-harfbuzz \
+      -system-pcre \
       -no-fontconfig \
       -iconv \
       -openssl \
@@ -326,7 +324,10 @@ build() {
       -device-option CROSS_COMPILE=${_arch}-"
 
     # Fix include directory of dbus
-    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
+
+    # Fix include directory of freetype2
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
 
     # Configure usage of ANGLE/OpenGL
     if isOpenGL; then
diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD
index 60342478..7c4b5455 100644
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@@ -44,25 +44,21 @@
 
 # Helper functions for the split builds
 isDefault() {
-  [[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
 }
 isStatic() {
-  [[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
+  [ "${pkgname##*-}" = 'static' ]
 }
 isOpenGL() {
   isDefault || \ # currently use native OpenGL by default
-  [[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
+  [[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
 }
 isANGLE() {
   [[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
 }
 isDynamic() {
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
 }
 isNoOpenGL() {
   [[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
@@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
          'bab00ccc19d888997f323c80354a7c3f'
          'f7e1487de6e85116d9c6bde2eac4fb73'
          'bc99c4cc6998295d76f37ed681c20d47'
-         '370218fd439f25ab3f35bd1f14652988'
+         'e2ffff39673b37c4d9974e92fcf7213c'
          '4fe6523dd1c34398df3aa5a8763530cc'
          'f32a768e1acb9785c79c8e93aa266db2'
          '3bd322551924543553a2bf81b4419a09'
@@ -299,7 +295,9 @@ build() {
       -system-libpng \
       -system-libjpeg \
       -system-sqlite \
+      -system-freetype \
       -system-harfbuzz \
+      -system-pcre \
       -no-fontconfig \
       -iconv \
       -openssl \
@@ -326,7 +324,10 @@ build() {
       -device-option CROSS_COMPILE=${_arch}-"
 
     # Fix include directory of dbus
-    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
+
+    # Fix include directory of freetype2
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
 
     # Configure usage of ANGLE/OpenGL
     if isOpenGL; then
diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD
index d2290141..df065e7c 100644
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@@ -44,25 +44,21 @@
 
 # Helper functions for the split builds
 isDefault() {
-  [[ $pkgname = "mingw-w64-qt5-base" ]] || [[ $pkgname = "mingw-w64-qt5-base-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
 }
 isStatic() {
-  [[ $pkgname = "mingw-w64-qt5-base-static" ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] || \
-  [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
+  [ "${pkgname##*-}" = 'static' ]
 }
 isOpenGL() {
   isDefault || \ # currently use native OpenGL by default
-  [[ $pkgname = "mingw-w64-qt5-base-opengl" ]] || [[ $pkgname = "mingw-w64-qt5-base-opengl-static" ]] \
+  [[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
 }
 isANGLE() {
   [[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]] || \
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]] # treat dynamic version like ANGLE version, correct?
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]] # treat dynamic version like ANGLE version, correct?
 }
 isDynamic() {
-  [[ $pkgname = "mingw-w64-qt5-base-dynamic" ]] || [[ $pkgname = "mingw-w64-qt5-base-dynamic-static" ]]
+  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
 }
 isNoOpenGL() {
   [[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
@@ -112,7 +108,7 @@ md5sums=('184f9460b40752d71b15b827260580c2'
          'bab00ccc19d888997f323c80354a7c3f'
          'f7e1487de6e85116d9c6bde2eac4fb73'
          'bc99c4cc6998295d76f37ed681c20d47'
-         '370218fd439f25ab3f35bd1f14652988'
+         'e2ffff39673b37c4d9974e92fcf7213c'
          '4fe6523dd1c34398df3aa5a8763530cc'
          'f32a768e1acb9785c79c8e93aa266db2'
          '3bd322551924543553a2bf81b4419a09'
@@ -299,7 +295,9 @@ build() {
       -system-libpng \
       -system-libjpeg \
       -system-sqlite \
+      -system-freetype \
       -system-harfbuzz \
+      -system-pcre \
       -no-fontconfig \
       -iconv \
       -openssl \
@@ -326,7 +324,10 @@ build() {
       -device-option CROSS_COMPILE=${_arch}-"
 
     # Fix include directory of dbus
-    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1)"
+
+    # Fix include directory of freetype2
+    qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I freetype2)"
 
     # Configure usage of ANGLE/OpenGL
     if isOpenGL; then