Subject: Qt6 Base and Module Updates

From: "Eric Brown" <[email-masked]>
Date: Mon, 24 May 2021 10:48:13 -0500

Patch set attached.

From c357400184846ea7636008f628b76d2d78c7bb50 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 09:09:42 -0500
Subject: [PATCH 01/37] * gnu/packages/qt.scm (qtbase-5): New variable.

---
 gnu/packages/admin.scm            |   2 +-
 gnu/packages/aidc.scm             |   2 +-
 gnu/packages/animation.scm        |   4 +-
 gnu/packages/astronomy.scm        |   4 +-
 gnu/packages/audio.scm            |  20 ++--
 gnu/packages/bioinformatics.scm   |   2 +-
 gnu/packages/bittorrent.scm       |   2 +-
 gnu/packages/calendar.scm         |   2 +-
 gnu/packages/chemistry.scm        |   6 +-
 gnu/packages/compression.scm      |   2 +-
 gnu/packages/connman.scm          |   2 +-
 gnu/packages/cvassistant.scm      |   2 +-
 gnu/packages/display-managers.scm |   2 +-
 gnu/packages/djvu.scm             |   2 +-
 gnu/packages/documentation.scm    |   2 +-
 gnu/packages/ebook.scm            |   2 +-
 gnu/packages/education.scm        |   8 +-
 gnu/packages/electronics.scm      |   2 +-
 gnu/packages/emulators.scm        |  10 +-
 gnu/packages/engineering.scm      |  16 +--
 gnu/packages/fcitx.scm            |   2 +-
 gnu/packages/fcitx5.scm           |   6 +-
 gnu/packages/finance.scm          |  12 +--
 gnu/packages/flashing-tools.scm   |   4 +-
 gnu/packages/fpga.scm             |   2 +-
 gnu/packages/game-development.scm |   6 +-
 gnu/packages/games.scm            |  96 ++++++++---------
 gnu/packages/geo.scm              |   6 +-
 gnu/packages/gnupg.scm            |   4 +-
 gnu/packages/gpodder.scm          |   2 +-
 gnu/packages/gps.scm              |   6 +-
 gnu/packages/graphics.scm         |   4 +-
 gnu/packages/gstreamer.scm        |   2 +-
 gnu/packages/image-processing.scm |   6 +-
 gnu/packages/image-viewers.scm    |   6 +-
 gnu/packages/image.scm            |   2 +-
 gnu/packages/irc.scm              |   2 +-
 gnu/packages/jami.scm             |   2 +-
 gnu/packages/kde-frameworks.scm   | 172 +++++++++++++++---------------
 gnu/packages/kde-internet.scm     |  16 +--
 gnu/packages/kde-multimedia.scm   |  26 ++---
 gnu/packages/kde-pim.scm          |  80 +++++++-------
 gnu/packages/kde-plasma.scm       |  12 +--
 gnu/packages/kde-systemtools.scm  |  14 +--
 gnu/packages/kde-utils.scm        |  22 ++--
 gnu/packages/kde.scm              |  50 ++++-----
 gnu/packages/language.scm         |   4 +-
 gnu/packages/lego.scm             |   2 +-
 gnu/packages/linphone.scm         |   2 +-
 gnu/packages/logo.scm             |   2 +-
 gnu/packages/lxqt.scm             |  56 +++++-----
 gnu/packages/maths.scm            |  10 +-
 gnu/packages/messaging.scm        |  14 +--
 gnu/packages/mpd.scm              |   2 +-
 gnu/packages/music.scm            |  40 +++----
 gnu/packages/networking.scm       |   4 +-
 gnu/packages/ocr.scm              |   2 +-
 gnu/packages/orange.scm           |   2 +-
 gnu/packages/password-utils.scm   |   4 +-
 gnu/packages/pdf.scm              |  10 +-
 gnu/packages/photo.scm            |   2 +-
 gnu/packages/polkit.scm           |   2 +-
 gnu/packages/printers.scm         |   4 +-
 gnu/packages/profiling.scm        |   2 +-
 gnu/packages/pumpio.scm           |   2 +-
 gnu/packages/python-xyz.scm       |   4 +-
 gnu/packages/qt.scm               | 104 +++++++++---------
 gnu/packages/radio.scm            |  22 ++--
 gnu/packages/robotics.scm         |   4 +-
 gnu/packages/scribus.scm          |   2 +-
 gnu/packages/sync.scm             |   6 +-
 gnu/packages/syndication.scm      |   2 +-
 gnu/packages/synergy.scm          |   2 +-
 gnu/packages/telegram.scm         |   2 +-
 gnu/packages/telephony.scm        |   4 +-
 gnu/packages/terminals.scm        |   2 +-
 gnu/packages/tex.scm              |   4 +-
 gnu/packages/text-editors.scm     |   4 +-
 gnu/packages/video.scm            |  20 ++--
 gnu/packages/web-browsers.scm     |   2 +-
 gnu/packages/web.scm              |  10 +-
 gnu/packages/xdisorg.scm          |   2 +-
 gnu/packages/xorg.scm             |   2 +-
 83 files changed, 510 insertions(+), 510 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 001c6db414..78964ac77e 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1866,7 +1866,7 @@ command.")
   (package
     (inherit wpa-supplicant)
     (name "wpa-supplicant-gui")
-    (inputs `(("qtbase" ,qtbase)
+    (inputs `(("qtbase" ,qtbase-5)
               ("qtsvg" ,qtsvg)
               ,@(package-inputs wpa-supplicant)))
     (native-inputs
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index d1b63de736..3db631d92e 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -195,7 +195,7 @@ C/C++ programs to use its capabilities without restrictions or overhead.")
        ("imagemagick" ,imagemagick)
        ("libjpeg" ,libjpeg-turbo)
        ("python" ,python)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("v4l-utils" ,v4l-utils)))
     (synopsis "Bar code reader")
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 3a915c7fda..2eafc4d083 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -374,7 +374,7 @@ audio or video backends, ensuring good performance.")
                            qt)))
                  #t))))))
       (inputs
-       `(("qt" ,qtbase)
+       `(("qt" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)
          ("libsndfile" ,libsndfile)))
       (native-inputs
@@ -404,7 +404,7 @@ waveform until they line up with the proper sounds.")
                 "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
     (build-system gnu-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)))
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 6d1c4ddfe6..82bbc49724 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -412,7 +412,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
         (base32 "04vg2asj9gygwnrs32scqc8192ln2lyqa9v7cjqk8zd4frkwszwp"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
        ("qtscript" ,qtscript)
@@ -421,7 +421,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
     (native-inputs
      `(("gettext" ,gettext-minimal)     ; xgettext is used at compile time
        ("perl" ,perl)                   ; for pod2man
-       ("qtbase" ,qtbase)               ; Qt MOC is needed at compile time
+       ("qtbase" ,qtbase-5)               ; Qt MOC is needed at compile time
        ("qttools" ,qttools)))
     (arguments
      `(#:test-target "test"
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 2f05a26e41..ebebd4eec8 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -495,7 +495,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
        ("jack" ,jack-1)
        ("ladspa" ,ladspa)
        ("liblo" ,liblo)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -2141,7 +2141,7 @@ synchronous execution of all clients, and low latency operation.")
        ("gtk2" ,gtk+-2)
        ("gtk3" ,gtk+)
        ("gtkmm" ,gtkmm-2)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("jack" ,jack-1)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -2733,7 +2733,7 @@ different audio devices such as ALSA or PulseAudio.")
      `(("jack" ,jack-1)
        ("alsa-lib" ,alsa-lib)
        ("portaudio" ,portaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -2767,11 +2767,11 @@ into various outputs and to start, stop and configure jackd")
                      (string-append "PREFIX="
                                     (assoc-ref outputs "out"))))))))
     (native-inputs
-     `(("qtbase" ,qtbase))) ; for qmake
+     `(("qtbase" ,qtbase-5))) ; for qmake
     (inputs
      `(("jack" ,jack-1)
        ("libsndfile" ,libsndfile)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://sourceforge.net/projects/qjackrcd/")
     (synopsis "Stereo audio recorder for JACK")
     (description "QJackRcd is a simple graphical stereo recorder for JACK
@@ -2880,7 +2880,7 @@ link REQUIRED)"))
        ("boost" ,boost)
        ("boost-sync" ,boost-sync)
        ("yaml-cpp" ,yaml-cpp)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)
        ("qtwebchannel" ,qtwebchannel)
@@ -3082,7 +3082,7 @@ the Turtle syntax.")
      `(("lv2" ,lv2)
        ("gtk+" ,gtk+-2)
        ("gtk+" ,gtk+)
-       ("qt" ,qtbase)))
+       ("qt" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://drobilla.net/software/suil/")
@@ -3558,7 +3558,7 @@ interface.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("fluidsynth" ,fluidsynth)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://qsynth.sourceforge.io")
     (synopsis "Graphical user interface for FluidSynth")
@@ -4734,7 +4734,7 @@ as is the case with audio plugins.")
        ;; (ModuleNotFoundError: No module named 'PyQt5')
        ("python-wrapper" ,python-wrapper)
        ("libx11" ,libx11)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)
 
        ;; For WRAP-SCRIPT above.
@@ -5093,7 +5093,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
      `(("catch" ,catch-framework)
        ("python" ,python)       ;for running tests
        ("portaudio" ,portaudio) ;for portaudio examples
-       ("qtbase" ,qtbase)       ;for Qt examples
+       ("qtbase" ,qtbase-5)       ;for Qt examples
        ("qtdeclarative" ,qtdeclarative)
        ("qttools" ,qttools)))
     (inputs
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 9c77d66a35..659d61c639 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12386,7 +12386,7 @@ Thus the per-base error rate is similar to the raw input reads.")
                (install-file "Bandage" (string-append out "/bin"))
                #t))))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("imagemagick" ,imagemagick)))
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 29b0d62ad2..5d6a780aab 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -459,7 +459,7 @@ desktops.")
        ("libtorrent-rasterbar" ,libtorrent-rasterbar)
        ("openssl" ,openssl)
        ("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("zlib" ,zlib)))
     (home-page "https://www.qbittorrent.org/")
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index f62f746357..aaf1e693fb 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -347,7 +347,7 @@ and ruby.  It includes two illustrative command-line programs, @code{hcal} and
     (native-inputs
      `(("perl" ,perl))) ; pod2man
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://www.toastfreeware.priv.at/confclerk")
     (synopsis "Offline conference schedule application")
     (description
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 4b0e719959..a52ecf69f7 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -80,7 +80,7 @@
        ("molequeue" ,molequeue)
        ("python" ,python)
        ("spglib" ,spglib)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      '(#:configure-flags (list "-DENABLE_TESTING=ON"
                                (string-append "-DSPGLIB_INCLUDE_DIR="
@@ -116,7 +116,7 @@ bioinformatics, materials science, and related areas.")
      `(("avogadrolibs" ,avogadrolibs)
        ("hdf5" ,hdf5)
        ("molequeue" ,molequeue)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     ;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
     (arguments
      '(#:tests? #f))
@@ -301,7 +301,7 @@ biological structures.")
          "1w1fgxzqrb5yxvpmnc3c9ymnvixy0z1nfafkd9whg9zw8nbgl998"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      '(#:configure-flags '("-DENABLE_TESTING=ON")
        #:phases
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 3dbe517f93..addd972206 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2189,7 +2189,7 @@ download times, and other distribution and storage costs.")
     (native-inputs
      `(("doxygen" ,doxygen)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (home-page "https://stachenov.github.io/quazip/index.html")
     (synopsis "Qt/C++ wrapper for Minizip")
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index e6d97db0fd..4cce62d9de 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -148,7 +148,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
        (sha256
         (base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq"))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("qttools" ,qttools)))
     (build-system gnu-build-system)
diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm
index f57806d734..3f3a6f7492 100644
--- a/gnu/packages/cvassistant.scm
+++ b/gnu/packages/cvassistant.scm
@@ -69,7 +69,7 @@
          (replace 'configure
            (lambda _ (invoke "qmake"))))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("quazip" ,quazip)
        ("zlib" ,zlib)))
     (home-page "https://cvassistant.sourceforge.io/")
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 6ea6e1a161..8a0342d7c5 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -80,7 +80,7 @@
        ("libxcb" ,libxcb)
        ("libxkbcommon" ,libxkbcommon)
        ("linux-pam" ,linux-pam)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
 
        ;; Some user-defined themes use QtQuick components internally.  Adding
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 6423eb124f..96071b8da1 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -119,7 +119,7 @@ utilities.")
        ("glib" ,glib)
        ("libxt" ,libxt)
        ("libtiff" ,libtiff)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 39510316d2..19190f4480 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -330,7 +330,7 @@ local system.")
       (inputs
        `(("libarchive" ,libarchive)
          ("sqlite" ,sqlite)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative)
          ("qtwebchannel" ,qtwebchannel)
          ("qtwebengine" ,qtwebengine)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 3a779a4fea..565b800e96 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -146,7 +146,7 @@ with Microsoft Compiled HTML (CHM) files")
     (build-system python-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtbase" ,qtbase) ; for qmake
+       ("qtbase" ,qtbase-5) ; for qmake
        ("python-flake8" ,python-flake8)
        ("python-pyqt-builder" ,python-pyqt-builder)
        ("xdg-utils" ,xdg-utils)))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0986d2a19e..f31dbca733 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -190,7 +190,7 @@ of categories with some of the activities available in that category.
     (inputs
      `(("openssl" ,openssl)
        ("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
@@ -259,7 +259,7 @@ Currently available boards include:
                ;; Recreate Makefile
                (invoke "qmake")))))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)))
     (home-page "https://www.tipp10.com/")
     (synopsis "Touch typing tutor")
@@ -637,7 +637,7 @@ Portuguese, Spanish and Italian.")
          (replace 'configure
            (lambda _ (invoke "qmake" "fet.pro"))))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://www.lalescu.ro/liviu/fet/")
     (synopsis "Timetabling software")
     (description
@@ -711,7 +711,7 @@ language and very flexible regarding to new or unknown keyboard layouts.")
        ("kxmlgui" ,kxmlgui)
        ("libxcb" ,libxcb)
        ("libxkbfile" ,libxkbfile)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols2" ,qtquickcontrols2)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 861544ee22..0e985c9750 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -277,7 +277,7 @@ format support.")
        ("glibmm" ,glibmm)
        ("libsigrok" ,libsigrok)
        ("libsigrokdecode" ,libsigrokdecode)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (home-page "https://www.sigrok.org/wiki/PulseView")
     (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 30cd2daf55..02dd6c124f 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -275,7 +275,7 @@ SuperCPU.")
          ("openal" ,openal)
          ("pugixml" ,pugixml)
          ("pulseaudio" ,pulseaudio)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("sdl2" ,sdl2)
          ("sfml" ,sfml)
          ("soil" ,soil)
@@ -375,7 +375,7 @@ older games.")
        #:tests? #f))    ; test suite wants mips toolchain
     (inputs
      `(("elfutils" ,elfutils)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://github.com/cvut/QtMips")
     (synopsis "MIPS CPU emulator")
     (description "This package contains a MIPS CPU emulator.  The simulator
@@ -619,7 +619,7 @@ The following systems are supported:
               ("mesa" ,mesa)
               ("minizip" ,minizip)
               ("ncurses" ,ncurses)
-              ("qtbase" ,qtbase)
+              ("qtbase" ,qtbase-5)
               ("qtmultimedia" ,qtmultimedia)
               ("sdl2" ,sdl2)
               ("sqlite" ,sqlite)
@@ -1378,7 +1378,7 @@ as RetroArch.")
        ("openal" ,openal)
        ("pulseaudio" ,pulseaudio)
        ("python" ,python)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sdl" ,sdl2)
        ("udev" ,eudev)
        ("vulkan-loader" ,vulkan-loader)
@@ -1798,7 +1798,7 @@ This is a part of the TiLP project.")
        ("pugixml" ,pugixml)
        ("pulseaudio" ,pulseaudio)
        ("python-wrapper" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("rapidjson" ,rapidjson)
        ("sdl" ,(sdl-union (list sdl2 sdl2-ttf)))
        ("sqlite" ,sqlite)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 5a97d25b27..fae85b6f2c 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -201,7 +201,7 @@
      `(("boost" ,boost)
        ("muparser" ,muparser)
        ("freetype" ,freetype)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -701,7 +701,7 @@ multipole-accelerated algorithm.")
                        (string-append "PREFIX=" out)
                        "phoenix.pro")))))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg" ,qtsvg)
        ("libgit2" ,libgit2)
@@ -834,7 +834,7 @@ fonts to gEDA.")
       (inputs
        `(("boost" ,boost)
          ("libpng" ,libpng)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("eigen" ,eigen)
          ("guile" ,guile-3.0)))
       (home-page "https://libfive.com")
@@ -2047,7 +2047,7 @@ parallel computing platforms.  It also supports serial execution.")
         (base32 "1b5dkanz3q0y5ag80w0l85hn7axrachb5m9zvyv4zvzrfy09wa88"))))
     (build-system gnu-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("zlib" ,zlib)))
     (native-inputs
@@ -2209,7 +2209,7 @@ simulation.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("openssl" ,openssl)
        ;; Depends on radare2 4.5.1 officially, builds and works fine with
@@ -2288,7 +2288,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
        ("mpfr" ,mpfr)
        ("opencsg" ,opencsg)
        ("qscintilla" ,qscintilla)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)))
     (native-inputs
      `(("bison" ,bison)
@@ -2420,7 +2420,7 @@ comments.")))
        ("python-pyyaml" ,python-pyyaml)
        ("python-shiboken-2" ,python-shiboken-2)
        ("python-wrapper" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras)
@@ -2700,7 +2700,7 @@ export filters.")
                (base32 "1cgx24wxh2ah5pff51rcrk6x8qcdjpkxcdak7s4cfzmxvjlshydd"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("mesa" ,mesa)
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index 80bfbd8c84..c602789b45 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -88,7 +88,7 @@
        ("libintl" ,intltool)
        ("libxkbcommon" ,libxkbcommon)))
     (propagated-inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (synopsis "Fcitx Qt5 Input Context")
     (description "This package provides a Qt5 frontend for fcitx.")
     (home-page "https://github.com/fcitx/fcitx-qt5/")
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index a01eacb7cb..9e0bc4ab21 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -269,7 +269,7 @@ for GTK+2/GTK+3 application.")
      `(("fcitx5" ,fcitx5)
        ("libxcb" ,libxcb)
        ("libxkbcommon" ,libxkbcommon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("gettext" ,gettext-minimal)))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
@@ -315,7 +315,7 @@ for Qt based application.")
        ("fmt" ,fmt)
        ("libpthread-stubs" ,libpthread-stubs)
        ("opencc" ,opencc)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("fcitx5-qt" ,fcitx5-qt)
        ("qtwebkit" ,qtwebkit)))
     (native-inputs
@@ -363,7 +363,7 @@ including input methods previous bundled inside Fcitx 4:
     (inputs
      `(("fcitx5" ,fcitx5)
        ("fcitx5-qt" ,fcitx5-qt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("kitemviews" ,kitemviews)
        ("kwidgetsaddons" ,kwidgetsaddons)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index fbd7df783c..09f265afce 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -138,7 +138,7 @@
        ("libevent" ,libevent)
        ("miniupnpc" ,miniupnpc)
        ("openssl" ,openssl)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:configure-flags
        (list
@@ -773,7 +773,7 @@ the Monero command line client and daemon.")
      `(,@(package-inputs monero)
        ("libgcrypt" ,libgcrypt)
        ("monero" ,monero)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
@@ -1309,7 +1309,7 @@ Trezor wallet.")
        ("openssl" ,openssl)
        ("protobuf" ,protobuf)
        ("qrencode" ,qrencode)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zeromq" ,zeromq)
        ("zlib" ,zlib)))
     (arguments
@@ -1422,7 +1422,7 @@ following three utilities are included with the library:
        ("openssl" ,openssl)
        ("protobuf" ,protobuf)
        ("qrencode" ,qrencode)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zeromq" ,zeromq)
        ("zlib" ,zlib)))
     (arguments
@@ -1496,7 +1496,7 @@ a Qt GUI.")
      `(("qttools" ,qttools)))
     (inputs
      `(("python" ,python)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("rocksdb" ,rocksdb)
        ("zlib" ,zlib)))
     (home-page "https://gitlab.com/FloweeTheHub/fulcrum/")
@@ -1561,7 +1561,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
        ("libevent" ,libevent)
        ("miniupnpc" ,miniupnpc)
        ("openssl" ,openssl)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)
diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 4b597dca50..e0a099e966 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -333,7 +333,7 @@ RK3036, RK3066, RK312X, RK3168, RK3188, RK3288, RK3368.")
                #t))))))
     (inputs
      `(("libusb" ,libusb)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (home-page "https://glassechidna.com.au/heimdall/")
     (synopsis "Flash firmware onto Samsung mobile devices")
@@ -476,7 +476,7 @@ ME as far as possible (it only edits ME firmware image files).")
                                                      "/bin"))
              #t)))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://github.com/LongSoft/UEFITool/")
     (synopsis "UEFI image editor")
     (description "@code{uefitool} is a graphical image file editor for
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 809a807467..2f7aaba498 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -289,7 +289,7 @@ Includes the actual FTDI connector.")
          ("eigen" ,eigen)
          ("icestorm" ,icestorm)
          ("python" ,python)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("yosys" ,yosys)))
       (build-system cmake-build-system)
       (arguments
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 52541196b3..dfc236546d 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -460,7 +460,7 @@ support.")
                 "1prajkx1xpp3csa0xpkrn3c2cnzvmwzxgrqb9d3gqszp3sllr2dg"))))
     (build-system gnu-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)
        ("zlib" ,zlib)))
@@ -1610,7 +1610,7 @@ of use.")
        ("mygui" ,mygui-gl)              ; OpenMW does not need Ogre.
        ("openal" ,openal)
        ("openscenegraph" ,openmw-openscenegraph)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sdl" ,sdl2)
        ("unshield" ,unshield)))
     (synopsis "Re-implementation of the RPG Morrowind engine")
@@ -2429,7 +2429,7 @@ utilities frequently used in roguelikes.")
          ("mesa" ,mesa)
          ("openal" ,openal)
          ("pulseaudio" ,pulseaudio)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative)
          ("sdl2" ,sdl2)
          ("uuid.h" ,util-linux "lib")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6908d115f2..cb6e7e9ed5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -927,7 +927,7 @@ want what you have.")
          ("pkg-config" ,pkg-config)))
       (inputs
        `(("protobuf" ,protobuf)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)
          ("qtsvg" ,qtsvg)
          ("qttools" ,qttools)
@@ -2415,7 +2415,7 @@ and defeat them with your bubbles!")
        ("luajit" ,luajit)
        ("openal" ,openal)
        ("physfs" ,physfs)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf)))))
     (home-page "https://www.solarus-games.org/")
     (synopsis "Lightweight game engine for Action-RPGs")
@@ -5199,7 +5199,7 @@ in-window at 640x480 resolution or fullscreen.")
               ("miniupnpc" ,miniupnpc)
               ("openal" ,openal)
               ("physfs" ,physfs)
-              ("qtbase" ,qtbase)
+              ("qtbase" ,qtbase-5)
               ("qtscript" ,qtscript)
               ("openssl" ,openssl)
               ("sdl2" ,sdl2)
@@ -7252,7 +7252,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
        ;; with multiple "QPainter:: ... Painter not active" warnings.
        #:tests? #f))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("cmake" ,cmake-minimal)
@@ -8968,7 +8968,7 @@ a fortress beyond the forbidden swamp.")
        ("mesa" ,mesa)
        ("miniupnpc" ,miniupnpc)
        ("openal" ,openal)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("readline" ,readline)
        ("sdl" ,sdl2)
        ("tinyxml" ,tinyxml)
@@ -9302,7 +9302,7 @@ and also provides the base for the FlightGear Flight Simulator.")
        ("openal" ,openal)
        ("openscenegraph" ,openscenegraph-3.4)
        ("plib" ,plib)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)
        ("simgear" ,simgear)
@@ -9429,7 +9429,7 @@ play with up to four players simultaneously.  It has network support.")
        ("libpng" ,libpng)
        ("lua" ,lua-5.1)
        ("physfs" ,physfs)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sdl" ,(sdl-union
                 (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))))
     (native-inputs
@@ -10114,7 +10114,7 @@ remake of that series or any other game.")
       ("ocl-icd" ,ocl-icd)
       ("openblas" ,openblas)
       ("opencl-headers" ,opencl-headers)
-      ("qtbase" ,qtbase)
+      ("qtbase" ,qtbase-5)
       ("zlib" ,zlib)))
    (arguments
     '(#:configure-flags '("-DUSE_BLAS=YES")
@@ -10157,7 +10157,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (inputs
-    `(("qtbase" ,qtbase)
+    `(("qtbase" ,qtbase-5)
       ("qtmultimedia" ,qtmultimedia)
       ("qtsvg" ,qtsvg)))
    (arguments
@@ -10249,7 +10249,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
@@ -10297,7 +10297,7 @@ This package is part of the KDE games module.")
        ("knewstuff" ,knewstuff)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10336,7 +10336,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("ktextwidgets" ,ktextwidgets)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Miniature golf game")
@@ -10380,7 +10380,7 @@ This package is part of the KDE games module.")
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
     (synopsis "Shared library for kmahjongg and kshisen")
@@ -10413,7 +10413,7 @@ other Mah Jongg like games.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("libkmahjongg" ,libkmahjongg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10456,7 +10456,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("libkmahjongg" ,libkmahjongg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Shisen-Sho solitaire game")
@@ -10501,7 +10501,7 @@ This package is part of the KDE games module.")
        ("python" ,python)
        ("python-twisted" ,python-twisted)
        ("python-pyqt" ,python-pyqt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
     (synopsis "Classical Mah Jongg game for 4 players")
@@ -10544,7 +10544,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Breakout like game")
@@ -10583,7 +10583,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Classical mine sweeper game")
@@ -10620,7 +10620,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10660,7 +10660,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10699,7 +10699,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10743,7 +10743,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("glu" ,glu)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10800,7 +10800,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones")
@@ -10844,7 +10844,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Action and puzzle solving game")
@@ -10888,7 +10888,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Three-in-a-row game")
@@ -10924,7 +10924,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -10964,7 +10964,7 @@ This package is part of the KDE games module.")
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11006,7 +11006,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Turn the board pieces to get all computers connected")
@@ -11045,7 +11045,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Arcade bombing game")
@@ -11090,7 +11090,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11127,7 +11127,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("phonon" ,phonon)
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)
        ("zlib" ,zlib)))
@@ -11189,7 +11189,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)
        ("shared-mime-info" ,shared-mime-info)))
@@ -11231,7 +11231,7 @@ This package is part of the KDE games module.")
        ("kiconthemes" ,kiconthemes)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Yahtzee dice game")
@@ -11271,7 +11271,7 @@ This package is part of the KDE games module.")
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11317,7 +11317,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11358,7 +11358,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11397,7 +11397,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11437,7 +11437,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11471,7 +11471,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11511,7 +11511,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Port of the classic BSD console game robots")
@@ -11553,7 +11553,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11591,7 +11591,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Simple ball dodging game")
@@ -11632,7 +11632,7 @@ This package is part of the KDE games module.")
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Battleship board game with built-in game server")
@@ -11672,7 +11672,7 @@ This package is part of the KDE games module.")
        ("kio" ,kio)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11714,7 +11714,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://games.kde.org/")
     (synopsis "Dots and Boxes game")
@@ -11751,7 +11751,7 @@ This package is part of the KDE games module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -11914,7 +11914,7 @@ and chess engines.")
     (native-inputs
      `(("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg)
@@ -12245,7 +12245,7 @@ game.")  ;thanks to Debian for description
        ("libgcrypt" ,libgcrypt)
        ("libircclient" ,libircclient)
        ("protobuf" ,protobuf-2)         ; remove package when no longer needed
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sdl" ,(sdl-union (list sdl sdl-mixer)))
        ("sqlite" ,sqlite)
        ("tinyxml" ,tinyxml)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index c4bdb6aca0..a0b43308e4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1247,7 +1247,7 @@ map display.  Downloads map data from a number of websites, including
        ("libpng" ,libpng)
        ("openjpeg" ,openjpeg)
        ("proj.4" ,proj.4)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (synopsis "Weather Forecast Visualization")
     (description
@@ -1663,7 +1663,7 @@ using the dataset of topographical information collected by
      `(("gdal" ,gdal)
        ("libjpeg-turbo" ,libjpeg-turbo)
        ("proj" ,proj)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtlocation" ,qtlocation)
        ("qtwebchannel" ,qtwebchannel)
@@ -2282,7 +2282,7 @@ growing set of geoscientific methods.")
        ("python-urllib3" ,python-urllib3)
        ("qca" ,qca)
        ("qscintilla" ,qscintilla)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtkeychain" ,qtkeychain)
        ("qtlocation" ,qtlocation)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index fefa1e01f1..9cc94dddb6 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -410,7 +410,7 @@ and every application benefits from this.")
        ,@(package-native-inputs gpgme)))
     (inputs
      `(("gpgme" ,gpgme)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ,@(package-inputs gpgme)))
     (synopsis "Qt API bindings for gpgme")
     (description "QGpgme provides a very high level Qt API around GpgMEpp.
@@ -863,7 +863,7 @@ software.")))
     (arguments
      `(#:configure-flags '("--enable-fallback-curses")))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ,@(package-inputs pinentry-tty)))
   (description
    "Pinentry provides a console and a Qt GUI that allows users to enter a
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index 677ec3f33e..1219162016 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -144,7 +144,7 @@ locally for later listening.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("qt" ,qtbase)))
+     `(("qt" ,qtbase-5)))
     (arguments
      `(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON")
        ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index d2f0becec0..0eb4362858 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -85,7 +85,7 @@
     (inputs
      `(("expat" ,expat)
        ("libusb" ,libusb)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (native-inputs
      `(("which" ,which)
@@ -207,7 +207,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
                      (string-append "PREFIX="
                                     (assoc-ref outputs "out"))))))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("qttools" ,qttools)))
     (home-page "https://www.gpxsee.org")
@@ -246,7 +246,7 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.")
        ("python-pygobject" ,python-pygobject)
        ("python-pyserial" ,python-pyserial)
        ("python-wrapper" ,python-wrapper)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:scons-flags
        (list (string-append "prefix=" %output)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2c25c5405b..5003b3f9c4 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1499,7 +1499,7 @@ exec -a \"$0\" ~a/.brdf-real~%"
       (native-inputs
        `(("qttools" ,qttools))) ;for 'qmake'
       (inputs
-       `(("qtbase" ,qtbase)
+       `(("qtbase" ,qtbase-5)
          ("mesa" ,mesa)
          ("glew" ,glew)
          ("freeglut" ,freeglut)
@@ -1935,7 +1935,7 @@ Automated palette selection is supported.")
          ("libvpx" ,libvpx)
          ("libxi" ,libxi)
          ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtkeychain" ,qtkeychain)
          ("qtmultimedia" ,qtmultimedia)
          ("qtsvg" ,qtsvg)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 9e70961655..3047773e0f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -767,7 +767,7 @@ model to base your own plug-in on, here it is.")
        ("openssl" ,openssl)
        ("opus" ,opus)
        ("orc" ,orc)
-       ;("qtbase" ,qtbase)
+       ;("qtbase" ,qtbase-5)
        ;("qtdeclarative" ,qtdeclarative)
        ;("qtx11extras" ,qtx11extras)
        ("soundtouch" ,soundtouch)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index ed21b26812..f2bb3a1572 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -703,7 +703,7 @@ including 2D color images.")
        ("qttools" ,qttools)))
     (inputs
      `(("gmic" ,gmic)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ,@(package-inputs gmic)))
     (synopsis "Qt frontend for the G'MIC image processing framework")
     (license license:gpl3+)))
@@ -1030,7 +1030,7 @@ combine the information contained in both.")
        ;; not with 4.13.  It really needs to be 4.12.
        ("itk" ,insight-toolkit-4.12)
        ("vtk" ,vtk-6)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("vxl" ,vxl-1)
        ("zlib" ,zlib)))
@@ -1157,7 +1157,7 @@ substituted by matching images.")
          ("libjpeg" ,libjpeg-turbo)
          ("libpng" ,libpng)
          ("libtiff" ,libtiff)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtsvg" ,qtsvg)
          ("zlib" ,zlib)))
       (arguments
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index c7dd358ad4..f01b6a614a 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -358,7 +358,7 @@ It supports JPEG, PNG and GIF formats.")
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)
        ("qtwebkit" ,qtwebkit)
@@ -527,7 +527,7 @@ For PDF support, install the @emph{mupdf} package.")
                (("updateText\\(\\);") ""))
              #t)))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtimageformats" ,qtimageformats)))
     (home-page "https://interversehq.com/qview/")
@@ -733,7 +733,7 @@ to set X desktop background.")
        ("opencv" ,opencv)
        ("python" ,python-wrapper)
        ("quazip" ,quazip)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 64863cd3b3..00cf5acd73 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1824,7 +1824,7 @@ parsing, viewing, modifying, and saving this metadata.")
     (native-inputs
      `(("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (arguments
      `(#:tests? #f))                    ;no tests
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 2cc4e5e2c2..a0a66e2811 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -130,7 +130,7 @@
      `(("inxi" ,inxi-minimal)
        ("libdbusmenu-qt" ,libdbusmenu-qt)
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtscript" ,qtscript)
        ("qtsvg" ,qtsvg)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 0adc3ed81e..a6b221f09e 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -486,7 +486,7 @@ protocols, as well as decentralized calling using P2P-DHT.")
      `(("libring" ,libring)
        ("network-manager" ,network-manager)))
     (propagated-inputs
-     `(("qtbase" ,qtbase)))     ; Qt is included in several installed headers.
+     `(("qtbase" ,qtbase-5)))     ; Qt is included in several installed headers.
     (arguments
      `(#:tests? #f                      ; There is no testsuite.
        #:configure-flags
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index ef47a912ad..7a3b6b26a8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -98,7 +98,7 @@
                 "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("qtbase" ,qtbase))) ; For tests (needs qmake)
+     `(("qtbase" ,qtbase-5))) ; For tests (needs qmake)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -165,7 +165,7 @@ common build settings used in software produced by the KDE community.")
        ("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:configure-flags
        '("-DCMAKE_CXX_FLAGS=-fPIC"
@@ -204,9 +204,9 @@ common build settings used in software produced by the KDE community.")
        ("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
@@ -252,7 +252,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Open Collaboration Service client library")
     (description "Attica is a Qt library that implements the Open
@@ -286,7 +286,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/")
        ("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      ;; TODO: qtdeclarative (yields one failing test)
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:configure-flags
        (list (string-append
@@ -319,7 +319,7 @@ Bluetooth stack.  It is used by the KDE Bluetooth stack, BlueDevil.")
        ("fdupes" ,fdupes)
        ("libxml2" ,libxml2)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Default KDE Plasma 5 icon theme")
     (description "Breeze provides a freedesktop.org compatible icon theme.
@@ -356,7 +356,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.")
        ("python-jinja2" ,python-jinja2)
        ("python-pyyaml" ,python-pyyaml)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Doxygen Tools")
     (description "This framework contains scripts and data for building API
@@ -389,7 +389,7 @@ documentation.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("bzip2" ,bzip2)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("xz" ,xz)
        ("zlib" ,zlib)))
     (home-page "https://community.kde.org/Frameworks")
@@ -425,7 +425,7 @@ GZip format, via a subclass of QIODevice.")
        ("tzdata" ,tzdata-for-tests)))
     (inputs
      `(("libical" ,libical)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -485,7 +485,7 @@ and the older vCalendar.")
        ("gperf" ,gperf)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "String encoding and manipulating library")
     (description "KCodecs provide a collection of methods to manipulate
@@ -523,7 +523,7 @@ Internet).")
        ("qttools" ,qttools)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -588,7 +588,7 @@ propagate their changes to their respective configuration files.")
        ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
        ("xorg-server" ,xorg-server-for-tests))) ; for the tests
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -644,7 +644,7 @@ many more.")
        ("dbus" ,dbus)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("kinit" ,kinit-bootstrap))) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
     (arguments
@@ -688,7 +688,7 @@ as well as an API to create KDED modules.")
        ("qttools" ,qttools)))
     (inputs
      `(("avahi" ,avahi) ; alternativly dnssd could be used
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Network service discovery using Zeroconf")
     (description "KDNSSD is a library for handling the DNS-based Service
@@ -711,7 +711,7 @@ infrastructure.")
                 "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("boost" ,boost)
        ("graphviz" ,graphviz)
        ("kiconthemes" ,kiconthemes)
@@ -749,7 +749,7 @@ replace the other outdated Graphviz tools.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Utilities for graphical user interfaces")
@@ -784,7 +784,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://invent.kde.org/frameworks/kholidays")
     (synopsis "Library for regional holiday information")
@@ -812,7 +812,7 @@ other special events for a geographical region.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtscript" ,qtscript)))
     (arguments
@@ -854,7 +854,7 @@ translation scripting.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("libxscrnsaver" ,libxscrnsaver) ; X-Screensaver based poller, fallback mode
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Reporting of idle time of user and system")
@@ -889,7 +889,7 @@ or user activity.")
        ;; TODO: Find a way to activate this optional include without
        ;; introducing a recursive dependency.
        ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg)
@@ -919,7 +919,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item models extending the Qt model-view framework")
@@ -971,7 +971,7 @@ model to observers
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item views extending the Qt model-view framework")
     (description "KItemViews includes a set of views, which can be used with
@@ -997,7 +997,7 @@ to flat and hierarchical lists.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Data plotting library")
     (description "KPlotWidget is a QWidget-derived class that provides a virtual
@@ -1028,7 +1028,7 @@ pixel units.")
        ;; Optional, for compile-time validation of syntax definition files:
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1074,7 +1074,7 @@ integration with a custom editor as well as a ready-to-use
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtwayland" ,qtwayland)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)))
@@ -1116,7 +1116,7 @@ represented by a QPoint or a QSize.")
        ("qttools" ,qttools)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1157,7 +1157,7 @@ configuration pages, message boxes, and password requests.")
        ("xorg-server" ,xorg-server-for-tests))) ; for the tests
     (inputs
      `(("libxrender" ,libxrender)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("xcb-utils-keysyms" ,xcb-util-keysyms)
        ("xcb-util-wm" ,xcb-util-wm)))
@@ -1219,7 +1219,7 @@ lower level classes for interaction with the X Windowing System.")
      ;; Headers contain #include <ModemManager/ModemManager.h>
      `(("modem-manager" ,modem-manager)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1258,7 +1258,7 @@ messages.")
      ;;                 #include <libnm/NetworkManager.h>
      `(("network-manager" ,network-manager)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1292,7 +1292,7 @@ which are used in DBus communication.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("fdupes" ,fdupes)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Oxygen provides the standard icon theme for the KDE desktop")
     (description "Oxygen icon theme for the KDE desktop")
@@ -1317,7 +1317,7 @@ which are used in DBus communication.")
     (inputs
      `(("libdmtx" ,libdmtx)
        ("qrencode" ,qrencode)
-       ("qtbase" ,qtbase))) ;; TODO: rethink: nix propagates this
+       ("qtbase" ,qtbase-5))) ;; TODO: rethink: nix propagates this
     (home-page "https://api.kde.org/frameworks/prison/html/index.html")
     (synopsis "Barcode generation abstraction layer")
     (description "Prison is a Qt-based barcode abstraction layer/library and
@@ -1343,7 +1343,7 @@ provides uniform access to generation of barcodes with data.")
      `(("glib" ,glib)
        ("pulseaudio" ,pulseaudio)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/libraries/pulseaudio-qt/")
     (synopsis "Qt bindings for PulseAudio")
     (description
@@ -1378,7 +1378,7 @@ libpulse.")
        ("kcoreaddons" ,kcoreaddons)
        ("kiconthemes" ,kiconthemes) ; optional
        ("kirigami" ,kirigami)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)))
     (home-page "https://community.kde.org/Frameworks")
@@ -1417,7 +1417,7 @@ feel.")
        ("flex" ,flex)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("udev" ,eudev)))
     ;; TODO: Add runtime-only dependency MediaPlayerInfo
@@ -1449,7 +1449,7 @@ system.")
     (inputs
      `(("hunspell" ,hunspell)
        ;; TODO: hspell (for Hebrew), Voikko (for Finish)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Multi-language spell checker")
     (description "Sonnet is a plugin-based spell checking library for Qt-based
@@ -1474,7 +1474,7 @@ ASpell and HUNSPELL.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Helper for multithreaded programming")
     (description "ThreadWeaver is a helper for multithreaded programming.  It
@@ -1519,7 +1519,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)))
     (home-page "https://community.kde.org/Frameworks")
@@ -1553,7 +1553,7 @@ with other frameworks.")
     (inputs
      `(("kcoreaddons" ,kcoreaddons)
        ("polkit-qt" ,polkit-qt)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1599,7 +1599,7 @@ utilities.")
     (inputs
      `(("kconfig" ,kconfig)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Powerful autocompletion framework and widgets")
     (description "This framework helps implement autocompletion in Qt-based
@@ -1625,7 +1625,7 @@ integrated it into your application's other widgets.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("xorg-server" ,xorg-server))) ; for the tests
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (propagated-inputs
      `(;; As required by KF5ContactsConfig.cmake.
        ("kcodecs" ,kcodecs)
@@ -1672,7 +1672,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
     (inputs
      `(("kcoreaddons" ,kcoreaddons)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Graceful handling of application crashes")
@@ -1705,7 +1705,7 @@ application crashes.")
        ("libxslt" ,libxslt)
        ("perl" ,perl)
        ("perl-uri" ,perl-uri)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1775,7 +1775,7 @@ from DocBook files.")
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ;; Required run-time packages
        ("catdoc" ,catdoc)
        ;; Optional run-time packages
@@ -1811,7 +1811,7 @@ by applications to write metadata.")
     (inputs
      `(("karchive" ,karchive) ; for Krita and OpenRaster images
        ("openexr" ,openexr) ; for OpenEXR high dynamic-range images
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1865,7 +1865,7 @@ formats.")
     (inputs
      `(("kcoreaddons" ,kcoreaddons)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Widgets for showing progress of asynchronous jobs")
@@ -1897,7 +1897,7 @@ asynchronous jobs.")
        ("kcoreaddons" ,kcoreaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtspeech" ,qtspeech)
        ;; TODO: Think about adding dbusmenu-qt5 from
        ;; https://launchpad.net/libdbusmenu-qt
@@ -1945,7 +1945,7 @@ covers feedback and persistent events.")
        ("kcoreaddons" ,kcoreaddons)
        ("kdoctools" ,kdoctools)
        ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2001,7 +2001,7 @@ were traditional plugins.")
      `(("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ;; TODO: utempter, for managing UTMP entries
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f ; FIXME: 1/1 tests fail.
        #:phases
@@ -2046,7 +2046,7 @@ and communicating with them using a pty.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Converting physical units")
     (description "KUnitConversion provides functions to convert values in
@@ -2073,7 +2073,7 @@ gallons).")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("kcodecs" ,kcodecs)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "RSS/Atom parser library")
     (description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and
@@ -2123,7 +2123,7 @@ between feed formats.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("lmdb" ,lmdb)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)))
     (arguments
@@ -2182,7 +2182,7 @@ maintaining an index of the contents of your files.")
      `(("boost" ,boost)
        ("kactivities" ,kactivities)
        ("kconfig" ,kconfig)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Access usage statistics collected by the activity manager")
@@ -2219,7 +2219,7 @@ by which applications, and what documents have been linked to which activity.")
        ("kcoreaddons" ,kcoreaddons)
        ("kiconthemes" ,kiconthemes)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2281,7 +2281,7 @@ using the XBEL format.")
        ("kpackage" ,kpackage)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Utilities for KDE System Settings modules")
@@ -2316,7 +2316,7 @@ KCModules can be created with the KConfigWidgets framework.")
        ("kguiaddons" ,kguiaddons)
        ("ki18n" ,ki18n)
        ;; todo: PythonModuleGeneration
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qttools" ,qttools)))
     (arguments
      `(#:phases
@@ -2376,7 +2376,7 @@ their settings.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("libepoxy" ,libepoxy)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)))
     (arguments
@@ -2423,7 +2423,7 @@ that offer bindings to some of the Frameworks.")
        ("kdoctools" ,kdoctools)
        ("kinit" ,kinit)
        ("kservice" ,kservice)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Central daemon of KDE work spaces")
     (description "KDED stands for KDE Daemon.  KDED runs in the background and
@@ -2453,7 +2453,7 @@ started on demand.")
      `(("kconfig" ,kconfig)
        ("kcoreaddons" ,kcoreaddons)
        ("kdoctools" ,kdoctools)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ;; optional:
        ("kcompletion" ,kcompletion)
        ("kconfigwidgets" ,kconfigwidgets)
@@ -2498,7 +2498,7 @@ ini-style description files.")
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("kservice" ,kservice)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "User interface for running shell commands with root privileges")
     (description "KDESU provides functionality for building GUI front ends for
@@ -2531,7 +2531,7 @@ with su and ssh respectively.")
        ("kparts" ,kparts)
        ("kservice" ,kservice)
        ("kwallet" ,kwallet)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtwebkit" ,qtwebkit)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Integration for QtWebKit")
@@ -2561,7 +2561,7 @@ engine WebKit via QtWebKit.")
      `(("karchive" ,karchive)
        ("kconfig" ,kconfig)
        ("kcoreaddons" ,kcoreaddons)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2605,7 +2605,7 @@ emoticons coming from different providers.")
        ("kservice" ,kservice)
        ("kwindowsystem" ,kwindowsystem)
        ("libxcb" ,libxcb)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("xcb-util-keysyms" ,xcb-util-keysyms)))
     (home-page "https://community.kde.org/Frameworks")
@@ -2643,7 +2643,7 @@ window does not need focus for them to be activated.")
        ("ki18n" ,ki18n)
        ("kitemviews" ,kitemviews)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (arguments
      `(#:phases
@@ -2721,7 +2721,7 @@ in applications using the KDE Frameworks.")
        ("kxmlgui" ,kxmlgui)
        ("libcap" ,libcap) ; to install start_kdeinit with CAP_SYS_RESOURCE
        ("plasma-framework" ,plasma-framework)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Library to speed up start of applications on KDE workspaces")
@@ -2781,7 +2781,7 @@ consumption.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
        ("qtx11extras" ,qtx11extras)
        ("sonnet" ,sonnet)))
@@ -2863,7 +2863,7 @@ KIO enabled infrastructure.")
        ("kjobwidgets" ,kjobwidgets)
        ("ktextwidgets" ,ktextwidgets)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
@@ -2916,7 +2916,7 @@ specification.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Configuration dialog for desktop notifications")
@@ -2970,7 +2970,7 @@ notifications which can be embedded in your application.")
        ("kjobwidgets" ,kjobwidgets)
        ("kservice" ,kservice)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
     (home-page "https://community.kde.org/Frameworks")
@@ -3002,7 +3002,7 @@ widgets with a user-interface defined in terms of actions.")
        ("ki18n" ,ki18n)
        ("kservice" ,kservice)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (arguments
      `(#:tests? #f)) ; FIXME: 1/3 tests fail.
@@ -3053,7 +3053,7 @@ to easily extend the contacts collection.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)
        ("threadweaver" ,threadweaver)))
@@ -3117,7 +3117,7 @@ typed.")
        ("kdbusaddons" ,kdbusaddons)
        ("kdoctools" ,kdoctools)
        ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f ; FIXME: 6/10 tests fail.
        #:phases
@@ -3192,7 +3192,7 @@ types or handled by application specific code.")
        ("kxmlgui" ,kxmlgui)
        ("libgit2" ,libgit2)
        ("perl" ,perl)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtscript" ,qtscript)
        ("qtxmlpatterns" ,qtxmlpatterns)
@@ -3262,7 +3262,7 @@ library.")
        ("kservice" ,kservice)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtspeech" ,qtspeech)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
@@ -3305,7 +3305,7 @@ It supports rich text as well as plain text.")
        ("libgcrypt" ,libgcrypt)
        ("phonon" ,phonon)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Safe desktop-wide storage for passwords")
     (description "This framework contains an interface to KWallet, a safe
@@ -3345,7 +3345,7 @@ the passwords on KDE work spaces.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:tests? #f ; FIXME: 1/5 tests fail.
@@ -3398,7 +3398,7 @@ descriptions for integrating actions from plugins.")
        ("kservice" ,kservice)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "XML-RPC client")
@@ -3457,7 +3457,7 @@ setUrl, setUserAgent and call.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg)
@@ -3504,7 +3504,7 @@ script engines.")
        ("ki18n" ,ki18n)
        ("kio" ,kio)
        ("kirigami" ,kirigami)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (arguments
      `(#:tests? #f  ;; seem to require network; don't find QTQuick components
@@ -3582,7 +3582,7 @@ need.")
        ("knotificantions" ,knotifications)
        ("kpackage" ,kpackage)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (arguments
      `(#:phases
@@ -3656,7 +3656,7 @@ workspace.")
        ("ktextwidgets" ,ktextwidgets)
        ("kunitconversion" ,kunitconversion)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (inputs
      `(("kcompletion" ,kcompletion)
        ("kconfig" ,kconfig)
@@ -3764,7 +3764,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
        ("libpng" ,libpng)
        ("openssl" ,openssl)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("sonnet" ,sonnet)))
     (home-page "https://community.kde.org/Frameworks")
@@ -3798,7 +3798,7 @@ technology and using KJS for JavaScript support.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("pcre" ,pcre)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 support for Javascript scripting in Qt
 applications")
@@ -3831,7 +3831,7 @@ support.")
     (inputs
      `(("ki18n" ,ki18n)
        ("kjs" ,kjs)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt")
@@ -3866,7 +3866,7 @@ QObjects, so you can script your applications.")
        ("kparts" ,kparts)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 plugin interface for media player features")
     (description "KMediaPlayer builds on the KParts framework to provide a
@@ -3903,7 +3903,7 @@ KParts instead.")
        ("kparts" ,kparts)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 solution for application scripting")
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 617937002e..223e1aab7a 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -90,7 +90,7 @@
        ("purpose" ,purpose)
        ("qca" ,qca)
        ("qoauth" ,qoauth)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtnetworkauth" ,qtnetworkauth)
        ("qtwebkit" ,qtwebkit)
        ("sonnet" ,sonnet)))
@@ -162,7 +162,7 @@ Other notable features include:
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("qca" ,qca)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ))
     (home-page "http://www.kde.org/")
     (synopsis "Versatile and user-friendly download manager")
@@ -213,7 +213,7 @@ This package is part of the KDE networking module.")
        ("kwindowsystem" ,kwindowsystem)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qca" ,qca)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
@@ -302,7 +302,7 @@ Features are:
        ("phonon" ,phonon)
        ("qca" ,qca)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("speex" ,speex)
        ("v4l-utils" ,v4l-utils)
        ;; TODO: Xmms
@@ -358,7 +358,7 @@ This package is part of the KDE networking module.")
        ("libssh2" ,libssh)
        ;; TODO: libvnc{server,client} - is not tigervnc-{server,client}
        ("oxygen-icons" ,oxygen-icons) ; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/internet/org.kde.krdc")
     (synopsis "Remote desktop client")
     (description "KRDC is a client application that allows you to view or even
@@ -412,7 +412,7 @@ This package is part of the KDE networking module.")
        ;; TODO: LibKWorkspace -> plasma-workspace?
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
        ("qtwebkit" ,qtwebkit)
        ("solid" ,solid)
@@ -447,7 +447,7 @@ a full-featured client for BitTorrent.")
        ("kpimcommon" ,kpimcommon)
        ("ktextwidgets" ,ktextwidgets)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?)
     (home-page "https://invent.kde.org/pim/libgravatar")
@@ -482,7 +482,7 @@ unnecessary network operations.")
        ("kio" ,kio)
        ("libgcrypt" ,libgcrypt)
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://invent.kde.org/network/libktorrent")
     (synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks")
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 35058363d3..21ca996246 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -71,7 +71,7 @@
        ("libkcompactdisc" ,libkcompactdisc)
        ("libvorbis" ,libvorbis)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/multimedia/org.kde.kio_audiocd")
     (synopsis "Transparent audio CD integration for applications using the KDE
 Platform")
@@ -117,7 +117,7 @@ This package is part of the KDE multimedia module.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
        ("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://kde.org/applications/multimedia/org.kde.dragonplayer")
     (synopsis "Simple video player")
@@ -169,7 +169,7 @@ This package is part of the KDE multimedia module.")
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency
        ("qtmultimedia" ,qtmultimedia)
@@ -226,7 +226,7 @@ its own database.  You can build and play your own playlist.")
        ("kconfig" ,kconfig)
        ("ki18n" ,ki18n)
        ("kio" ,kio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/multimedia/org.kde.ffmpegthumbs")
     (synopsis "Video thumbnail generator for KDE using ffmpeg")
     (description "
@@ -272,7 +272,7 @@ This package is part of the KDE multimedia module.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
        ("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("taglib" ,taglib)))
     (home-page "https://kde.org/applications/multimedia/org.kde.juk")
@@ -368,7 +368,7 @@ This package is part of the KDE multimedia module.")
        ("libsndfile" ,libsndfile)
        ("libvorbis" ,libvorbis)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtwebkit" ,qtwebkit)
        ("shared-mime-info" ,shared-mime-info)
        ("solid" ,solid)
@@ -414,7 +414,7 @@ available CD drives.")
        ("kxmlgui" ,kxmlgui)
        ("libxscrnsaver" ,libxscrnsaver)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
        ("v4l-utils" ,v4l-utils) ; libdvbv5
@@ -468,7 +468,7 @@ autoloading of subtitle files for use while playing video.")
        ("kparts" ,kparts)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("purpose" ,purpose)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
@@ -523,7 +523,7 @@ camera.  Use it to take pictures and make videos to share.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("plasma-framework" ,plasma-framework)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://kde.org/applications/multimedia/org.kde.kmix")
     (synopsis "Volume control and mixer")
@@ -566,7 +566,7 @@ This package is part of the KDE multimedia module.")
        ("libxcb" ,libxcb) ;; FIXME: why does cmake not find XEVIE and XPRINT?
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("cairo" ,cairo)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
@@ -642,7 +642,7 @@ Some features:
        ("opus" ,opus)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("zlib" ,zlib)))
     (home-page "https://kde.org/applications/multimedia/org.kde.kwave")
@@ -699,7 +699,7 @@ Its features include:
        ("kio" ,kio)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("libmusicbrainz" ,libmusicbrainz)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f)) ; Most tests require network
     (home-page "https://invent.kde.org/multimedia/libkcddb")
@@ -727,7 +727,7 @@ Its features include:
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (home-page "https://invent.kde.org/multimedia/libkcompactdisc")
     (synopsis "KDE library for playing & ripping CDs")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 74e8bdb8fd..db73941b42 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -79,7 +79,7 @@
        ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries
        ;; and wrapped files will refer to them, even if the user choices none
        ;; of these.  Executables are searched on $PATH then.
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sqlite" ,sqlite)))
     (arguments
      `(#:tests? #f ;; TODO 135/167 tests fail
@@ -151,7 +151,7 @@ programs.")
        ("ksmtp" ,ksmtp)
        ("ktextwidgets" ,ktextwidgets)
        ("kwallet" ,kwallet)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f))  ;; TODO: 1/1 test fails
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
@@ -196,7 +196,7 @@ collection and item views.")
        ("kxmlgui" ,kxmlgui)
        ("prison" ,prison)
        ("kio" ,kio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
@@ -240,7 +240,7 @@ to list and filter contacts.")
        ("kmime" ,kmime)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
     (arguments
      `(#:phases
@@ -283,7 +283,7 @@ with emails through Akonadi easier.")
        ("kcodecs" ,kcodecs)
        ("ki18n" ,ki18n)
        ("kmime" ,kmime)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
     (synopsis "Akonadi notes access library")
     (description "Akonadi Notes is a library that effectively bridges the
@@ -325,7 +325,7 @@ wrapping notes into KMime::Message objects.")
        ("kmime" ,kmime)
        ("krunner" ,krunner)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("xapian" ,xapian)))
     (arguments
      `(#:phases (modify-phases %standard-phases
@@ -390,7 +390,7 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwallat" ,kwallet)
        ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/incidenceeditor")
     (synopsis "KDE PIM library for editing incidences")
     (description "This library provides an incidence editor for KDE PIM.")
@@ -445,7 +445,7 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
        ("prison" ,prison)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kontact.kde.org/components/kaddressbook.html")
     (synopsis "Address Book application to manage your contacts")
     (description "KAddressBook stores all the personal details of your family,
@@ -486,7 +486,7 @@ CalDAV server.")
        ("kpimtextedit" ,kpimtextedit)
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f)) ;; TODO: TZ setup
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -515,7 +515,7 @@ calendar data.")
        ("ki18n" ,ki18n)
        ("kio" ,kio)
        ("kxmlrpcclient" ,kxmlrpcclient)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("syndication" ,syndication)))
     ;; Note: Some tests take up to 90 sec.
     (home-page "https://invent.kde.org/pim/kblog")
@@ -567,7 +567,7 @@ one of the APIs mentioned above.")
        ("kpimtextedit" ,kpimtextedit)
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/stable/calendarsupport/")
     (synopsis "Calendar Support library for KDE PIM")
     (description "The Calendar Support library provides helper utilities for
@@ -604,7 +604,7 @@ calendaring applications.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f)) ;; TODO: seem to pull in some wrong theme
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -632,7 +632,7 @@ functions for accessing calendar data using the kcalcore API.")
      `(("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("kio" ,kio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (home-page "https://invent.kde.org/frameworks/kdav")
     (synopsis "DAV protocol implementation with KJobs")
@@ -678,7 +678,7 @@ supported using GroupDAV or CardDAV.")
        ("libkleo" ,libkleo)
        ("prison" ,prison)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/kdepim-apps-libs")
     (synopsis "KDE PIM mail related libraries and data files")
     (description "This package provides mail related libraries and data files
@@ -739,7 +739,7 @@ for KDE PIM.")
        ("libkgapi" ,libkgapi)
        ;; TODO: libkolab
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtnetworkauth" ,qtnetworkauth)
        ("qtspeech" ,qtspeech)
@@ -815,7 +815,7 @@ package.")
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
        ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/eventviews")
     (synopsis "KDE PIM library for creating events")
     (description "This library provides an event creator for KDE PIM.")
@@ -861,7 +861,7 @@ package.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.kgpg")
     (synopsis "Graphical front end for GNU Privacy Guard")
     (description "Kgpg manages cryptographic keys for the GNU Privacy Guard,
@@ -895,7 +895,7 @@ cryptography to the contents of the clipboard.")
        ("kpimtextedit" ,kpimtextedit)
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -929,7 +929,7 @@ cryptography to the contents of the clipboard.")
        ("ki18n" ,ki18n)
        ("kio" ,kio)
        ("kmime" ,kmime)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Library for handling IMAP")
     (description "This library provides a job-based API for interacting with
@@ -959,7 +959,7 @@ easier to do so.")
      `(("ki18n" ,ki18n)
        ("kio" ,kio)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (propagated-inputs
      `(("cyrus-sasl" ,cyrus-sasl)
        ("openldap" ,openldap)))
@@ -1010,7 +1010,7 @@ protocol for querying and modifying directory services running over TCP/IP. ")
        ("libkleo" ,libkleo)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1096,7 +1096,7 @@ and retrieving certificates from LDAP servers.")
        ("libksieve" ,libksieve)
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
@@ -1177,7 +1177,7 @@ manager from KDE.")
        ("libxslt" ,libxslt)
        ("phonon" ,phonon)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f))  ;; TODO: 4/56 tests fail, even with "offscreen" and dbus
     (home-page "https://invent.kde.org/pim/mailcommon")
@@ -1218,7 +1218,7 @@ dealing with email.")
        ("kmime" ,kmime)
        ("kxmlgui" ,kxmlgui)
        ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/mailimporter")
     (synopsis "KDE mail importer library")
     (description "This package provides libraries for importing mails other
@@ -1259,7 +1259,7 @@ e-mail client programs into KMail and KDE PIM.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwallet" ,kwallet)
        ("libkgapi" ,libkgapi)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -1285,7 +1285,7 @@ mail transport.")
     (inputs
      `(("kcodecs" ,kcodecs)
        ("kmime" ,kmime)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Library for handling mbox mailboxes")
     (description "This is a library for handling mailboxes in mbox format,
@@ -1355,7 +1355,7 @@ using a Qt/KMime C++ API.")
        ("libkleo" ,libkleo)
        ("qca" ,qca)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
@@ -1398,7 +1398,7 @@ kwebengineviewer.")
     (inputs
      `(("kcodecs" ,kcodecs)
        ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1475,7 +1475,7 @@ information in non-ASCII character sets.")
        ("kxmlgui" ,kxmlgui)
        ("libkdepim" ,libkdepim)
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://kontact.kde.org/components/knotes.html")
     (synopsis "Note-taking utility")
@@ -1513,7 +1513,7 @@ Features:
        ("kparts" ,kparts)
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Kontact interface library")
     (description " This library provides the glue necessary for
@@ -1584,7 +1584,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
        ("libkdepim" ,libkdepim)
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1639,7 +1639,7 @@ and exchanging calendar data, vCalendar and iCalendar.")
     (inputs
      `(("kcontacts" ,kcontacts)
        ("kpeople" ,kpeople)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/kpeoplevcard")
     (synopsis "Expose vCard contacts to KPeople")
     (description
@@ -1697,7 +1697,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
        ("libkdepim" ,libkdepim)
        ("libxslt" ,libxslt)
        ("purpose" ,purpose)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtwebengine" ,qtwebengine)))
     (arguments
      `(#:tests? #f)) ;; TODO tests hang
@@ -1736,7 +1736,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtspeech" ,qtspeech)
        ("sonnet" ,sonnet)))
     (arguments
@@ -1770,7 +1770,7 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.")
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("kio" ,kio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f ;; TODO: does not find sasl mechs
        #:phases
@@ -1811,7 +1811,7 @@ standard protocols for e-mail transmission.")
        ("kcontacts" ,kcontacts)
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/ktnef/html/")
     (synopsis "Library for handling mail attachments using TNEF format")
     (description "Ktnef is a library for handling data in the TNEF
@@ -1862,7 +1862,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
        ("kmime" ,kmime)
        ("kwallet" ,kwallet)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/libkdepim")
     (synopsis "Libraries for common KDE PIM apps")
     (description "This package provided libraries for common KDE PIM apps.")
@@ -1892,7 +1892,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
        ("kio" ,kio)
        ("kwallet" ,kwallet)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
@@ -1935,7 +1935,7 @@ various Google services.")
        ("kwindowsystem" ,kwindowsystem)
        ("kpimtextedit" ,kpimtextedit)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/libkleo")
     (synopsis "KDE PIM cryptographic library")
     (description "@code{libkleo} is a library for Kleopatra and other parts of
@@ -1978,7 +1978,7 @@ KDE using certificate-based crypto.")
        ("kwallet" ,kwallet)
        ("kwindowsystem" ,kwindowsystem)
        ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index c64d8ae39f..b7a2b14f65 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -74,7 +74,7 @@
        ("kpackage" ,kpackage)
        ("kwayland" ,kwayland) ; optional
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative) ; optional
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://invent.kde.org/plasma/breeze")
@@ -99,7 +99,7 @@ the Plasma Desktop.  Breeze is the default theme for the KDE Plasma desktop.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/plasma/kdecoration")
     (synopsis "Plugin based library to create window decorations")
     (description "KDecoration is a library to create window decorations.
@@ -127,7 +127,7 @@ manager which re-parents a Client window to a window decoration frame.")
        ("ki18n" ,ki18n)
        ("kwallet" ,kwallet)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/plasma/ksshaskpass")
     (synopsis "Front-end for ssh-add using kwallet")
     (description "Ksshaskpass is a front-end for @code{ssh-add} which stores the
@@ -190,7 +190,7 @@ call it if it is not associated to a terminal.")
        ("libxi" ,libxi)           ;XInput, required for grabbing XInput2 devices
        ("linux-pam" ,linux-pam)
        ("logind" ,elogind)        ;optional loginctl support
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
@@ -221,7 +221,7 @@ call it if it is not associated to a terminal.")
     (inputs
      `(("kwayland" ,kwayland)
        ("libxrandr" ,libxrandr)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (arguments
      '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
@@ -261,7 +261,7 @@ basic needs and easy to configure for those who want special setups.")
        ("knewstuff" ,knewstuff)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kservice" ,kservice)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtscript" ,qtscript)
        ("qtwebkit" ,qtwebkit)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index b9c3865a93..86f169e819 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -75,7 +75,7 @@
        ("kwindowsystem" ,kwindowsystem)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("phonon" ,phonon)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)))
     (arguments
      `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen
@@ -116,7 +116,7 @@ The main features of Dolphin are:
        ("ktexteditor" ,ktexteditor)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "http://www.kde.org/")
     (synopsis "VCS-Plugins for Dolphin")
     (description "This package contains plugins that offer integration in
@@ -156,7 +156,7 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.")
        ("kwindowsystem" ,kwindowsystem)
        ("libxml2" ,libxml2)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("xapian" ,xapian)))
     (arguments
      `(#:tests? #f)) ;; 1/1 test fails
@@ -213,7 +213,7 @@ document meta data file.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)))
     (arguments
      `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus
@@ -262,7 +262,7 @@ This package is part of the KDE base applications module.")
        ("libxtst" ,libxtst)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("pipewire" ,pipewire)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("xcb-util-image" ,xcb-util-image)
        ("zlib" ,zlib)))
@@ -309,7 +309,7 @@ This package is part of the KDE networking module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/system/org.kde.ksystemlog")
     (synopsis "System log viewer")
     (description "This program is developed for being used by beginner users,
@@ -353,7 +353,7 @@ This package is part of the KDE administration module.")
        ("kwayland" ,kwayland)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://www.kde.org/applications/system/yakuake/")
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index e67c603e74..40267c6e91 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -68,7 +68,7 @@
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)))
     (arguments
      `(#:tests? #f ;; 2/7 tests fail
@@ -121,7 +121,7 @@ Kate's features include:
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ;; TODO: QAccessibilityClient - libqaccessibilityclien
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.kmag")
     (synopsis "Screen magnifier tool")
     (description "You can use KMagnifier to magnify a part of the screen just
@@ -160,7 +160,7 @@ artists to web-designers to people with low vision.")
        ("libxt" ,libxt)
        ("phonon" ,phonon)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.kmousetool")
     (synopsis "Automatic mouse click and mouse manipulation tool for the
 disabled")
@@ -196,7 +196,7 @@ whom pressing buttons hurts.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtspeech" ,qtspeech)))
     (home-page "https://kde.org/applications/utilities/org.kde.kmouth")
     (synopsis "Type-and-say frontend for speech synthesizers")
@@ -235,7 +235,7 @@ sentences to be re-spoken.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.kronometer")
     (synopsis "Simple stopwatch application")
     (description "Kronometer is a stopwatch application.  It features the
@@ -279,7 +279,7 @@ to save the times and resume them later.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("solid" ,solid)
        ("zlib" ,zlib)))
     (home-page "https://www.krusader.org")
@@ -318,7 +318,7 @@ great on your desktop.")
     (inputs
      `(("ktexteditor" ,ktexteditor)
        ("imagemagick" ,imagemagick)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch")
     (synopsis "Create and print cross stitch patterns")
@@ -363,7 +363,7 @@ either be created or generated from a image.")
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)))
     (arguments
      `(#:phases
@@ -421,7 +421,7 @@ redone.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.rsibreak")
     (synopsis "Assists in the Recovery and Prevention of Repetitive Strain
 Injury")
@@ -468,7 +468,7 @@ remind you to take a break now and then.")
        ("libsmbclient" ,samba)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("plasma-framework" ,plasma-framework)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("solid" ,solid)))
     (home-page "https://kde.org/applications/utilities/org.kde.smb4k")
@@ -530,7 +530,7 @@ Features:
        ("ktextwidgets" ,ktextwidgets)
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.sweeper")
     (synopsis "Temporary file and history cleaner")
     (description "
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 2af02615c0..a8cd156cf5 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -103,7 +103,7 @@
        ("kconfig" ,kconfig)
        ("ki18n" ,ki18n)
        ("kio" ,kio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -140,7 +140,7 @@ This package contains GUI widgets for baloo.")
        ("ki18n" ,ki18n)
        ("kiconthemes" ,kiconthemes)
        ("knewstuff" ,knewstuff)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/pim/grantleetheme")
     (synopsis "Library providing Grantlee theme support")
     (description "This library provides Grantlee theme support.")
@@ -202,7 +202,7 @@ This package contains GUI widgets for baloo.")
        ("libkdepim" ,libkdepim)
        ("libkleo" ,libkleo)
        ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
@@ -243,7 +243,7 @@ browser for easy news reading.")
          ("ffmpeg" ,ffmpeg)
          ("rttr" ,rttr)
          ("mlt" ,mlt)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtscript" ,qtscript)
          ("qtsvg" ,qtsvg)
          ("qtmultimedia" ,qtmultimedia)
@@ -350,7 +350,7 @@ projects.")
        ("kxmlgui" ,kxmlgui)
        ("libkomparediff2" ,libkomparediff2)
        ("oxygen-icons" ,oxygen-icons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols" ,qtquickcontrols)  ;; not checked as requirement
        ("qtquickcontrols2" ,qtquickcontrols2)  ;; not checked as requirement
@@ -416,7 +416,7 @@ software (Git, Subversion, Mercurial, CVS and Bazaar).")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (build-system cmake-build-system)
     (home-page "https://kde.org")
     (synopsis "Parser generator library for KDevplatform")
@@ -445,7 +445,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (home-page "https://invent.kde.org/graphics/kdiagram")
     (synopsis "Libraries for creating business diagrams")
@@ -532,7 +532,7 @@ illustrate project schedules.")
        ("openexr" ,openexr)
        ("perl" ,perl)
        ("poppler-qt5" ,poppler-qt5)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)
@@ -572,7 +572,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
        ("kgraphviewer" ,kgraphviewer)
        ("kio" ,kio)
        ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (home-page "https://apps.kde.org/en/massif-visualizer")
@@ -605,7 +605,7 @@ compressed massif files can also be opened transparently.")
        ("ki18n" ,ki18n)
        ("kio" ,kio)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (build-system cmake-build-system)
     (home-page "https://kde.org")
     (synopsis "Library to compare files and strings, used in Kompare and KDevelop")
@@ -632,7 +632,7 @@ used in KDE development tools Kompare and KDevelop.")
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("openssl" ,openssl)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://userbase.kde.org/QCA")
     (synopsis "Libraries for the Qt Cryptographic Architecture")
     (description "The Qt Cryptographic Architecture (QCA) provides a
@@ -663,7 +663,7 @@ cards.")
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
        ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qca" ,qca)
        ("util-linux" ,util-linux "lib")))
     (home-page "https://community.kde.org/Frameworks")
@@ -687,7 +687,7 @@ cards.")
     (arguments
      `(#:tests? #f)) ; both tests fail, require display
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("qttools" ,qttools)))
@@ -748,7 +748,7 @@ different notification systems.")
        ("libfakekey" ,libfakekey)
        ("pulseaudio-qt" ,pulseaudio-qt)
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
@@ -832,7 +832,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
        ("kuserfeedback" ,kuserfeedback)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("shared-mime-info" ,shared-mime-info)
        ;; Optional.
@@ -868,7 +868,7 @@ to perform data analysis.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://phabricator.kde.org/source/kqtquickcharts/")
     (synopsis "Interactive charts for Qt Quick")
@@ -902,7 +902,7 @@ charts.")
        ("knotifications" ,knotifications)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/system/kdk")
     (synopsis "View Disk Usage")
     (description "KDiskFree displays the available file devices (hard drive
@@ -930,7 +930,7 @@ unmount drives and view them in a file manager.")
        ("qttools" ,qttools)
        ("kdoctools" ,kdoctools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("karchive" ,karchive)
        ("ki18n" ,ki18n)
        ("kio" ,kio)
@@ -991,7 +991,7 @@ Python, PHP, and Perl.")
        ("kxmlgui" ,kxmlgui)
        ("libsndfile" ,libsndfile)
        ("openal" ,openal)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
     (home-page "https://games.kde.org/")
@@ -1035,7 +1035,7 @@ Python, PHP, and Perl.")
        ("kbookmarks" ,kbookmarks)
        ("kcompletion" ,kcompletion)
        ("kconfig" ,kconfig)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("libjpeg-turbo" ,libjpeg-turbo)
        ("libtiff" ,libtiff)
        ("kirigami" ,kirigami)
@@ -1084,7 +1084,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.")
        ("kdoctools" ,kdoctools)))
     (inputs
      `(("gettext" ,gettext-minimal)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/development")
     (synopsis "Tools for translating DocBook XML files with Gettext")
     (description "This is a collection of tools that facilitate translating
@@ -1109,7 +1109,7 @@ PO template files.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("kio" ,kio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://apps.kde.org/en/kdegraphics_mobipocket")
     (synopsis "KDE thumbnailer for Mobipocket files")
     (description "This package provides a KDE plugin that shows thumbnails of
@@ -1132,7 +1132,7 @@ Mobipocket e-books in Dolphin and other KDE apps.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("exiv2" ,exiv2)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/graphics/libkexiv2")
     (synopsis "Manipulate the metadata of images")
     (description "Libkexiv2 wraps the Exiv2 library, allowing to manipulate
@@ -1158,7 +1158,7 @@ picture metadata as EXIF/IPTC and XMP.")
        ("kdnssd" ,kdnssd)
        ("ki18n" ,ki18n)
        ("kio" ,kio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://kde.org/applications/internet/org.kde.zeroconf_ioslave")
     (synopsis "DNS-SD Service Discovery Monitor")
     (description "Adds an entry to Dolphin's Network page to show local
@@ -1193,7 +1193,7 @@ or Bonjour by other projects).")
        ;;("phpunit" ,phpunit)
        ))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative)
        ("qtsvg" ,qtsvg)))
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 55a1b72d74..199a0368a9 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -184,7 +184,7 @@
        ("hangul" ,libhangul)
        ("m17n-db" ,m17n-db)
        ("m17n-lib" ,m17n-lib)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("rime" ,librime)
        ("rsvg" ,librsvg)
        ("wayland" ,wayland)
@@ -255,7 +255,7 @@ focuses especially on Korean input (Hangul, Hanja, ...).")
        ("appindicator" ,libappindicator)
        ("chewing" ,libchewing)
        ("gtk+" ,gtk+)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("xtst" ,libxtst)))
     (synopsis "HIME Input Method Editor")
     (description "Hime is an extremely easy-to-use input method framework.  It
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm
index 2294d693c5..5b72c0e0be 100644
--- a/gnu/packages/lego.scm
+++ b/gnu/packages/lego.scm
@@ -115,7 +115,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
      `(("qttools" ,qttools)))           ; for lrelease
     (inputs
      `(("mesa" ,mesa)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (arguments
      '(#:tests? #f
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index deda49a4bc..1c60e767b0 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -860,7 +860,7 @@ and video calls or instant messaging capabilities to an application.")
        ("liblinphone" ,liblinphone)
        ("mediastreamer2" ,mediastreamer2)
        ("ortp" ,ortp)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
diff --git a/gnu/packages/logo.scm b/gnu/packages/logo.scm
index 17c3990a94..cf70910656 100644
--- a/gnu/packages/logo.scm
+++ b/gnu/packages/logo.scm
@@ -37,7 +37,7 @@
          "0cpyj1ji6hjy7zzz05672f0j6fr0mwpc1y3sq36hhkv2fkpidw22"))))
     (build-system gnu-build-system)
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 20efba17b7..2318398b91 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -89,7 +89,7 @@
     (native-inputs
      `(("doxygen" ,doxygen)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "https://launchpad.net/libdbusmenu-qt")
     (synopsis "Qt implementation of the DBusMenu spec")
     (description "This library provides a Qt implementation of the DBusMenu
@@ -149,7 +149,7 @@ to statistics about the system on which it's run.")
      `(("pkg-config" ,pkg-config)
        ("glib" ,glib)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (synopsis "LXQt Build tools")
     (description
      "Lxqt-build-tools is providing several tools needed to build LXQt
@@ -184,7 +184,7 @@ itself as well as other components maintained by the LXQt project.")
     (propagated-inputs
      ;; required by Qt5XdgIconLoader.pc
      `(("glib" ,glib)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -255,7 +255,7 @@ components of the LXQt desktop environment.")
     (build-system cmake-build-system)
     (arguments '(#:tests? #f))          ; no tests
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)))
     (home-page "https://lxqt.github.io")
@@ -283,7 +283,7 @@ and memory usage or network traffic.")
      `(("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -376,7 +376,7 @@ the operating system LXQt is running on.")
        ("libqtxdg" ,libqtxdg)
        ("libxcursor" ,libxcursor)
        ("libxi" ,libxi)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
@@ -442,7 +442,7 @@ configuration of both LXQt and the underlying operating system.")
      `(("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -490,7 +490,7 @@ as a whole and are not limited to distinct applications.")
      `(("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -536,7 +536,7 @@ according to the Desktop Notifications Specification.")
      `(("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -587,7 +587,7 @@ of other programs.")
        ("lxqt-globalkeys" ,lxqt-globalkeys)
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
@@ -652,7 +652,7 @@ of other programs.")
        ("libqtxdg" ,libqtxdg)
        ("pcre" ,pcre)
        ("polkit-qt" ,polkit-qt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -700,7 +700,7 @@ LXQt.")
        ("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)))
@@ -748,7 +748,7 @@ when laptop batteries are low on power.")
      `(("libdbusmenu-qt" ,libdbusmenu-qt)
        ("libfm-qt" ,libfm-qt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -789,7 +789,7 @@ Qt with LXQt.")
        ("lxqt-globalkeys" ,lxqt-globalkeys)
        ("muparser" ,muparser)
        ("pcre" ,pcre)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -836,7 +836,7 @@ allows for launching applications or shutting down the system.")
        ("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("xdg-user-dirs" ,xdg-user-dirs)))
@@ -906,7 +906,7 @@ for the LXQt desktop environment.")
      `(("kwindowsystem" ,kwindowsystem)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("sudo" ,sudo)))
@@ -991,7 +991,7 @@ for LXQt.")
        ("libxcb" ,libxcb)
        ("menu-cache" ,menu-cache)
        ("pcre" ,pcre)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1017,7 +1017,7 @@ components to build desktop file managers which belongs to LXDE.")
     (build-system cmake-build-system)
     (inputs
      `(("libfm-qt" ,libfm-qt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1059,7 +1059,7 @@ LXDE.")
     (build-system cmake-build-system)
     (inputs
      `(("libconfig" ,libconfig)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("pkg-config" ,pkg-config)
@@ -1095,7 +1095,7 @@ manager Compton.")
     (inputs
      `(("libexif" ,libexif)
        ("libfm-qt" ,libfm-qt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -1131,7 +1131,7 @@ image viewer.")
        ("openbox" ,openbox)
        ("pango" ,pango)
        ("pcre" ,pcre)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -1161,7 +1161,7 @@ window manager OpenBox.")
      `(("glib" ,glib)
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1192,7 +1192,7 @@ window manager OpenBox.")
        ("libxrender" ,libxrender)
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -1218,7 +1218,7 @@ processes currently in existence, much like code{top} or code{ps}.")
         (base32 "1vn3bbc99py0ak7z9s6p71n9cacpckz57a1p97iwb0p23g4zgjkf"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("utf8proc" ,utf8proc)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -1243,7 +1243,7 @@ processes currently in existence, much like code{top} or code{ps}.")
         (base32 "0r7xmwjpak47ayj7cj37bwrdlv1mx5nhqpccb5pbn2fh8slp8zsm"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("qtermwidget" ,qtermwidget)))
     (native-inputs
@@ -1272,7 +1272,7 @@ QTermWidget.")
     (inputs
      `(("kwindowsystem" ,kwindowsystem)
        ("libqtxdg" ,libqtxdg)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -1303,7 +1303,7 @@ easily publishing them on internet image hosting services.")
       `(("glib" ,glib)
         ("json-glib" ,json-glib)
         ("libfm-qt" ,libfm-qt)
-        ("qtbase" ,qtbase)
+        ("qtbase" ,qtbase-5)
         ("qtx11extras" ,qtx11extras)))
     (native-inputs
       `(("pkg-config" ,pkg-config)
@@ -1337,7 +1337,7 @@ like @command{tar} and @command{zip}.")
       (build-system cmake-build-system)
       (inputs
         `(("kwindowsystem" ,kwindowsystem)
-          ("qtbase" ,qtbase)
+          ("qtbase" ,qtbase-5)
           ("qtsvg" ,qtsvg)
           ("liblxqt" ,liblxqt)
           ("qtx11extras" ,qtx11extras)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8cd64e7697..d48313b1ed 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2052,7 +2052,7 @@ script files.")
     (name "octave")
     (inputs
      `(("qscintilla" ,qscintilla)
-       ("qt" ,qtbase)
+       ("qt" ,qtbase-5)
        ,@(package-inputs octave-cli)))
     (native-inputs
      `(("qttools" , qttools) ;for lrelease
@@ -2325,7 +2325,7 @@ ASCII text files using Gmsh's own scripting language.")
        ("python-dbus" ,python-dbus)
        ("python-h5py" ,python-h5py) ;optional, for HDF5 data
        ("python-pyqt" ,python-pyqt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (propagated-inputs
      `(("python-numpy" ,python-numpy)))
@@ -4547,7 +4547,7 @@ evaluates expressions using the standard order of operations.")
                 "0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94"))))
     (build-system gnu-build-system)
     (native-inputs `(("gettext" ,gettext-minimal)
-                     ("qtbase" ,qtbase)
+                     ("qtbase" ,qtbase-5)
                      ("qttools" ,qttools)))
     (inputs `(("libx11" ,libx11)
               ("zlib" ,zlib)
@@ -5132,7 +5132,7 @@ reduction.")
      `(("boost" ,boost)
        ("glu" ,glu)
        ("mesa" ,mesa)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (build-system cmake-build-system)
     (synopsis "Toolset for the mCRL2 formal specification language")
     (description
@@ -6063,7 +6063,7 @@ functions.")
        (base32
         "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"))))
     (build-system cmake-build-system)
-    (inputs `(("qtbase" ,qtbase)))
+    (inputs `(("qtbase" ,qtbase-5)))
     (native-inputs `(("qttools" ,qttools)))
     (arguments
      `(#:phases
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 59c154b9f7..71c9144ddf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -178,7 +178,7 @@
        ("hunspell" ,hunspell)
        ("libidn" ,libidn)
        ("qca" ,qca)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)
        ("qtwebkit" ,qtwebkit)
@@ -1604,7 +1604,7 @@ instant messenger with audio and video chat capabilities.")
        ("sqlite" ,sqlite)
        ("openal" ,openal)
        ("qrencode" ,qrencode)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("sqlcipher" ,sqlcipher)))
     (native-inputs
@@ -2225,7 +2225,7 @@ notifications, and Python scripting support.")
         (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)))
     (arguments
      `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
@@ -2329,7 +2329,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("lmdbxx" ,lmdbxx)
        ("mtxclient" ,mtxclient)
        ("openssl" ,openssl)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
@@ -2382,7 +2382,7 @@ There is support for:
     (build-system qt-build-system)
     (inputs
      `(("libqmatrixclient" ,libqmatrixclient)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
@@ -2722,7 +2722,7 @@ as phones, embedded computers or microcontrollers.")
                   "\"../build"))
                #t)))))
       (inputs
-       `(("qtbase" ,qtbase)
+       `(("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative)
          ("qtwebchannel" ,qtwebchannel)))
       (propagated-inputs
@@ -2851,7 +2851,7 @@ social and chat platform.")
        ("qca" ,qca)
        ("qhttp" ,qhttp)
        ("qite" ,qite)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtkeychain" ,qtkeychain)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 7df0d82805..c69beb9266 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -447,7 +447,7 @@ support")
        ("libebur128" ,libebur128)
        ("libmtp" ,libmtp)
        ("mpg123" ,mpg123)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)
        ("taglib" ,taglib)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 0c29deecd3..f4d2cfff90 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -228,7 +228,7 @@
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("dbus" ,dbus)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ;; Plugin dependencies
        ("alsa-lib" ,alsa-lib)
@@ -431,7 +431,7 @@ score, keyboard, guitar, drum and controller views.")
        ("libxml2" ,libxml2)
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("sqlite" ,sqlite)
        ("sparsehash" ,sparsehash)
@@ -524,7 +524,7 @@ playing your music.")
        ("libmtp" ,libmtp)
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("sqlite" ,sqlite)
        ("taglib" ,taglib)))
@@ -756,7 +756,7 @@ settings (aliasing, linear interpolation and cubic interpolation).")
        ("libsndfile" ,libsndfile)
        ("lrdf" ,lrdf)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("zlib" ,zlib)))
     (home-page "http://www.hydrogen-music.org")
@@ -1955,7 +1955,7 @@ your own lessons.")
        ("boost" ,boost)
        ("minizip" ,minizip)
        ("pugixml" ,pugixml)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("rapidjson" ,rapidjson)
        ("rtmidi" ,rtmidi)
        ("timidity" ,timidity++)
@@ -2038,7 +2038,7 @@ users to select LV2 plugins and run them with jalv.")
        ("alsa-lib" ,alsa-lib)
        ("non-session-manager" ,non-session-manager)
        ("liblo" ,liblo)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -2071,7 +2071,7 @@ oscillators and stereo effects.")
        ("alsa-lib" ,alsa-lib)
        ("non-session-manager" ,non-session-manager)
        ("liblo" ,liblo)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -2104,7 +2104,7 @@ effects.")
        ("alsa-lib" ,alsa-lib)
        ("non-session-manager" ,non-session-manager)
        ("liblo" ,liblo)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -2137,7 +2137,7 @@ effects.")
        ("non-session-manager" ,non-session-manager)
        ("liblo" ,liblo)
        ("fftwf" ,fftwf)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -2717,7 +2717,7 @@ browser.")
                                "/manpages/docbook.xsl")))
              #t)))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qttools" ,qttools)
        ("alsa-lib" ,alsa-lib)))
@@ -2765,7 +2765,7 @@ backends, including ALSA, OSS, Network and FluidSynth.")
              #t)))))
     (inputs
      `(("drumstick" ,drumstick)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
@@ -3105,7 +3105,7 @@ from the command line.")
     (arguments
      `(#:tests? #f))                    ; no "check" target
     (inputs
-     `(("qt" ,qtbase)
+     `(("qt" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
@@ -4423,7 +4423,7 @@ develop custom plugins for use in other applications without programming.")
      `(#:configure-flags
        (list "--enable-qt5")))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
        ("liblo" ,liblo)
@@ -4454,7 +4454,7 @@ modules running in parallel.")
      `(#:configure-flags
        (list "--enable-qt5")))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("alsa-lib" ,alsa-lib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -4637,7 +4637,7 @@ are a C compiler and glib.  Full API documentation and examples are included.")
              "0g9pls46iggg7rdm65vzfj8nyr3v2n5xkp54c4qbh9hhalpsw4ay"))))))
     (inputs
      `(("sdl" ,sdl)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ("fltk" ,fltk)
        ("libogg" ,libogg)
@@ -4742,7 +4742,7 @@ standalone JACK client and an LV2 plugin is also available.")
        ("portaudio" ,portaudio)
        ("portmidi" ,portmidi)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtscript" ,qtscript)
@@ -4822,7 +4822,7 @@ sample library.")
        ("fluidsynth" ,fluidsynth)
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio) ; required by rtaudio
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("rtaudio" ,rtaudio)
        ("rubberband" ,rubberband)))
@@ -5011,7 +5011,7 @@ specification and header.")
        ("libsamplerate" ,libsamplerate)
        ("lilypond" ,lilypond)
        ("lrdf" ,lrdf)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("tar" ,tar)
        ("lirc" ,lirc)
        ("wavpack" ,wavpack)
@@ -5117,7 +5117,7 @@ the electronic or dubstep genre.")
      `(("alsa-lib" ,alsa-lib)
        ("drumstick" ,drumstick)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://github.com/pedrolcl/Linux-SonivoxEas")
@@ -5501,7 +5501,7 @@ discard bad quality ones.
        ("fftw" ,fftw)
        ("jack" ,jack-1)
        ("portaudio" ,portaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)))
     (native-inputs
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6292241007..6cfaa5e803 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -255,7 +255,7 @@ protocols.")
        ("gnutls" ,gnutls)
        ("libtiff" ,libtiff)
        ("openssl" ,openssl)
-       ("qt5" ,qtbase)
+       ("qt5" ,qtbase-5)
        ("udev" ,eudev)))
     (synopsis "Camera stack and framework")
     (description "LibCamera is a complex camera support library for GNU+Linux,
@@ -1472,7 +1472,7 @@ of the same name.")
        ("lz4" ,lz4)
        ("lua" ,lua-5.2)                 ;Lua 5.3 unsupported
        ("krb5" ,mit-krb5)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)
        ("sbc" ,sbc)
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 15e1811d6b..a60aeaa3b5 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -180,7 +180,7 @@ monospaced or proportional.")
        ("podofo" ,podofo)
        ("poppler-qt5" ,poppler-qt5)
        ("sane-backends" ,sane-backends)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtspell" ,qtspell)
        ("quazip" ,quazip)
        ("tesseract" ,tesseract-ocr)))
diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm
index 942e194739..bedbad7e60 100644
--- a/gnu/packages/orange.scm
+++ b/gnu/packages/orange.scm
@@ -177,7 +177,7 @@ GUI based workflow.  It is primarily used in the Orange framework.")
        ("python-serverfiles" ,python-serverfiles)
        ("python-xlrd" ,python-xlrd)
        ("python-xlsxwriter" ,python-xlsxwriter)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("xdg-utils" ,xdg-utils)))
     (home-page "https://orangedatamining.com/")
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index ef091fd126..0e658cefd8 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -160,7 +160,7 @@ human.")
        ("libxi" ,libxi)
        ("libxtst" ,libxtst)
        ("qrencode" ,qrencode)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("quazip" ,quazip)               ; XC_KEESHARE
@@ -697,7 +697,7 @@ key URIs using the standard otpauth:// scheme.")
     (native-inputs
      `(("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (home-page "https://qtpass.org")
     (synopsis "GUI for password manager password-store")
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 8f163bdd37..9298332940 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -177,7 +177,7 @@ information.")
      `(("python-pypdf2" ,python-pypdf2)
        ("python-pyqt" ,python-pyqt)
        ("python-poppler-qt5" ,python-poppler-qt5)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "http://crazy-compilers.com/flyer-composer")
     (synopsis "Rearrange PDF pages to print as flyers on one sheet")
     (description "@command{flyer-composer} can be used to prepare one- or
@@ -302,7 +302,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
 (define-public poppler-qt5
   (package/inherit poppler
    (name "poppler-qt5")
-   (inputs `(("qtbase" ,qtbase)
+   (inputs `(("qtbase" ,qtbase-5)
              ,@(package-inputs poppler)))
    (synopsis "Qt5 frontend for the Poppler PDF rendering library")))
 
@@ -342,7 +342,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
      `(("python-sip" ,python-sip-4)
        ("python-pyqt" ,python-pyqt)
        ("poppler-qt5" ,poppler-qt5)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://pypi.org/project/python-poppler-qt5/")
     (synopsis "Python bindings for Poppler-Qt5")
     (description
@@ -400,7 +400,7 @@ reading and editing of existing PDF files.")
    (inputs `(("cups" ,cups)
              ("freetype" ,freetype)
              ("libpng" ,libpng)
-             ("qtbase" ,qtbase)
+             ("qtbase" ,qtbase-5)
              ("zlib" ,zlib)))
    (arguments
     `(#:tests? #f))                   ; there is no check target
@@ -847,7 +847,7 @@ program capable of converting PDF into other formats.")
        ("djvulibre" ,djvulibre)
        ("libspectre" ,libspectre)
        ("poppler-qt5" ,poppler-qt5)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (arguments
      `(#:imported-modules ((guix build qt-build-system)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 943e8caa90..ead70c3e22 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -617,7 +617,7 @@ and enhance them.")
     (inputs
      `(("graphicsmagick" ,graphicsmagick)
        ("libomp" ,libomp)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://photoflare.io")
     (synopsis "Quick, simple but powerful image editor")
     (description "Photoflare is a cross-platform image editor with an aim
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index d868aceec2..b517d0cace 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -151,7 +151,7 @@ for unprivileged applications.")
     (inputs
      `(("polkit" ,polkit)))
     (propagated-inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (arguments
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 9ab9da37fb..f78923966c 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -57,11 +57,11 @@
                         #t))))))
     (inputs
      `(("libusb" ,libusb)
-       ("qt" ,qtbase)
+       ("qt" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qmake" ,qtbase)))
+       ("qmake" ,qtbase-5)))
     (synopsis "Graphical program to drive plotting cutters")
     (description
      "Robocut is a simple graphical program that allows you to cut graphics
diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm
index 4d3c3faca0..b4d52d8d85 100644
--- a/gnu/packages/profiling.scm
+++ b/gnu/packages/profiling.scm
@@ -207,7 +207,7 @@ with calls to the POMP2 measurement interface.")
     (inputs `(("dbus" ,dbus)
               ("zlib" ,zlib)))
     (native-inputs `(("perl" ,perl)
-                     ("qtbase" ,qtbase)           ; native because of qmake
+                     ("qtbase" ,qtbase-5)           ; native because of qmake
                      ("which" ,which)))
 
     ;; FIXME: The doc is 14MB, but adding a doc output results in a cycle.
diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm
index b8741520f0..f8a60af760 100644
--- a/gnu/packages/pumpio.scm
+++ b/gnu/packages/pumpio.scm
@@ -62,7 +62,7 @@
              #t)))))
     (inputs
      `(("aspell" ,aspell)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("tidy" ,tidy)))
     (synopsis "Qt-based pump.io client")
     (description "Pumpa is a simple pump.io client written in C++ and Qt.")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ddaa51bb3f..deff74b3b2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13212,7 +13212,7 @@ ISO 8859, etc.).")
        ("python-pytest-cov" ,python-pytest-cov)
        ("python-pytest-xdist" ,python-pytest-xdist)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (propagated-inputs
      `(("python-h5py" ,python-h5py)
        ("python-numpy" ,python-numpy)
@@ -25361,7 +25361,7 @@ implementations.")
         ("swig" ,swig)))
     (inputs
       `(("python-wrapper" ,python-wrapper)
-        ("qtbase" ,qtbase)
+        ("qtbase" ,qtbase-5)
         ("libxi" ,libxi)
         ("libice" ,libice)
         ("soqt" ,soqt)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 55855fb68a..28b2f8da97 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -134,7 +134,7 @@
                (chdir "libqite")
                #t)))))
       (inputs
-       `(("qtbase" ,qtbase)
+       `(("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)))
       (home-page "https://github.com/Ri0n/qite/")
       (synopsis "Qt Interactive Text Elements")
@@ -187,7 +187,7 @@
     (native-inputs
      `(("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (synopsis "Qt5 Configuration Tool")
     (description "Qt5CT is a program that allows users to configure Qt5
@@ -234,7 +234,7 @@ window managers, that don't provide Qt integration by themselves.")
          ("extra-cmake-modules" ,extra-cmake-modules)
          ("pkg-config" ,pkg-config)))
       (inputs
-       `(("qtbase" ,qtbase)
+       `(("qtbase" ,qtbase-5)
          ("qtwayland" ,qtwayland)
          ("wayland" ,wayland)
          ("xkbcommon" ,libxkbcommon)))
@@ -261,7 +261,7 @@ applications on Wayland.")
      ;; Optional: lcov and cccc, both are for code coverage
      `(("doxygen" ,doxygen)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtscript" ,qtscript)))
     (build-system cmake-build-system)
@@ -570,7 +570,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
     (native-inputs `(("perl" ,perl)))
     (inputs
      `(("mesa" ,mesa)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (arguments
      `(#:phases
@@ -660,7 +660,7 @@ HostData=lib/qt5
        ("libtiff" ,libtiff)
        ("libwebp" ,libwebp)
        ("mesa" ,mesa)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (synopsis "Additional Image Format plugins for Qt")
     (description "The QtImageFormats module contains plugins for adding
@@ -682,7 +682,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
     (native-inputs `(("perl" ,perl)))
     (inputs
      `(("mesa" ,mesa)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (synopsis "Qt Extras for X11")
     (description "The QtX11Extras module includes the library to access X11
 from within Qt 5.")))
@@ -709,7 +709,7 @@ from within Qt 5.")))
                #t))))))
     (native-inputs `(("perl" ,perl)
                      ("qtdeclarative" ,qtdeclarative)))
-    (inputs `(("qtbase" ,qtbase)))
+    (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Qt XML patterns module")
     (description "The QtXmlPatterns module is a XQuery and XPath engine for
 XML and custom data models.  It contains programs such as xmlpatterns and
@@ -748,7 +748,7 @@ xmlpatternsvalidator.")))
        ("vulkan-headers" ,vulkan-headers)))
     (inputs
      `(("mesa" ,mesa)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (synopsis "Qt QML module (Quick 2)")
     (description "The Qt QML module provides a framework for developing
 applications and libraries with the QML language.  It defines and implements the
@@ -772,7 +772,7 @@ with JavaScript and C++.")))
        ("qtdeclarative" ,qtdeclarative)))
     (inputs
      `(("bluez" ,bluez)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (synopsis "Qt Connectivity module")
     (description "The Qt Connectivity modules provides modules for interacting
 with Bluetooth and NFC.")))
@@ -793,7 +793,7 @@ with Bluetooth and NFC.")))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative)))
-    (inputs `(("qtbase" ,qtbase)))
+    (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Web Sockets module")
     (description "WebSocket is a web-based protocol designed to enable two-way
 communication between a client application and a remote host.  The Qt
@@ -825,7 +825,7 @@ consume data received from the server, or both.")))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative)))
-    (inputs `(("qtbase" ,qtbase)))
+    (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Sensors module")
     (description "The Qt Sensors API provides access to sensor hardware via QML
 and C++ interfaces.  The Qt Sensors API also provides a motion gesture
@@ -870,7 +870,7 @@ recognition API for devices.")))
      `(("alsa-lib" ,alsa-lib)
        ("mesa" ,mesa)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ;; Gstreamer is needed for the mediaplayer plugin
        ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)))
@@ -924,7 +924,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
        ("libxrender" ,libxrender)
        ("mesa" ,mesa)
        ("mtdev" ,mtdev)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("vulkan-headers" ,vulkan-headers)
        ("wayland" ,wayland)))
     (synopsis "Qt Wayland module")
@@ -943,7 +943,7 @@ compositor libraries.")))
                "17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar"))))
     (native-inputs `(("perl" ,perl)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("eudev" ,eudev)))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg)
@@ -987,7 +987,7 @@ interacting with serial ports from within Qt.")))
                  #t)))))))
     (inputs
      `(("libsocketcan" ,libsocketcan)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtserialport" ,qtserialport)))
     (synopsis "Qt Serial Bus module")
     (description "The Qt Serial Bus API provides classes and functions to
@@ -1008,7 +1008,7 @@ and others.")))
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebsockets" ,qtwebsockets)))
-    (inputs `(("qtbase" ,qtbase)))
+    (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Web communication library for Qt")
     (description "The Qt WebChannel module enables peer-to-peer communication
 between the host (QML/C++ application) and the client (HTML/JavaScript
@@ -1036,7 +1036,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
     (native-inputs '())
     (inputs
      `(("mesa" ,mesa)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebsockets" ,qtwebsockets)
        ("zlib" ,zlib)))
@@ -1061,7 +1061,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
     (native-inputs
      `(("perl" ,perl)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Display web content in a QML application")
     (description "Qt WebView provides a way to display web content in a QML
@@ -1092,7 +1092,7 @@ native APIs where it makes sense.")))
     (inputs
      `(("icu4c" ,icu4c)
        ("openssl" ,openssl)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("zlib" ,zlib)))
     (synopsis "Qt Location and Positioning modules")
     (description "The Qt Location module provides an interface for location,
@@ -1117,7 +1117,7 @@ positioning and geolocation plugins.")))
        ("vulkan-headers" ,vulkan-headers)))
     (inputs
      `(("mesa" ,mesa)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (synopsis "Qt Tools and Designer modules")
     (description "The Qt Tools module provides a set of applications to browse
 the documentation, translate applications, generate help files and other stuff
@@ -1138,7 +1138,7 @@ that helps in Qt development.")))
      `(("perl" ,perl)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Script module")
     (description "Qt provides support for application scripting with ECMAScript.
 The following guides and references cover aspects of programming with
@@ -1158,7 +1158,7 @@ ECMAScript and Qt.")))
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Quick Controls and other Quick modules")
     (description "The QtScript module provides classes for making Qt
@@ -1179,7 +1179,7 @@ can be used to build complete interfaces in Qt Quick.")))
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Quick Controls 2 and other Quick 2 modules")
     (description "The Qt Quick Controls 2 module contains the Qt Labs Platform
@@ -1201,7 +1201,7 @@ not available.")))
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Graphical Effects module")
     (description "The Qt Graphical Effects module provides a set of QML types
@@ -1229,7 +1229,7 @@ coloring, and many more.")))
        ("freetype" ,freetype)
        ("libxrender" ,libxrender)
        ("sdl2" ,sdl2)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Gamepad module")
     (description "The Qt Gamepad module is an add-on library that enables Qt
@@ -1257,7 +1257,7 @@ and mobile applications targeting TV-like form factors.")))
                    (("scion") "#"))
                  #t))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt SCXML module")
     (description "The Qt SCXML module provides functionality to create state
@@ -1277,7 +1277,7 @@ also contains functionality to support data models and executable content.")))
               (base32
                "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Purchasing module")
     (description "The Qt Purchasing module provides and in-app API for
@@ -1297,7 +1297,7 @@ purchasing goods and services.")))
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Charts module")
     (description "The Qt Charts module provides a set of easy to use chart
@@ -1321,7 +1321,7 @@ selecting one of the charts themes.")
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Data Visualization module")
     (description "The Qt Data Visualization module provides a way to visualize
@@ -1352,7 +1352,7 @@ customized by using themes or by adding custom items and labels to them.")
                  (("oauth1 ") "# oauth1 "))
                #t))))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Network Authorization module")
     (description "The Qt Network Authorization module provides an
 implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
@@ -1383,7 +1383,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
                    "integration_multiprocess"))
                #t))))))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (synopsis "Qt Remote Objects module")
     (description "The Qt Remote Objects module is an @dfn{inter-process
@@ -1406,7 +1406,7 @@ processes or computers.")))
      (substitute-keyword-arguments (package-arguments qtsvg)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative)
@@ -1442,7 +1442,7 @@ message.")))
        ("qttools" ,qttools)))
     (inputs
      `(("enchant" ,enchant)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://github.com/manisandro/qtspell")
     (synopsis "Spell checking for Qt text widgets")
     (description
@@ -1735,7 +1735,7 @@ using the Enchant spell-checking library.")
        ("pciutils" ,pciutils)
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtwebchannel" ,qtwebchannel)
@@ -1905,13 +1905,13 @@ module provides support functions to the automatically generated code.")
         (patches (search-patches "pyqt-configure.patch"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("qtbase" ,qtbase))) ; for qmake
+     `(("qtbase" ,qtbase-5))) ; for qmake
     (propagated-inputs
      `(("python-sip" ,python-sip)
        ("python-pyqt5-sip" ,python-pyqt5-sip)))
     (inputs
      `(("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtconnectivity" ,qtconnectivity)
        ("qtdeclarative" ,qtdeclarative)
        ("qtlocation" ,qtlocation)
@@ -2017,12 +2017,12 @@ contain over 620 classes.")
      `(("python" ,python)
        ("python-sip" ,python-sip)
        ;; qtbase is required for qmake
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (inputs
      `(("python" ,python-wrapper)
        ("python-sip" ,python-sip)
        ("python-pyqt" ,python-pyqt)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
@@ -2169,7 +2169,7 @@ top of the PyQt bindings for Qt.  PyQt-builder is used to build PyQt itself.")
                  (("\\$\\$\\[QT_HOST_DATA\\]")
                  (string-append out "/lib/qt$${QT_MAJOR_VERSION}")))
                (invoke "qmake")))))))
-    (native-inputs `(("qtbase" ,qtbase)))
+    (native-inputs `(("qtbase" ,qtbase-5)))
     (home-page "https://www.riverbankcomputing.co.uk/software/qscintilla/intro")
     (synopsis "Qt port of the Scintilla C++ editor control")
     (description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
@@ -2267,7 +2267,7 @@ This package provides the Python bindings.")))
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (arguments
      `(#:tests? #f ; No tests included
        #:phases
@@ -2377,7 +2377,7 @@ securely.  It will not store any data unencrypted unless explicitly requested.")
                          '("qtlockedfile" "qtpropertybrowser" "qtservice"
                            "qtsingleapplication" "qtsoap")))))))
       (inputs
-       `(("qtbase" ,qtbase)))
+       `(("qtbase" ,qtbase-5)))
       (synopsis "Collection of Qt extensions")
       (description "QtSolutions is a set of components extending Qt.
 @itemize
@@ -2410,7 +2410,7 @@ that can be only started once per user.
          (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"))))
   (build-system gnu-build-system)
   (inputs
-   `(("qtbase" ,qtbase)
+   `(("qtbase" ,qtbase-5)
      ("qtsvg" ,qtsvg)
      ("qttools" ,qttools)))
   (arguments
@@ -2493,7 +2493,7 @@ different kinds of sliders, and much more.")
        ("sqlite" ,sqlite)
        ("fontconfig" ,fontconfig)
        ("libxrender" ,libxrender)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
@@ -2558,7 +2558,7 @@ time Web content can be enhanced with native controls.")
     (native-inputs
      `(("qttools" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)))
     (home-page "https://filcuc.github.io/DOtherSide/index.html")
     (synopsis "C language library for creating bindings for the Qt QML language")
@@ -2596,7 +2596,7 @@ a binding language:
       (native-inputs
        `(("qttools" ,qttools)))
       (inputs
-       `(("qtbase" ,qtbase)))
+       `(("qtbase" ,qtbase-5)))
       (home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets")
       (synopsis "Color management widgets")
       (description "QtColorWidgets provides a Qt color dialog that is more
@@ -2625,7 +2625,7 @@ color-related widgets.")
            (sha256
             (base32 "0vp8lpxvd1nlp4liqrlvslpqrgfn0wpiwizzdsjbj22zzb8vxikc"))))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -2674,7 +2674,7 @@ color-related widgets.")
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
        ("python-wrapper" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (arguments
      `(#:tests? #f
@@ -2724,7 +2724,7 @@ color-related widgets.")
      `(("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
        ("clang-toolchain" ,clang-toolchain)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdatavis3d" ,qtdatavis3d)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
@@ -2792,7 +2792,7 @@ generate Python bindings for your C or C++ code.")
     (inputs
      `(("python-pyside-2" ,python-pyside-2)
        ("python-shiboken-2" ,python-shiboken-2)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("python" ,python-wrapper)))
     (arguments
@@ -2836,7 +2836,7 @@ generate Python bindings for your C or C++ code.")
            (lambda* (#:key make-flags #:allow-other-keys)
              (apply invoke (cons "qmake" make-flags)))))))
     (native-inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qttools" ,qttools)))
     (inputs
      `(("glu" ,glu)))
@@ -2879,7 +2879,7 @@ being fully customizable and easy to extend.")
       `(("pkg-config" ,pkg-config)
         ("cmake" ,cmake)))
     (inputs
-      `(("qtbase" ,qtbase)
+      `(("qtbase" ,qtbase-5)
         ("coin3D" ,coin3D-4)))
     (home-page "https://github.com/coin3d/soqt")
     (synopsis "Qt GUI component toolkit library for Coin")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 6b2c3eb387..fcaf9bb20d 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -380,7 +380,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
        ("python-pygobject" ,python-pygobject)
        ("python-pyqt" ,python-pyqt)
        ("python-pyyaml" ,python-pyyaml)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qwt" ,qwt)
        ("sdl" ,sdl)
        ("volk" ,volk)
@@ -649,7 +649,7 @@ to the fix block above.
        ("log4cpp" ,log4cpp)
        ("portaudio" ,portaudio)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("volk" ,volk)))
     (arguments
@@ -948,7 +948,7 @@ users.")
        ("fftwf" ,fftwf)
        ("hamlib" ,wsjtx-hamlib)
        ("libusb" ,libusb)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtserialport" ,qtserialport)))
     (arguments
@@ -1007,7 +1007,7 @@ weak-signal conditions.")
        ("fftwf" ,fftwf)
        ("hamlib" ,wsjtx-hamlib)
        ("libusb" ,libusb)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtserialport" ,qtserialport)))
     (arguments
@@ -1259,7 +1259,7 @@ NanoVNA vector network analyzers.")
        ("hamlib" ,hamlib)
        ("openjpeg" ,openjpeg)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("v4l-utils" ,v4l-utils)))
     (arguments
      `(#:tests? #f  ; No test suite.
@@ -1363,7 +1363,7 @@ methods:
      `(("alsa-lib" ,alsa-lib)
        ("ncurses" ,ncurses)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      `(#:configure-flags '("--disable-static")
        #:phases
@@ -1492,7 +1492,7 @@ Compatible hardware/software:
        ("libpcap" ,libpcap)
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtwebkit" ,qtwebkit)
        ("qwt" ,qwt)
@@ -1564,7 +1564,7 @@ receiver.")
        ("libusb" ,libusb)
        ("mpg123" ,mpg123)
        ("rtl-sdr" ,rtl-sdr)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
@@ -1798,7 +1798,7 @@ voice formats.")
        ("opencv" ,opencv)
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative)
        ("qtlocation" ,qtlocation)
@@ -1851,7 +1851,7 @@ various hardware.")
     (inputs
      `(("fftwf" ,fftwf)
        ("liquid-dsp" ,liquid-dsp)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://github.com/miek/inspectrum")
     (synopsis "Radio signal analyser")
     (description
@@ -1878,7 +1878,7 @@ software-defined radio receivers.")
       (build-system qt-build-system)
       (inputs
        `(("qcustomplot" ,qcustomplot)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)
          ("qtserialport" ,qtserialport)))
       (arguments
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index fbf10be366..87dcc6f890 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -57,7 +57,7 @@
        `(("sdl2" ,sdl2)))
       (propagated-inputs
        ;; 'Viewer.h' includes 'QGLWidget'.
-       `(("qtbase" ,qtbase)                ;the viewer module needs Qt5 + MESA
+       `(("qtbase" ,qtbase-5)                ;the viewer module needs Qt5 + MESA
          ("mesa" ,mesa)))
       (synopsis "Robot simulator")
       (description
@@ -107,7 +107,7 @@ hundred times faster than real-time.")
        `(("dashel" ,dashel)
          ("enki" ,enki)
          ("protobuf" ,protobuf-3.5)               ;for logging
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtsvg" ,qtsvg)
          ("qttools" ,qttools)              ;for libQt5Help, needed by "studio"
          ("qtwebkit" ,qtwebkit)
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index 1a267be13c..a9372735bf 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -87,7 +87,7 @@
        ("podofo" ,podofo)
        ("poppler" ,poppler)
        ("python" ,python)               ; need Python library
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("zlib" ,zlib)))
     (native-inputs
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 2b64117dc6..c85b4f801c 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -192,7 +192,7 @@
        ("libzip" ,libzip)
        ("openssl" ,openssl)
        ("python-nautilus" ,python-nautilus)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtkeychain" ,qtkeychain)
@@ -352,7 +352,7 @@ See also: megacmd, the official tool set by MEGA.")
        ("pkg-config" ,pkg-config)
        ("qtlinguist" ,qttools)))
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtkeychain" ,qtkeychain)
        ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
@@ -397,7 +397,7 @@ silently and reliably flow across to every other.")
                #t))))
        #:tests? #f)) ; no test target
     (inputs
-     `(("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase-5)
        ("qtwebkit" ,qtwebkit)))
     (home-page "https://github.com/sieren/QSyncthingTray")
     (synopsis "Traybar Application for Syncthing")
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 65ff2cc341..d0c9fa7635 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -566,7 +566,7 @@ formats, including all versions of RSS and Atom.")
        ("qttools" ,qttools)))
     (inputs
      `(("qtwebkit" ,qtwebkit)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("phonon" ,phonon)
        ("sqlite" ,sqlite)))
diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm
index 1f8f8f351e..b241d29f6a 100644
--- a/gnu/packages/synergy.scm
+++ b/gnu/packages/synergy.scm
@@ -82,7 +82,7 @@
        ("libxi"   ,libxi)
        ("libx11"  ,libx11)
        ("libxtst" ,libxtst)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://symless.com/synergy")
     (synopsis "Mouse and keyboard sharing utility")
     (description
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 6f77482117..a1822b3892 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -538,7 +538,7 @@ Telegram project, for its use in telegram desktop client.")
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
        ("qrcodegen" ,qrcodegen-cpp)
-       ("qt" ,qtbase)
+       ("qt" ,qtbase-5)
        ("qt5ct" ,qt5ct)
        ("qtimageformats" ,qtimageformats)
        ("qtwayland" ,qtwayland)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index af7148bf84..788e05632c 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -643,7 +643,7 @@ address of one of the participants.")
        ("opus" ,opus) ; avoid bundled
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("speech-dispatcher" ,speech-dispatcher)
        ("speex" ,speex) ; avoid bundled
@@ -705,7 +705,7 @@ Mumble consists of two applications for separate usage:
        ("libilbc" ,libilbc)
        ("libsndfile" ,libsndfile)
        ("libxml2" ,libxml2)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols" ,qtquickcontrols)
        ("readline" ,readline)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 37636c7cdc..4f800f2a91 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -645,7 +645,7 @@ embedded kernel situations.")
                     #t))))
       (build-system gnu-build-system)
       (inputs
-       `(("qtbase" ,qtbase)
+       `(("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative)
          ("qtgraphicaleffects" ,qtgraphicaleffects)
          ("qtquickcontrols" ,qtquickcontrols)))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b9eeb0e792..da19a57e59 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6500,7 +6500,7 @@ PDF documents.")
                        "texmaker.pro")))))))
     (inputs
      `(("poppler-qt5" ,poppler-qt5)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
        ("qtwebkit" ,qtwebkit)
        ("zlib" ,zlib)))
@@ -6606,7 +6606,7 @@ and Karl Berry.")
        ("libx11" ,libx11)
        ("mythes" ,mythes)
        ("python" ,python)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("zlib" ,zlib)))
     (propagated-inputs
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 30747057f8..844f30d35c 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -617,7 +617,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
        ("qttools" ,qttools)))           ; for lrelease
     (inputs
      `(("hunspell" ,hunspell)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
@@ -823,7 +823,7 @@ editors.")
        ("guile" ,guile-1.8)
        ("perl" ,perl)
        ("python" ,python-wrapper)
-       ("qt" ,qtbase)
+       ("qt" ,qtbase-5)
        ("qtsvg" ,qtsvg)))
     (arguments
      `(#:tests? #f                      ; no check target
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 961094a80b..6b27a71de1 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -558,7 +558,7 @@ applications by providing high-level classes for commonly required tasks.")
     (inputs
      `(;; XXX: Build fails with libvideogfx.
        ;; ("libvideogfx" ,libvideogfx)
-       ("qt" ,qtbase)
+       ("qt" ,qtbase-5)
        ("sdl" ,sdl)))
     (synopsis "H.265 video codec implementation")
     (description "Libde265 is an implementation of the h.265 video codec.  It is
@@ -925,7 +925,7 @@ H.264 (MPEG-4 AVC) video streams.")
        ("lzo" ,lzo)
        ("pcre2" ,pcre2)
        ("pugixml" ,pugixml)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("utfcpp" ,utfcpp)
        ("zlib" ,zlib)))
@@ -1827,7 +1827,7 @@ videoformats depend on the configuration flags of ffmpeg.")
        ("pulseaudio" ,pulseaudio)
        ("protobuf" ,protobuf)
        ("python" ,python-wrapper)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("samba" ,samba)
@@ -2719,7 +2719,7 @@ for use with HTML5 video.")
        ("libvpx" ,libvpx)
        ("libxv" ,libxv)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
     (arguments
@@ -2997,7 +2997,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
        ("rubberband" ,rubberband)
        ("libsamplerate" ,libsamplerate)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("sdl" ,sdl)
        ("sox" ,sox)))
@@ -3067,7 +3067,7 @@ tools, XML authoring components, and an extensible plug-in based API.")
        ("glu" ,glu)
        ("libjpeg" ,libjpeg-turbo)
        ("libx11" ,libx11)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("eudev" ,eudev)))
     (synopsis "Realtime video capture utilities for Linux")
     (description "The v4l-utils provide a series of libraries and utilities to
@@ -3131,7 +3131,7 @@ be used for realtime video capture via Linux-specific APIs.")
        ("mbedtls" ,mbedtls-apache)
        ("mesa" ,mesa)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("speexdsp" ,speexdsp)
@@ -3206,7 +3206,7 @@ OBS audio sources.")
              #t)))))
     (inputs
      `(("obs" ,obs)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://github.com/Palakis/obs-websocket")
     (synopsis "OBS plugin for remote control via WebSockets")
     (description "This OBS plugin allows you to establish a WebSocket channel
@@ -3398,7 +3398,7 @@ making @dfn{screencasts}.")
        ("libxi" ,libxi)
        ("libxinerama" ,libxinerama)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments
@@ -4474,7 +4474,7 @@ create smoother and stable videos.")
        ("imagemagick" ,imagemagick)
        ("jsoncpp" ,jsoncpp)
        ("libopenshot-audio" ,libopenshot-audio)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("zeromq" ,zeromq)))
     (arguments
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index af178f9092..04cf3a1a60 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -467,7 +467,7 @@ access.")
          ("font-google-noto" ,font-google-noto)
          ("font-openmoji" ,font-openmoji)
          ("openssl" ,openssl)
-         ("qtbase" ,qtbase)
+         ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)
          ("qtsvg" ,qtsvg)))
       (home-page "https://kristall.random-projects.net")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5bf417c7e1..0dd0a8dec5 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -237,7 +237,7 @@
              #t)))))
     (inputs
      `(("http-parser" ,http-parser)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (home-page "https://github.com/azadkuh/qhttp/")
     (synopsis "Qt-based HTTP Library")
     (description
@@ -1120,7 +1120,7 @@ project)
          (add-before 'check 'render-offscreen
            (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") #t)))))
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase-5)))
     (home-page "http://qjson.sourceforge.net")
     (synopsis "Library that maps JSON data to QVariant objects")
     (description "QJson is a Qt-based library that maps JSON data to
@@ -1145,7 +1145,7 @@ instances, while JSON's objects will be mapped to @code{QVariantMap}.")
     (build-system gnu-build-system)
     (inputs
      `(("qca" ,qca)
-       ("qtbase" ,qtbase)))
+       ("qtbase" ,qtbase-5)))
     (arguments
      '(#:tests? #f                      ;FIXME: some tests are failing
        #:phases
@@ -8152,7 +8152,7 @@ It contains the code shared by all Kiwix ports.")
        ("libmicrohttpd" ,libmicrohttpd)
        ("libzim" ,libzim)
        ("pugixml" ,pugixml)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
@@ -8161,7 +8161,7 @@ It contains the code shared by all Kiwix ports.")
        ("zstd" ,zstd "lib")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qmake" ,qtbase)))
+       ("qmake" ,qtbase-5)))
     (home-page "https://wiki.kiwix.org/wiki/Software")
     (synopsis "Viewer and manager of ZIM files")
     (description "Kiwix Desktop allows you to enjoy a lot of different content
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 83fefecedc..5e1954788d 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -317,7 +317,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
    `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
      #:tests? #f)) ; Test suite is a rather manual process.
   (inputs
-   `(("qtbase" ,qtbase)
+   `(("qtbase" ,qtbase-5)
      ("qtscript" ,qtscript)
      ("qtsvg" ,qtsvg)
      ("qtx11extras" ,qtx11extras)))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dea4f8e304..07784f474e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6515,7 +6515,7 @@ and embedded platforms.")
   (package/inherit uim
     (name "uim-qt")
     (inputs
-     `(("qt" ,qtbase)
+     `(("qt" ,qtbase-5)
        ("qtx11extras" ,qtx11extras)
        ,@(package-inputs uim)))
     (arguments
-- 
2.31.1

From 96885455d155a52f707afb8e2ab9507ab6d887da Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 09:32:17 -0500
Subject: [PATCH 02/37] gnu: Add qtbase.

* gnu/packages/qt.scm (qtbase): New variable.
---
 gnu/packages/qt.scm | 157 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 153 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 28b2f8da97..8c020d53eb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -298,7 +298,7 @@ system, and the core design of Django is reused in Grantlee.")
         (string-append "https://distfiles.macports.org/qt5/"
                        component "-everywhere-src-" version ".tar.xz")))
 
-(define-public qtbase
+(define-public qtbase-5
   (package
     (name "qtbase")
     (version "5.15.2")
@@ -553,9 +553,158 @@ system, and the core design of Django is reused in Grantlee.")
 developers using C++ or QML, a CSS & JavaScript like language.")
     (license (list license:lgpl2.1 license:lgpl3))))
 
-;; qt used to refer to the monolithic Qt 5.x package
-(define-deprecated qt qtbase)
-
+(define-public qtbase
+  (package/inherit qtbase-5
+    (name "qtbase")
+    (version "6.0.3")
+    (source (origin
+              (inherit (package-source qtbase-5))
+              (uri (qt5-urls name version))
+              (sha256
+               (base32
+                "156k21z8xqg0jxipil1dfrly42dkrd0fmqshbii6969l58fbci8s"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; corelib uses bundled harfbuzz, md4, md5, sha3
+               '(with-directory-excursion "src/3rdparty"
+                  (for-each delete-file-recursively
+                            ;; The bundled pcre2 copy is kept, as its headers
+                            ;; are required by some internal bootstrap target
+                            ;; used for the tools.
+                            (list "double-conversion" "freetype" "harfbuzz-ng"
+                                  "libpng" "libjpeg" "sqlite" "xcb" "zlib"))))))
+    (build-system cmake-build-system)
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtbase-5)
+       ;; XXX: There are many test failures, because the test suite
+       ;; requires a real X server (a virtual one such as Xvfb is not
+       ;; enough) or a functional network.  It's also quite expensive to
+       ;; build and run.
+       ((#:tests? _ #f) #f)
+       ;; ((#:cmake _)
+       ;;  cmake)                          ;requires a CMake >= 3.18.4
+       ((#:configure-flags _ ''())
+        `(let ((out (assoc-ref %outputs "out")))
+           (list "-GNinja"              ;the build fails otherwise
+                 (string-append "-DINSTALL_ARCHDATADIR=" out "/lib/qt6")
+                 (string-append "-DINSTALL_DATADIR=" out "/share/qt6")
+                 (string-append "-DINSTALL_DOCDIR=" out "/share/doc/qt6")
+                 (string-append "-DINSTALL_MKSPECSDIR=" out "/lib/qt6/mkspecs")
+                 (string-append "-DINSTALL_EXAMPLESDIR=" out
+                                "/share/doc/qt6/examples")
+                 (string-append "-DINSTALL_INCLUDEDIR=" out "/include/qt6")
+                 ;; Link with DBus and OpenSSL so they don't get dlopen'ed.
+                 "-DINPUT_dbus=linked"
+                 "-DINPUT_openssl=linked"
+                 ;; These features require higher versions of Linux than the
+                 ;; minimum version of the glibc.  See
+                 ;; src/corelib/global/minimum-linux_p.h.  By disabling these
+                 ;; features Qt applications can be used on the oldest kernels
+                 ;; that the glibc supports, including the RHEL6 (2.6.32) and
+                 ;; RHEL7 (3.10) kernels.
+                 "-DFEATURE_getentropy=OFF" ; requires Linux 3.17
+                 "-DFEATURE_renameat2=OFF"  ; requires Linux 3.16
+                 ;; Most system libraries are used by default, except in some
+                 ;; cases such as for those below.
+                 "-DFEATURE_system_pcre2=ON"
+                 "-DFEATURE_system_sqlite=ON"
+                 ;; Don't use the precompiled headers.
+                 "-DBUILD_WITH_PCH=OFF"
+                 ;; Drop special machine instructions that do not have runtime
+                 ;; detection.
+                 ,@(if (string-prefix? "x86_64"
+                                       (or (%current-target-system)
+                                           (%current-system)))
+                       '()              ;implicitly enabled
+                       '("-DFEATURE_sse2=OFF"
+                         "-DFEATURE_sse3=OFF"
+                         "-DFEATURE_ssse3=OFF"
+                         "-DFEATURE_sse4_1=OFF"
+                         "-DFEATURE_sse4_2=OFF"))
+                 "-DFEATURE_mips_dsp=OFF"
+                 "-DFEATURE_mips_dspr2=OFF")))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (delete 'patch-bin-sh)
+           (delete 'patch-xdg-open)
+           (add-after 'patch-paths 'patch-more-paths
+             (lambda _
+               (substitute* "src/gui/platform/unix/qgenericunixservices.cpp"
+                 (("\"xdg-open\"")
+                  (format #f "~s" (which "xdg-open"))))
+               (substitute* "src/corelib/global/global.pri"
+                 (("/bin/ls")
+                  (which "ls")))
+               (substitute* '("mkspecs/features/qt_functions.prf"
+                              "qmake/library/qmakebuiltins.cpp")
+                 (("/bin/sh")
+                  (which "sh")))))
+           (replace 'configure
+             (assoc-ref %standard-phases 'configure))
+           (replace 'build
+             (lambda* (#:key parallel-build? #:allow-other-keys)
+               (apply invoke "cmake" "--build" "."
+                      (if parallel-build?
+                          `("--parallel" ,(number->string (parallel-job-count)))
+                          '()))))
+           (replace 'install
+             (lambda _
+               (invoke "cmake" "--install" ".")))
+           (replace 'patch-mkspecs
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (archdata (string-append out "/lib/qt6"))
+                      (mkspecs (string-append archdata "/mkspecs"))
+                      (qt_config.prf (string-append
+                                      mkspecs "/features/qt_config.prf")))
+                 ;; For each Qt module, let `qmake' uses search paths in the
+                 ;; module directory instead of all in QT_INSTALL_PREFIX.
+                 (substitute* qt_config.prf
+                   (("\\$\\$\\[QT_INSTALL_HEADERS\\]")
+                    "$$clean_path($$replace(dir, mkspecs/modules, ../../include/qt6))")
+                   (("\\$\\$\\[QT_INSTALL_LIBS\\]")
+                    "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))")
+                   (("\\$\\$\\[QT_HOST_LIBS\\]")
+                    "$$clean_path($$replace(dir, mkspecs/modules, ../../lib))")
+                   (("\\$\\$\\[QT_INSTALL_BINS\\]")
+                    "$$clean_path($$replace(dir, mkspecs/modules, ../../bin))"))
+
+                 ;; Searches Qt tools in the current PATH instead of QT_HOST_BINS.
+                 (substitute* (string-append mkspecs "/features/qt_functions.prf")
+                   (("cmd = \\$\\$\\[QT_HOST_BINS\\]/\\$\\$2")
+                    "cmd = $$system(which $${2}.pl 2>/dev/null || which $${2})"))
+
+                 ;; Resolve qmake spec files within qtbase by absolute paths.
+                 (substitute*
+                     (map (lambda (file)
+                            (string-append mkspecs "/features/" file))
+                          '("device_config.prf" "moc.prf" "qt_build_config.prf"
+                            "qt_config.prf"))
+                   (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
+                   (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
+    (native-inputs
+     `(("gtk+" ,gtk+)                   ;for GTK theme support
+       ("ninja" ,ninja)
+       ("wayland-protocols" ,wayland-protocols)
+       ("xorg-server" ,xorg-server-for-tests)
+       ,@(package-native-inputs qtbase-5)))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "QMAKEPATH")
+            (files '("lib/qt6")))
+           (search-path-specification
+            (variable "QML2_IMPORT_PATH")
+            (files '("lib/qt6/qml")))
+           (search-path-specification
+            (variable "QT_PLUGIN_PATH")
+            (files '("lib/qt6/plugins")))
+           (search-path-specification
+            (variable "XDG_DATA_DIRS")
+            (files '("share")))
+           (search-path-specification
+            (variable "XDG_CONFIG_DIRS")
+            (files '("etc/xdg")))))))
+ 
 (define-public qtsvg
   (package (inherit qtbase)
     (name "qtsvg")
-- 
2.31.1

From fd7c47a1ac4fa3a05eab5c8f61e4520572f5f557 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 09:54:44 -0500
Subject: [PATCH 03/37] gnu: qtbase: Update to 6.1.0

* gnu/packages/qt.scm (qtbase): Update to 6.1.0.
---
 gnu/packages/qt.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8c020d53eb..58934d736e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2020 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2021 Brendan Tildesley <[email-masked]>
 ;;; Copyright © 2021 Guillaume Le Vaillant <[email-masked]>
+;;; Copyright © 2021 Eric Brown <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -300,11 +301,11 @@ system, and the core design of Django is reused in Grantlee.")
 
 (define-public qtbase-5
   (package
-    (name "qtbase")
+    (name "qtbase-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtbase" version))
              (sha256
               (base32
                "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh"))
@@ -556,13 +557,13 @@ developers using C++ or QML, a CSS & JavaScript like language.")
 (define-public qtbase
   (package/inherit qtbase-5
     (name "qtbase")
-    (version "6.0.3")
+    (version "6.1.0")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt5-urls name version))
               (sha256
                (base32
-                "156k21z8xqg0jxipil1dfrly42dkrd0fmqshbii6969l58fbci8s"))
+                "1i0l13nk6v8hnhfzxss1yaz32c63fy1cirmwbadx0lb0x63krbzp"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
@@ -632,9 +633,6 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                (substitute* "src/gui/platform/unix/qgenericunixservices.cpp"
                  (("\"xdg-open\"")
                   (format #f "~s" (which "xdg-open"))))
-               (substitute* "src/corelib/global/global.pri"
-                 (("/bin/ls")
-                  (which "ls")))
                (substitute* '("mkspecs/features/qt_functions.prf"
                               "qmake/library/qmakebuiltins.cpp")
                  (("/bin/sh")
-- 
2.31.1

From 9ff7fdf1c47018674a1974f0cec66856d63d7a62 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 15:15:34 -0500
Subject: [PATCH 04/37] gnu: qtsvg: Update to 6.1.0

* gnu/packages/qt.scm (qtsvg): Update to 6.1.0.
* gnu/packages/qt.scm (qtsvg-5): New variable.
---
 gnu/packages/admin.scm            |   2 +-
 gnu/packages/animation.scm        |   2 +-
 gnu/packages/audio.scm            |   2 +-
 gnu/packages/bioinformatics.scm   |   2 +-
 gnu/packages/bittorrent.scm       |   2 +-
 gnu/packages/display-managers.scm |   2 +-
 gnu/packages/education.scm        |   2 +-
 gnu/packages/electronics.scm      |   2 +-
 gnu/packages/engineering.scm      |  10 +--
 gnu/packages/finance.scm          |   4 +-
 gnu/packages/game-development.scm |   2 +-
 gnu/packages/games.scm            |  56 ++++++------
 gnu/packages/geo.scm              |   2 +-
 gnu/packages/graphics.scm         |   2 +-
 gnu/packages/image-processing.scm |   2 +-
 gnu/packages/image-viewers.scm    |   6 +-
 gnu/packages/image.scm            |   2 +-
 gnu/packages/irc.scm              |   2 +-
 gnu/packages/jami.scm             |   2 +-
 gnu/packages/kde-frameworks.scm   |  12 +--
 gnu/packages/kde-multimedia.scm   |   6 +-
 gnu/packages/kde-systemtools.scm  |   2 +-
 gnu/packages/kde.scm              |  16 ++--
 gnu/packages/linphone.scm         |   2 +-
 gnu/packages/lxqt.scm             |  38 ++++----
 gnu/packages/maths.scm            |   2 +-
 gnu/packages/messaging.scm        |  10 +--
 gnu/packages/mpd.scm              |   2 +-
 gnu/packages/music.scm            |  10 +--
 gnu/packages/networking.scm       |   2 +-
 gnu/packages/orange.scm           |   2 +-
 gnu/packages/password-utils.scm   |   4 +-
 gnu/packages/pdf.scm              |   2 +-
 gnu/packages/printers.scm         |   2 +-
 gnu/packages/qt.scm               | 144 +++++++++++++++++-------------
 gnu/packages/radio.scm            |   4 +-
 gnu/packages/robotics.scm         |   2 +-
 gnu/packages/sync.scm             |   2 +-
 gnu/packages/telephony.scm        |   2 +-
 gnu/packages/tex.scm              |   2 +-
 gnu/packages/text-editors.scm     |   6 +-
 gnu/packages/video.scm            |   8 +-
 gnu/packages/web-browsers.scm     |   2 +-
 gnu/packages/xdisorg.scm          |   2 +-
 44 files changed, 208 insertions(+), 184 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 78964ac77e..833a22a7cf 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1867,7 +1867,7 @@ command.")
     (inherit wpa-supplicant)
     (name "wpa-supplicant-gui")
     (inputs `(("qtbase" ,qtbase-5)
-              ("qtsvg" ,qtsvg)
+              ("qtsvg" ,qtsvg-5)
               ,@(package-inputs wpa-supplicant)))
     (native-inputs
      ;; For icons.
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 2eafc4d083..272becc140 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -407,7 +407,7 @@ waveform until they line up with the proper sounds.")
      `(("qtbase" ,qtbase-5)
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ebebd4eec8..7b83d4f162 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2882,7 +2882,7 @@ link REQUIRED)"))
        ("yaml-cpp" ,yaml-cpp)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebsockets" ,qtwebsockets)))
     (propagated-inputs                  ;to get native-search-path
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 659d61c639..9c5b430519 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12387,7 +12387,7 @@ Thus the per-base error rate is similar to the raw input reads.")
                #t))))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("imagemagick" ,imagemagick)))
     (home-page "https://rrwick.github.io/Bandage/")
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 5d6a780aab..5c27a698a2 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -460,7 +460,7 @@ desktops.")
        ("openssl" ,openssl)
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (home-page "https://www.qbittorrent.org/")
     (synopsis "Graphical BitTorrent client")
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 8a0342d7c5..8f9f0da605 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -89,7 +89,7 @@
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
 
        ("shadow" ,shadow)
        ("wayland" ,wayland)))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index f31dbca733..1fe0fb40d0 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -196,7 +196,7 @@ of categories with some of the activities available in that category.
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsensors" ,qtsensors)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 0e985c9750..470c29f99a 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -278,7 +278,7 @@ format support.")
        ("libsigrok" ,libsigrok)
        ("libsigrokdecode" ,libsigrokdecode)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://www.sigrok.org/wiki/PulseView")
     (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
     (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index fae85b6f2c..4d6a2aa432 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -202,7 +202,7 @@
        ("muparser" ,muparser)
        ("freetype" ,freetype)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("which" ,which)))
@@ -703,7 +703,7 @@ multipole-accelerated algorithm.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtserialport" ,qtserialport)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("libgit2" ,libgit2)
        ("boost" ,boost)
        ("zlib" ,zlib)
@@ -2048,7 +2048,7 @@ parallel computing platforms.  It also supports serial execution.")
     (build-system gnu-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (native-inputs
      `(("qttools" ,qttools)             ; for lrelease
@@ -2210,7 +2210,7 @@ simulation.")
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("openssl" ,openssl)
        ;; Depends on radare2 4.5.1 officially, builds and works fine with
        ;; radare2 5.0.0 but fails to build with radare2 5.1.1.
@@ -2421,7 +2421,7 @@ comments.")))
        ("python-shiboken-2" ,python-shiboken-2)
        ("python-wrapper" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras)
        ("qtxmlpatterns" ,qtxmlpatterns)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 09f265afce..461e8e173d 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -595,7 +595,7 @@ other machines/servers.  Electrum does not download the Bitcoin blockchain.")
        ("python-requests" ,python-requests)
        ("python-stem" ,python-stem)
        ("python-trezor" ,python-trezor)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (arguments
      `(#:tests? #f                      ; no tests
@@ -778,7 +778,7 @@ the Monero command line client and daemon.")
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2",qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (arguments
      `(#:tests? #f ; No tests
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index dfc236546d..05687d2ae3 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -462,7 +462,7 @@ support.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (native-inputs
      `(("qttools" ,qttools)))
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index cb6e7e9ed5..4fbdd08455 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -929,7 +929,7 @@ want what you have.")
        `(("protobuf" ,protobuf)
          ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)
-         ("qtsvg" ,qtsvg)
+         ("qtsvg" ,qtsvg-5)
          ("qttools" ,qttools)
          ("qtwebsockets" ,qtwebsockets)
          ("xz" ,xz)
@@ -7253,7 +7253,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
        #:tests? #f))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("cmake" ,cmake-minimal)
        ("gettext-minimal" ,gettext-minimal)
@@ -9304,7 +9304,7 @@ and also provides the base for the FlightGear Flight Simulator.")
        ("plib" ,plib)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("simgear" ,simgear)
        ("speexdsp" ,speexdsp)
        ("sqlite" ,sqlite)
@@ -10159,7 +10159,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
    (inputs
     `(("qtbase" ,qtbase-5)
       ("qtmultimedia" ,qtmultimedia)
-      ("qtsvg" ,qtsvg)))
+      ("qtsvg" ,qtsvg-5)))
    (arguments
     '(#:phases
       (modify-phases %standard-phases
@@ -10252,7 +10252,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Stamp drawing toy")
     (description "KTuberling is a drawing toy intended for small children and
@@ -10299,7 +10299,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Number logic game")
     (description "Picmi is a number logic game in which cells in a grid have
@@ -10381,7 +10381,7 @@ This package is part of the KDE games module.")
        ("ki18n" ,ki18n)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Shared library for kmahjongg and kshisen")
     (description "Shared library and common files for kmahjongg, kshisen and
@@ -10415,7 +10415,7 @@ other Mah Jongg like games.")
        ("libkmahjongg" ,libkmahjongg)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Tile laying patience")
     (description "In KMahjongg the tiles are scrambled and staked on top of
@@ -10502,7 +10502,7 @@ This package is part of the KDE games module.")
        ("python-twisted" ,python-twisted)
        ("python-pyqt" ,python-pyqt)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Classical Mah Jongg game for 4 players")
     (description "Kajongg is the ancient Chinese board game for 4 players.
@@ -10622,7 +10622,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Simple turn-based strategy game")
     (description "Konquest is the KDE version of Gnu-Lactic Konquest.  Players
@@ -10662,7 +10662,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Jezzball arcade game")
     (description "KBounce is a single player arcade game with the elements of
@@ -10701,7 +10701,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Single player falling blocks puzzle game")
     (description "KBlocks is the classic Tetris-like falling blocks game.
@@ -10745,7 +10745,7 @@ This package is part of the KDE games module.")
        ("glu" ,glu)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Sudoku puzzle game and solver")
     (description "KSudoku is a Sudoku game and solver, supporting a range of
@@ -10926,7 +10926,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Place 4 pieces in a row")
     (description "KFourInLine is a board game for two players based on the
@@ -10966,7 +10966,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Find atoms in a grid by shooting electrons")
     (description "KBlackbox is a game of hide and seek played on a grid of
@@ -11092,7 +11092,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Bomberman clone")
     (description "Granatier is a clone of the classic Bomberman game,
@@ -11129,7 +11129,7 @@ This package is part of the KDE games module.")
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (home-page "https://games.kde.org/")
     (synopsis "Computerized version of the well known strategy board game
@@ -11191,7 +11191,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("shared-mime-info" ,shared-mime-info)))
     (home-page "https://games.kde.org/")
     (synopsis "Jigsaw puzzle game")
@@ -11273,7 +11273,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Go board game")
     (description "Kigo is an open-source implementation of the popular Go
@@ -11319,7 +11319,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Game based on Rubik's Cube")
     (description "Kubrick is a game based on the Rubik's Cube puzzle.
@@ -11360,7 +11360,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Lieutnant Skat card game")
     (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and
@@ -11399,7 +11399,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Pac-Man clone")
     (description "Kapman is a clone of the well known game Pac-Man.
@@ -11439,7 +11439,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Two player game with shooting spaceships flying around a sun")
     (description "KSpaceduel is a space battle game for one or two players,
@@ -11473,7 +11473,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Classic pen and paper game: five in a line")
     (description "Bovo is a Gomoku (from Japanese 五目並べ - lit.  \"five
@@ -11555,7 +11555,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Snake race played against the computer")
     (description "KSnakeDuel is a fast action game where you steer a snake
@@ -11674,7 +11674,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Old reversi board game, also known as othello")
     (description "KReversi is a simple one player strategy game played
@@ -11753,7 +11753,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Simple tactical game for number-crunchers")
     (description "KJumpingcube is a simple tactical game for one or two
@@ -11917,7 +11917,7 @@ and chess engines.")
      `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtspeech" ,qtspeech)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (arguments
      `(#:tests? #f
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a0b43308e4..6270009651 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2287,7 +2287,7 @@ growing set of geoscientific methods.")
        ("qtkeychain" ,qtkeychain)
        ("qtlocation" ,qtlocation)
        ("qtserialport" ,qtserialport)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qwt" ,qwt)
        ;;("saga" ,saga)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 5003b3f9c4..a409e924b9 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1938,7 +1938,7 @@ Automated palette selection is supported.")
          ("qtbase" ,qtbase-5)
          ("qtkeychain" ,qtkeychain)
          ("qtmultimedia" ,qtmultimedia)
-         ("qtsvg" ,qtsvg)
+         ("qtsvg" ,qtsvg-5)
          ("qtx11extras" ,qtx11extras)))
       (home-page "https://drawpile.net")
       (synopsis "Collaborative drawing program")
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index f2bb3a1572..26207362bd 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1158,7 +1158,7 @@ substituted by matching images.")
          ("libpng" ,libpng)
          ("libtiff" ,libtiff)
          ("qtbase" ,qtbase-5)
-         ("qtsvg" ,qtsvg)
+         ("qtsvg" ,qtsvg-5)
          ("zlib" ,zlib)))
       (arguments
        `(#:phases
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index f01b6a614a..13e3b5d828 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -360,7 +360,7 @@ It supports JPEG, PNG and GIF formats.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("boost" ,boost)
        ("eigen" ,eigen)
@@ -528,7 +528,7 @@ For PDF support, install the @emph{mupdf} package.")
              #t)))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtimageformats" ,qtimageformats)))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
@@ -734,7 +734,7 @@ to set X desktop background.")
        ("python" ,python-wrapper)
        ("quazip" ,quazip)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qtlinguist" ,qttools)))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 00cf5acd73..6e7e1ef870 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1825,7 +1825,7 @@ parsing, viewing, modifying, and saving this metadata.")
      `(("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:tests? #f))                    ;no tests
     (home-page "https://github.com/flameshot-org/flameshot")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index a0a66e2811..e75e2b9469 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -133,7 +133,7 @@
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtscript" ,qtscript)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("snorenotify" ,snorenotify)
        ("zlib" ,zlib)))
     (home-page "https://quassel-irc.org/")
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index a6b221f09e..204a27f440 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -601,7 +601,7 @@ decentralized calling using P2P-DHT.")
      `(("libringclient" ,libringclient)
        ("network-manager" ,network-manager)
        ("qrencode" ,qrencode)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebengine" ,qtwebengine)
        ("qtwebchannel" ,qtwebchannel)
        ("qtmultimedia" ,qtmultimedia)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 7a3b6b26a8..6892be4743 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -716,7 +716,7 @@ infrastructure.")
        ("graphviz" ,graphviz)
        ("kiconthemes" ,kiconthemes)
        ("kparts" ,kparts)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("extra-cmake-modules" ,extra-cmake-modules)
@@ -892,7 +892,7 @@ or user activity.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ;; Run-time dependency
        ("qtgraphicaleffects" ,qtgraphicaleffects)))
     (home-page "https://community.kde.org/Frameworks")
@@ -2644,7 +2644,7 @@ window does not need focus for them to be activated.")
        ("kitemviews" ,kitemviews)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -3460,7 +3460,7 @@ setUrl, setUserAgent and call.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)))
     (arguments
@@ -3670,7 +3670,7 @@ workspace.")
        ("libsm" ,libsm)
        ("networkmanager-qt" ,networkmanager-qt)
        ("openssl" ,openssl)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
        ("qtx11extras" ,qtx11extras)))
     ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
@@ -3832,7 +3832,7 @@ support.")
      `(("ki18n" ,ki18n)
        ("kjs" ,kjs)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt")
     (description "KJSEmbed provides a method of binding Javascript objects to
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 21ca996246..95e96884d6 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -175,7 +175,7 @@ This package is part of the KDE multimedia module.")
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
        ("vlc" ,vlc)))
@@ -273,7 +273,7 @@ This package is part of the KDE multimedia module.")
        ("phonon" ,phonon)
        ("phonon-backend-gstreamer" ,phonon-backend-gstreamer)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("taglib" ,taglib)))
     (home-page "https://kde.org/applications/multimedia/org.kde.juk")
     (synopsis "Music jukebox / music player")
@@ -568,7 +568,7 @@ This package is part of the KDE multimedia module.")
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
        ("cairo" ,cairo)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("xcb-util" ,xcb-util)
        ("xcb-util-cursor" ,xcb-util-cursor)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 86f169e819..a0bd90c839 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -354,7 +354,7 @@ This package is part of the KDE administration module.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (home-page "https://www.kde.org/applications/system/yakuake/")
     (synopsis "Quad-style terminal emulator for KDE")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index a8cd156cf5..37d9e8674d 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -245,7 +245,7 @@ browser for easy news reading.")
          ("mlt" ,mlt)
          ("qtbase" ,qtbase-5)
          ("qtscript" ,qtscript)
-         ("qtsvg" ,qtsvg)
+         ("qtsvg" ,qtsvg-5)
          ("qtmultimedia" ,qtmultimedia)
          ("kparts" ,kparts)
          ("knotifications" ,knotifications)
@@ -446,7 +446,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
        ("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://invent.kde.org/graphics/kdiagram")
     (synopsis "Libraries for creating business diagrams")
     (description "This package provides libraries for integrating business
@@ -535,7 +535,7 @@ illustrate project schedules.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("quazip" ,quazip)
        ("zlib" ,zlib)))
@@ -573,7 +573,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
        ("kio" ,kio)
        ("ki18n" ,ki18n)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (home-page "https://apps.kde.org/en/massif-visualizer")
     (synopsis "Visualize massif data generated by Valgrind")
@@ -833,7 +833,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("shared-mime-info" ,shared-mime-info)
        ;; Optional.
        ("cfitsio" ,cfitsio)
@@ -993,7 +993,7 @@ Python, PHP, and Perl.")
        ("openal" ,openal)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Runtime library for kdegames")
     (description "Runtime library for kdegames")
@@ -1055,7 +1055,7 @@ Python, PHP, and Perl.")
        ("poppler-qt5" ,poppler-qt5)
        ("qca" ,qca)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("threadweaver" ,threadweaver)
        ("kcrash" ,kcrash)
        ("kjs" ,kjs)))
@@ -1196,7 +1196,7 @@ or Bonjour by other projects).")
      `(("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:tests? #f))  ;; 4/17 fail
     (home-page "https://api.kde.org/frameworks/kuserfeedback/html/")
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 1c60e767b0..49f0caf7a6 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -865,7 +865,7 @@ and video calls or instant messaging capabilities to an application.")
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (synopsis "Desktop client for the Linphone SIP softphone")
     (description "Linphone is a SIP softphone for voice and video over IP calling
 (VoIP) and instant messaging.  Amongst its features are:
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 2318398b91..ae8c22f845 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -185,7 +185,7 @@ itself as well as other components maintained by the LXQt project.")
      ;; required by Qt5XdgIconLoader.pc
      `(("glib" ,glib)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("pkg-config" ,pkg-config)))
@@ -230,7 +230,7 @@ in Qt.")
        ("libqtxdg" ,libqtxdg)
        ("libxscrnsaver" ,libxscrnsaver)
        ("polkit-qt" ,polkit-qt)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -284,7 +284,7 @@ and memory usage or network traffic.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -327,7 +327,7 @@ LXQt and the system it's running on.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("polkit-qt" ,polkit-qt)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -377,7 +377,7 @@ the operating system LXQt is running on.")
        ("libxcursor" ,libxcursor)
        ("libxi" ,libxi)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
        ("xf86-input-libinput" ,xf86-input-libinput)
@@ -443,7 +443,7 @@ configuration of both LXQt and the underlying operating system.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -491,7 +491,7 @@ as a whole and are not limited to distinct applications.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -537,7 +537,7 @@ according to the Desktop Notifications Specification.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -588,7 +588,7 @@ of other programs.")
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
        ("xcb-util" ,xcb-util)
@@ -653,7 +653,7 @@ of other programs.")
        ("pcre" ,pcre)
        ("polkit-qt" ,polkit-qt)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -701,7 +701,7 @@ LXQt.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)))
     (native-inputs
@@ -749,7 +749,7 @@ when laptop batteries are low on power.")
        ("libfm-qt" ,libfm-qt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -790,7 +790,7 @@ Qt with LXQt.")
        ("muparser" ,muparser)
        ("pcre" ,pcre)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -837,7 +837,7 @@ allows for launching applications or shutting down the system.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("xdg-user-dirs" ,xdg-user-dirs)))
     (native-inputs
@@ -907,7 +907,7 @@ for the LXQt desktop environment.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("sudo" ,sudo)))
     (native-inputs
@@ -1096,7 +1096,7 @@ manager Compton.")
      `(("libexif" ,libexif)
        ("libfm-qt" ,libfm-qt)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1273,7 +1273,7 @@ QTermWidget.")
      `(("kwindowsystem" ,kwindowsystem)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1338,7 +1338,7 @@ like @command{tar} and @command{zip}.")
       (inputs
         `(("kwindowsystem" ,kwindowsystem)
           ("qtbase" ,qtbase-5)
-          ("qtsvg" ,qtsvg)
+          ("qtsvg" ,qtsvg-5)
           ("liblxqt" ,liblxqt)
           ("qtx11extras" ,qtx11extras)
           ("libqtxdg" ,libqtxdg)))
@@ -1389,7 +1389,7 @@ desktop.")
        ;; Base
        ;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it
        ;; should be added to their propagated-inputs?
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ;; Core
        ("lxqt-about" ,lxqt-about)
        ("lxqt-admin" ,lxqt-admin)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d48313b1ed..8be6d19cfc 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2326,7 +2326,7 @@ ASCII text files using Gmsh's own scripting language.")
        ("python-h5py" ,python-h5py) ;optional, for HDF5 data
        ("python-pyqt" ,python-pyqt)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (propagated-inputs
      `(("python-numpy" ,python-numpy)))
     (home-page "https://veusz.github.io/")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 71c9144ddf..d359b1ec20 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -180,7 +180,7 @@
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras)
        ("x11" ,libx11)
@@ -1605,7 +1605,7 @@ instant messenger with audio and video chat capabilities.")
        ("openal" ,openal)
        ("qrencode" ,qrencode)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("sqlcipher" ,sqlcipher)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -2334,7 +2334,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("spdlog" ,spdlog)
        ("tweeny" ,tweeny)
        ("zlib" ,zlib)))
@@ -2387,7 +2387,7 @@ There is support for:
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
        ("xdg-utils" ,xdg-utils)))
     (arguments
@@ -2854,7 +2854,7 @@ social and chat platform.")
        ("qtbase" ,qtbase-5)
        ("qtkeychain" ,qtkeychain)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("usrsctp" ,usrsctp)
        ("x11" ,libx11)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index c69beb9266..36311061bb 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -449,7 +449,7 @@ support")
        ("mpg123" ,mpg123)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("taglib" ,taglib)
        ("zlib" ,zlib)))
     (synopsis "Graphical MPD Client")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f4d2cfff90..2420f91282 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2718,7 +2718,7 @@ browser.")
              #t)))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
        ("alsa-lib" ,alsa-lib)))
     (native-inputs
@@ -2766,7 +2766,7 @@ backends, including ALSA, OSS, Network and FluidSynth.")
     (inputs
      `(("drumstick" ,drumstick)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("libxslt" ,libxslt) ;for xsltproc
@@ -4746,7 +4746,7 @@ standalone JACK client and an LV2 plugin is also available.")
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtscript" ,qtscript)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -4823,7 +4823,7 @@ sample library.")
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio) ; required by rtaudio
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("rtaudio" ,rtaudio)
        ("rubberband" ,rubberband)))
     (native-inputs
@@ -5503,7 +5503,7 @@ discard bad quality ones.
        ("portaudio" ,portaudio)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("hicolor-icon-theme" ,hicolor-icon-theme)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6cfaa5e803..3b2baf96a5 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1474,7 +1474,7 @@ of the same name.")
        ("krb5" ,mit-krb5)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("sbc" ,sbc)
        ("snappy" ,snappy)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm
index bedbad7e60..be2bb7b192 100644
--- a/gnu/packages/orange.scm
+++ b/gnu/packages/orange.scm
@@ -178,7 +178,7 @@ GUI based workflow.  It is primarily used in the Orange framework.")
        ("python-xlrd" ,python-xlrd)
        ("python-xlsxwriter" ,python-xlsxwriter)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("xdg-utils" ,xdg-utils)))
     (home-page "https://orangedatamining.com/")
     (synopsis "Component-based data mining framework")
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 0e658cefd8..ba58f26b79 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -161,7 +161,7 @@ human.")
        ("libxtst" ,libxtst)
        ("qrencode" ,qrencode)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("quazip" ,quazip)               ; XC_KEESHARE
        ("readline" ,readline)
@@ -698,7 +698,7 @@ key URIs using the standard otpauth:// scheme.")
      `(("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "https://qtpass.org")
     (synopsis "GUI for password manager password-store")
     (description
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9298332940..a07df23c4d 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -848,7 +848,7 @@ program capable of converting PDF into other formats.")
        ("libspectre" ,libspectre)
        ("poppler-qt5" ,poppler-qt5)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:imported-modules ((guix build qt-build-system)
                            (guix build cmake-build-system)
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index f78923966c..4411060f94 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -58,7 +58,7 @@
     (inputs
      `(("libusb" ,libusb)
        ("qt" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qmake" ,qtbase-5)))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 58934d736e..5ebdb17add 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -189,7 +189,7 @@
      `(("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (synopsis "Qt5 Configuration Tool")
     (description "Qt5CT is a program that allows users to configure Qt5
 settings (such as icons, themes, and fonts) in desktop environments or
@@ -704,12 +704,36 @@ developers using C++ or QML, a CSS & JavaScript like language.")
             (files '("etc/xdg")))))))
  
 (define-public qtsvg
-  (package (inherit qtbase)
+  (package
     (name "qtsvg")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (qt5-urls name version))
+              (sha256
+               (base32
+                "06dpr0xlmk21416fl6gxqwwzkla8i76avgmm39x3n1wkikwsxlsx"))))
+    (propagated-inputs `())
+    (native-inputs `(("perl" ,perl)))
+    (inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("mesa" ,mesa)
+       ("qtbase" ,qtbase)
+       ("zlib" ,zlib)))
+    (build-system cmake-build-system)
+    (home-page "https://www.qt.io")
+    (synopsis "Qt module for displaying SVGs")
+    (description "The QtSvg module provides classes for displaying the
+ contents of SVG files.")
+    (license (list license:lgpl2.1 license:lgpl3))))
+
+(define-public qtsvg-5
+  (package (inherit qtbase-5)
+    (name "qtsvg-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtsvg" version))
              (sha256
               (base32
                "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
@@ -725,7 +749,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
          (add-before 'configure 'configure-qmake
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-                    (qtbase (assoc-ref inputs "qtbase"))
+                    (qtbase (assoc-ref inputs "qtbase-5"))
                     (tmpdir (string-append (getenv "TMPDIR")))
                     (qmake (string-append tmpdir "/qmake"))
                     (qt.conf (string-append tmpdir "/qt.conf")))
@@ -776,7 +800,7 @@ HostData=lib/qt5
  contents of SVG files.")))
 
 (define-public qtimageformats
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtimageformats")
     (version "5.15.2")
     (source (origin
@@ -791,7 +815,7 @@ HostData=lib/qt5
                  (delete-file-recursively "src/3rdparty")
                  #t))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'unpack 'fix-build
@@ -814,7 +838,7 @@ HostData=lib/qt5
 support for MNG, TGA, TIFF and WBMP image formats.")))
 
 (define-public qtx11extras
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtx11extras")
     (version "5.15.2")
     (source (origin
@@ -824,7 +848,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
               (base32
                "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs `(("perl" ,perl)))
     (inputs
@@ -835,7 +859,7 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
 from within Qt 5.")))
 
 (define-public qtxmlpatterns
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
     (version "5.15.2")
     (source (origin
@@ -845,7 +869,7 @@ from within Qt 5.")))
               (base32
                "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f) ; TODO: Enable the tests
        ((#:phases phases)
         `(modify-phases ,phases
@@ -863,7 +887,7 @@ XML and custom data models.  It contains programs such as xmlpatterns and
 xmlpatternsvalidator.")))
 
 (define-public qtdeclarative
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtdeclarative")
     (version "5.15.2")
     (source (origin
@@ -873,7 +897,7 @@ xmlpatternsvalidator.")))
               (base32
                "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ;TODO: Enable the tests
        ((#:phases phases)
         `(modify-phases ,phases
@@ -891,7 +915,7 @@ xmlpatternsvalidator.")))
        ("pkg-config" ,pkg-config)
        ("python" ,python)
        ("python-wrapper" ,python-wrapper)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("vulkan-headers" ,vulkan-headers)))
     (inputs
      `(("mesa" ,mesa)
@@ -904,7 +928,7 @@ developers to extend the QML language with custom types and integrate QML code
 with JavaScript and C++.")))
 
 (define-public qtconnectivity
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtconnectivity")
     (version "5.15.2")
     (source (origin
@@ -925,7 +949,7 @@ with JavaScript and C++.")))
 with Bluetooth and NFC.")))
 
 (define-public qtwebsockets
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtwebsockets")
     (version "5.15.2")
     (source (origin
@@ -935,7 +959,7 @@ with Bluetooth and NFC.")))
               (base32
                "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
@@ -949,7 +973,7 @@ to act as a server that can process WebSocket requests, or a client that can
 consume data received from the server, or both.")))
 
 (define-public qtsensors
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtsensors")
     (version "5.15.2")
     (source (origin
@@ -959,7 +983,7 @@ consume data received from the server, or both.")))
               (base32
                "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:parallel-tests? _ #f) #f) ; can lead to race condition
        ((#:phases phases)
         `(modify-phases ,phases
@@ -979,7 +1003,7 @@ and C++ interfaces.  The Qt Sensors API also provides a motion gesture
 recognition API for devices.")))
 
 (define-public qtmultimedia
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtmultimedia")
     (version "5.15.2")
     (source (origin
@@ -998,7 +1022,7 @@ recognition API for devices.")))
                    (("spectrum") "#"))
                  #t))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (replace 'configure
@@ -1027,7 +1051,7 @@ record media, and manage a collection of media content.  It also contains a
 set of plugins for interacting with pulseaudio and GStreamer.")))
 
 (define-public qtwayland
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtwayland")
     (version "5.15.2")
     (source (origin
@@ -1037,7 +1061,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
               (base32
                "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'unpack 'disable-failing-tests
@@ -1079,7 +1103,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
 compositor libraries.")))
 
 (define-public qtserialport
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtserialport")
     (version "5.15.2")
     (source (origin
@@ -1093,7 +1117,7 @@ compositor libraries.")))
      `(("qtbase" ,qtbase-5)
        ("eudev" ,eudev)))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'unpack 'patch-dlopen-paths
@@ -1110,7 +1134,7 @@ compositor libraries.")))
 interacting with serial ports from within Qt.")))
 
 (define-public qtserialbus
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtserialbus")
     (version "5.15.2")
     (source (origin
@@ -1120,7 +1144,7 @@ interacting with serial ports from within Qt.")))
               (base32
                "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
            (add-after 'unpack 'patch-libsocketcan-reference
@@ -1142,7 +1166,7 @@ access the various industrial serial buses and protocols, such as CAN, ModBus,
 and others.")))
 
 (define-public qtwebchannel
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtwebchannel")
     (version "5.15.2")
     (source (origin
@@ -1163,7 +1187,7 @@ application).  The transport mechanism is supported out of the box by the two
 popular web engines, Qt WebKit 2 and Qt WebEngine.")))
 
 (define-public qtwebglplugin
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtwebglplugin")
     (version "5.15.2")
     (source (origin
@@ -1173,7 +1197,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
               (base32
                "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'unpack 'disable-network-tests
@@ -1196,7 +1220,7 @@ compatible web browser without the use of plug-ins.  The API is similar to
 OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
 
 (define-public qtwebview
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtwebview")
     (version "5.15.2")
     (source (origin
@@ -1216,7 +1240,7 @@ application without necessarily including a full web browser stack by using
 native APIs where it makes sense.")))
 
 (define-public qtlocation
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtlocation")
     (version "5.15.2")
     (source (origin
@@ -1229,7 +1253,7 @@ native APIs where it makes sense.")))
               (base32
                "184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
@@ -1246,7 +1270,7 @@ native APIs where it makes sense.")))
 positioning and geolocation plugins.")))
 
 (define-public qttools
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qttools")
     (version "5.15.2")
     (source (origin
@@ -1256,7 +1280,7 @@ positioning and geolocation plugins.")))
               (base32
                "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
@@ -1271,7 +1295,7 @@ the documentation, translate applications, generate help files and other stuff
 that helps in Qt development.")))
 
 (define-public qtscript
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtscript")
     (version "5.15.2")
     (source (origin
@@ -1292,7 +1316,7 @@ The following guides and references cover aspects of programming with
 ECMAScript and Qt.")))
 
 (define-public qtquickcontrols
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtquickcontrols")
     (version "5.15.2")
     (source (origin
@@ -1302,7 +1326,7 @@ ECMAScript and Qt.")))
               (base32
                "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
@@ -1313,7 +1337,7 @@ applications scriptable.  This module provides a set of extra components that
 can be used to build complete interfaces in Qt Quick.")))
 
 (define-public qtquickcontrols2
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtquickcontrols2")
     (version "5.15.2")
     (source (origin
@@ -1323,7 +1347,7 @@ can be used to build complete interfaces in Qt Quick.")))
               (base32
                "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
@@ -1335,7 +1359,7 @@ and tray icons.  It falls back to Qt Widgets when a native implementation is
 not available.")))
 
 (define-public qtgraphicaleffects
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtgraphicaleffects")
     (version "5.15.2")
     (source (origin
@@ -1345,7 +1369,7 @@ not available.")))
               (base32
                "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
@@ -1359,7 +1383,7 @@ types.  The effects cover functional areas such as blending, masking, blurring,
 coloring, and many more.")))
 
 (define-public qtgamepad
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtgamepad")
     (version "5.15.2")
     (source (origin
@@ -1386,7 +1410,7 @@ primary target audience are embedded devices with fullscreen user interfaces,
 and mobile applications targeting TV-like form factors.")))
 
 (define-public qtscxml
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtscxml")
     (version "5.15.2")
     (source (origin
@@ -1414,7 +1438,7 @@ generating a C++ file that has a class implementing the state machine.  It
 also contains functionality to support data models and executable content.")))
 
 (define-public qtpurchasing
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtpurchasing")
     (version "5.15.2")
     (source (origin
@@ -1431,7 +1455,7 @@ also contains functionality to support data models and executable content.")))
 purchasing goods and services.")))
 
 (define-public qtcharts
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtcharts")
     (version "5.15.2")
     (source (origin
@@ -1441,7 +1465,7 @@ purchasing goods and services.")))
               (base32
                "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
@@ -1455,7 +1479,7 @@ selecting one of the charts themes.")
     (license license:gpl3)))
 
 (define-public qtdatavis3d
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtdatavis3d")
     (version "5.15.2")
     (source (origin
@@ -1465,7 +1489,7 @@ selecting one of the charts themes.")
               (base32
                "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
@@ -1479,7 +1503,7 @@ customized by using themes or by adding custom items and labels to them.")
     (license license:gpl3)))
 
 (define-public qtnetworkauth
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtnetworkauth")
     (version "5.15.2")
     (source (origin
@@ -1489,7 +1513,7 @@ customized by using themes or by adding custom items and labels to them.")
               (base32
                "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'unpack 'remove-failing-test
@@ -1505,7 +1529,7 @@ customized by using themes or by adding custom items and labels to them.")
 implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
 
 (define-public qtremoteobjects
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtremoteobjects")
     (version "5.15.2")
     (source (origin
@@ -1515,7 +1539,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
               (base32
                "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-after 'unpack 'remove-failing-test
@@ -1539,7 +1563,7 @@ Qt's functionalities to enable an easy exchange of information between
 processes or computers.")))
 
 (define-public qtspeech
-  (package (inherit qtsvg)
+  (package (inherit qtsvg-5)
     (name "qtspeech")
     (version "5.15.2")
     (source (origin
@@ -1550,7 +1574,7 @@ processes or computers.")))
                "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
 
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)))
@@ -1600,7 +1624,7 @@ using the Enchant spell-checking library.")
 
 (define-public qtwebengine
   (package
-    (inherit qtsvg)
+    (inherit qtsvg-5)
     (name "qtwebengine")
     (version (package-version qtbase))
     (source
@@ -1893,7 +1917,7 @@ using the Enchant spell-checking library.")
        ("vulkan-headers" ,vulkan-headers)
        ("xcb-util" ,xcb-util)))
     (arguments
-     (substitute-keyword-arguments (package-arguments qtsvg)
+     (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-before 'configure 'substitute-source
@@ -2065,7 +2089,7 @@ module provides support functions to the automatically generated code.")
        ("qtmultimedia" ,qtmultimedia)
        ("qtsensors" ,qtsensors)
        ("qtserialport" ,qtserialport)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebkit" ,qtwebkit)
@@ -2170,7 +2194,7 @@ contain over 620 classes.")
        ("python-sip" ,python-sip)
        ("python-pyqt" ,python-pyqt)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtdeclarative" ,qtdeclarative)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
@@ -2558,7 +2582,7 @@ that can be only started once per user.
   (build-system gnu-build-system)
   (inputs
    `(("qtbase" ,qtbase-5)
-     ("qtsvg" ,qtsvg)
+     ("qtsvg" ,qtsvg-5)
      ("qttools" ,qttools)))
   (arguments
    `(#:phases
@@ -2880,7 +2904,7 @@ color-related widgets.")
        ("qtscxml" ,qtscxml)
        ("qtsensors" ,qtsensors)
        ("qtspeech" ,qtspeech)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebsockets" ,qtwebsockets)
        ("qtx11extras" ,qtx11extras)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index fcaf9bb20d..43638082f2 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -650,7 +650,7 @@ to the fix block above.
        ("portaudio" ,portaudio)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("volk" ,volk)))
     (arguments
      `(#:tests? #f))                    ; no tests
@@ -1493,7 +1493,7 @@ Compatible hardware/software:
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qwt" ,qwt)
        ("speexdsp" ,speexdsp)
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index 87dcc6f890..3a0b7165cd 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -108,7 +108,7 @@ hundred times faster than real-time.")
          ("enki" ,enki)
          ("protobuf" ,protobuf-3.5)               ;for logging
          ("qtbase" ,qtbase-5)
-         ("qtsvg" ,qtsvg)
+         ("qtsvg" ,qtsvg-5)
          ("qttools" ,qttools)              ;for libQt5Help, needed by "studio"
          ("qtwebkit" ,qtwebkit)
          ("qtx11extras" ,qtx11extras)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index c85b4f801c..66339c5bf1 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -198,7 +198,7 @@
        ("qtkeychain" ,qtkeychain)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsolutions" ,qtsolutions)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebsockets" ,qtwebsockets)
        ("qtwebkit" ,qtwebkit)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 788e05632c..34e1b21af6 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -644,7 +644,7 @@ address of one of the participants.")
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("speech-dispatcher" ,speech-dispatcher)
        ("speex" ,speex) ; avoid bundled
        ("speexdsp" ,speexdsp))) ; avoid bundled
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index da19a57e59..6e7609fafa 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6607,7 +6607,7 @@ and Karl Berry.")
        ("mythes" ,mythes)
        ("python" ,python)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (propagated-inputs
      `(("texlive" ,(texlive-union (list texlive-fonts-ec)))))
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 844f30d35c..71cf6edacb 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -621,7 +621,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)))
     (propagated-inputs                  ; To get native-search-path
      `(("qtwebengine" ,qtwebengine)))
@@ -724,7 +724,7 @@ environment with Markdown markup.")
        ("python-lxml" ,python-lxml)
        ("python-markdown" ,python-markdown)
        ("python-pyqt" ,python-pyqt)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (home-page "http://www.theologeek.ch/manuskript/")
     (synopsis "Tool for writers")
     (description "Manuskript provides a rich environment to help
@@ -824,7 +824,7 @@ editors.")
        ("perl" ,perl)
        ("python" ,python-wrapper)
        ("qt" ,qtbase-5)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:tests? #f                      ; no check target
        #:phases
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6b27a71de1..b5a0f669dc 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1828,7 +1828,7 @@ videoformats depend on the configuration flags of ffmpeg.")
        ("protobuf" ,protobuf)
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("samba" ,samba)
        ("sdl" ,sdl)
@@ -2998,7 +2998,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
        ("libsamplerate" ,libsamplerate)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("sdl" ,sdl)
        ("sox" ,sox)))
     (native-inputs
@@ -3132,7 +3132,7 @@ be used for realtime video capture via Linux-specific APIs.")
        ("mesa" ,mesa)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtsvg" ,qtsvg)
+       ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("speexdsp" ,speexdsp)
        ("v4l-utils" ,v4l-utils)
@@ -4529,7 +4529,7 @@ API.  It includes bindings for Python, Ruby, and other languages.")
        ("python-pyqt" ,python-pyqt)
        ("python-pyzmq" ,python-pyzmq)
        ("python-requests" ,python-requests)
-       ("qtsvg" ,qtsvg)))
+       ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:modules ((guix build python-build-system)
                   (guix build qt-utils)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 04cf3a1a60..64dc326127 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -469,7 +469,7 @@ access.")
          ("openssl" ,openssl)
          ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia)
-         ("qtsvg" ,qtsvg)))
+         ("qtsvg" ,qtsvg-5)))
       (home-page "https://kristall.random-projects.net")
       (synopsis "Small-internet graphical client")
       (description "Graphical small-internet client with with many features
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5e1954788d..2361d31241 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -319,7 +319,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
   (inputs
    `(("qtbase" ,qtbase-5)
      ("qtscript" ,qtscript)
-     ("qtsvg" ,qtsvg)
+     ("qtsvg" ,qtsvg-5)
      ("qtx11extras" ,qtx11extras)))
   (synopsis "Clipboard manager with advanced features")
   (description "CopyQ is clipboard manager with editing and scripting
-- 
2.31.1

From 49ae1c34a8a7b975b9e37b816d7cc903461ffa25 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 15:50:56 -0500
Subject: [PATCH 05/37] gnu: qtimageformat: Update to 6.1.0

* gnu/packages/qt.scm (qtimageformat): Update to 6.1.0.
* gnu/packages/qt.scm (qtimageformat-5): New variable.
---
 gnu/packages/image-viewers.scm |  2 +-
 gnu/packages/qt.scm            | 43 ++++++++++++++++++++++++++++++++--
 gnu/packages/telegram.scm      |  2 +-
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 13e3b5d828..650f81330a 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -529,7 +529,7 @@ For PDF support, install the @emph{mupdf} package.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtimageformats" ,qtimageformats)))
+       ("qtimageformats" ,qtimageformats-5)))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
     (description "qView is a Qt image viewer designed with visually
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5ebdb17add..fe5fa35340 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -800,12 +800,51 @@ HostData=lib/qt5
  contents of SVG files.")))
 
 (define-public qtimageformats
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtimageformats")
+    (version "6.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtimageformats" version))
+             (sha256
+              (base32
+               "0njp526ixn7xzbqc5a289qj57yrf00qpvcx42g65s30xsf33gril"))
+             (modules '((guix build utils)))
+             (snippet
+              '(begin
+                 (delete-file-recursively "src/3rdparty")
+                 #t))))
+    (build-system cmake-build-system)
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'fix-build
+             (lambda _
+               (substitute* "src/plugins/imageformats/jp2/qjp2handler.cpp"
+                 (("^#include <jasper/jasper.h>")
+                  "#include <jasper/jasper.h>\n#include <QtCore/qmath.h>"))
+               #t))))))
+    (native-inputs `())
+    (inputs
+     `(("jasper" ,jasper)
+       ("libmng" ,libmng)
+       ("libtiff" ,libtiff)
+       ("libwebp" ,libwebp)
+       ("mesa" ,mesa)
+       ("qtbase" ,qtbase)
+       ("zlib" ,zlib)))
+    (synopsis "Additional Image Format plugins for Qt")
+    (description "The QtImageFormats module contains plugins for adding
+support for MNG, TGA, TIFF and WBMP image formats.")))
+
+(define-public qtimageformats-5
+  (package (inherit qtsvg-5)
+    (name "qtimageformats-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtimageformats" version))
              (sha256
               (base32
                "1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index a1822b3892..e787615468 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -540,7 +540,7 @@ Telegram project, for its use in telegram desktop client.")
        ("qrcodegen" ,qrcodegen-cpp)
        ("qt" ,qtbase-5)
        ("qt5ct" ,qt5ct)
-       ("qtimageformats" ,qtimageformats)
+       ("qtimageformats" ,qtimageformats-5)
        ("qtwayland" ,qtwayland)
        ("range-v3" ,range-v3)
        ("rlottie" ,rlottie-for-telegram-desktop)
-- 
2.31.1

From dcc84737d694faf76b6f1d68c14dbf298d964acd Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 16:07:50 -0500
Subject: [PATCH 06/37] gnu: qtx11extras: Remove variable.

* gnu/packages/qt.scm (qtx11extras): Remove variable.
* gnu/packages/qt.scm (qtx11extras-5): New variable.
---
 gnu/packages/aidc.scm            |  2 +-
 gnu/packages/audio.scm           |  4 +--
 gnu/packages/documentation.scm   |  2 +-
 gnu/packages/education.scm       |  2 +-
 gnu/packages/engineering.scm     |  2 +-
 gnu/packages/fcitx5.scm          |  2 +-
 gnu/packages/graphics.scm        |  2 +-
 gnu/packages/gstreamer.scm       |  2 +-
 gnu/packages/kde-frameworks.scm  | 28 +++++++++----------
 gnu/packages/kde-multimedia.scm  |  8 +++---
 gnu/packages/kde-pim.scm         |  2 +-
 gnu/packages/kde-plasma.scm      |  8 +++---
 gnu/packages/kde-systemtools.scm |  4 +--
 gnu/packages/kde-utils.scm       |  2 +-
 gnu/packages/kde.scm             |  4 +--
 gnu/packages/lxqt.scm            | 48 ++++++++++++++++----------------
 gnu/packages/messaging.scm       |  4 +--
 gnu/packages/music.scm           | 10 +++----
 gnu/packages/password-utils.scm  |  2 +-
 gnu/packages/qt.scm              | 10 +++----
 gnu/packages/robotics.scm        |  2 +-
 gnu/packages/video.scm           |  6 ++--
 gnu/packages/xdisorg.scm         |  2 +-
 gnu/packages/xorg.scm            |  2 +-
 24 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 3db631d92e..35985b1869 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -196,7 +196,7 @@ C/C++ programs to use its capabilities without restrictions or overhead.")
        ("libjpeg" ,libjpeg-turbo)
        ("python" ,python)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("v4l-utils" ,v4l-utils)))
     (synopsis "Bar code reader")
     (description
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 7b83d4f162..8045ad0d7b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2734,7 +2734,7 @@ different audio devices such as ALSA or PulseAudio.")
        ("alsa-lib" ,alsa-lib)
        ("portaudio" ,portaudio)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -3559,7 +3559,7 @@ interface.")
     (inputs
      `(("fluidsynth" ,fluidsynth)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://qsynth.sourceforge.io")
     (synopsis "Graphical user interface for FluidSynth")
     (description
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 19190f4480..a2f817d728 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -335,7 +335,7 @@ local system.")
          ("qtwebchannel" ,qtwebchannel)
          ("qtwebengine" ,qtwebengine)
          ("qtquickcontrols" ,qtquickcontrols)
-         ("qtx11extras" ,qtx11extras)
+         ("qtx11extras" ,qtx11extras-5)
          ("xcb-util-keyms" ,xcb-util-keysyms)))
       (home-page "https://zealdocs.org/")
       (synopsis "Offline documentation browser inspired by Dash")
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 1fe0fb40d0..ae1c68fcb9 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -715,7 +715,7 @@ language and very flexible regarding to new or unknown keyboard layouts.")
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (home-page "https://edu.kde.org/ktouch/")
     (synopsis "Touch typing tutor")
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 4d6a2aa432..a3ab2cdb9f 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2423,7 +2423,7 @@ comments.")))
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("sqlite" ,sqlite)
        ("tbb" ,tbb)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 9e0bc4ab21..310ba2207f 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -364,7 +364,7 @@ including input methods previous bundled inside Fcitx 4:
      `(("fcitx5" ,fcitx5)
        ("fcitx5-qt" ,fcitx5-qt)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("kitemviews" ,kitemviews)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("libx11" ,libx11)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index a409e924b9..8adb793225 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1939,7 +1939,7 @@ Automated palette selection is supported.")
          ("qtkeychain" ,qtkeychain)
          ("qtmultimedia" ,qtmultimedia)
          ("qtsvg" ,qtsvg-5)
-         ("qtx11extras" ,qtx11extras)))
+         ("qtx11extras" ,qtx11extras-5)))
       (home-page "https://drawpile.net")
       (synopsis "Collaborative drawing program")
       (description "Drawpile is a drawing program that allows share the canvas
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 3047773e0f..cca892c77f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -769,7 +769,7 @@ model to base your own plug-in on, here it is.")
        ("orc" ,orc)
        ;("qtbase" ,qtbase-5)
        ;("qtdeclarative" ,qtdeclarative)
-       ;("qtx11extras" ,qtx11extras)
+       ;("qtx11extras" ,qtx11extras-5)
        ("soundtouch" ,soundtouch)
        ;; GStreamer is not yet compatible with srt > 1.4.1.
        ("srt" ,srt-1.4.1)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6892be4743..d772615d70 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -207,7 +207,7 @@ common build settings used in software produced by the KDE community.")
      `(("qtbase" ,qtbase-5)
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
        ("libxml2" ,libxml2)))
@@ -645,7 +645,7 @@ many more.")
        ("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("kinit" ,kinit-bootstrap))) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
     (arguments
      `(#:phases
@@ -750,7 +750,7 @@ replace the other outdated Graphviz tools.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Utilities for graphical user interfaces")
     (description "The KDE GUI addons provide utilities for graphical user
@@ -855,7 +855,7 @@ translation scripting.")
     (inputs
      `(("libxscrnsaver" ,libxscrnsaver) ; X-Screensaver based poller, fallback mode
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Reporting of idle time of user and system")
     (description "KIdleTime is a singleton reporting information on idle time.
@@ -1158,7 +1158,7 @@ configuration pages, message boxes, and password requests.")
     (inputs
      `(("libxrender" ,libxrender)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("xcb-utils-keysyms" ,xcb-util-keysyms)
        ("xcb-util-wm" ,xcb-util-wm)))
     (arguments
@@ -1673,7 +1673,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca.
      `(("kcoreaddons" ,kcoreaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Graceful handling of application crashes")
     (description "KCrash provides support for intercepting and handling
@@ -1866,7 +1866,7 @@ formats.")
      `(("kcoreaddons" ,kcoreaddons)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Widgets for showing progress of asynchronous jobs")
     (description "KJobWIdgets provides widgets for showing progress of
@@ -1901,7 +1901,7 @@ asynchronous jobs.")
        ("qtspeech" ,qtspeech)
        ;; TODO: Think about adding dbusmenu-qt5 from
        ;; https://launchpad.net/libdbusmenu-qt
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2606,7 +2606,7 @@ emoticons coming from different providers.")
        ("kwindowsystem" ,kwindowsystem)
        ("libxcb" ,libxcb)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("xcb-util-keysyms" ,xcb-util-keysyms)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Global desktop keyboard shortcuts")
@@ -2783,7 +2783,7 @@ consumption.")
        ("libxslt" ,libxslt)
        ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:tests? #f ; FIXME: 41/50 tests fail.
@@ -3461,7 +3461,7 @@ setUrl, setUserAgent and call.")
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)))
     (arguments
      `(#:tests? #f ; FIXME: 9/15 tests fail.
@@ -3583,7 +3583,7 @@ need.")
        ("kpackage" ,kpackage)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -3672,7 +3672,7 @@ workspace.")
        ("openssl" ,openssl)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
     ;; share/kf5/kssl/ca-bundle.crt
     ;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include"
@@ -3765,7 +3765,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
        ("openssl" ,openssl)
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("sonnet" ,sonnet)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 HTML widget and component")
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 95e96884d6..d81ba425d1 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -176,7 +176,7 @@ This package is part of the KDE multimedia module.")
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
        ("vlc" ,vlc)))
     (arguments
@@ -415,7 +415,7 @@ available CD drives.")
        ("libxscrnsaver" ,libxscrnsaver)
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)
        ("v4l-utils" ,v4l-utils) ; libdvbv5
        ("vlc" ,vlc)))
@@ -473,7 +473,7 @@ autoloading of subtitle files for use while playing video.")
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (arguments
      `(#:tests? #f ; test program gets built, but is not found
        #:configure-flags
@@ -569,7 +569,7 @@ This package is part of the KDE multimedia module.")
        ("qtbase" ,qtbase-5)
        ("cairo" ,cairo)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("xcb-util" ,xcb-util)
        ("xcb-util-cursor" ,xcb-util-cursor)
        ("xcb-util-errors" ,xcb-util-errors)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index db73941b42..f7ccd330f1 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1476,7 +1476,7 @@ information in non-ASCII character sets.")
        ("libkdepim" ,libkdepim)
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://kontact.kde.org/components/knotes.html")
     (synopsis "Note-taking utility")
     (description "KNotes lets you write the computer equivalent of sticky
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index b7a2b14f65..237459e7c0 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -76,7 +76,7 @@
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative) ; optional
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://invent.kde.org/plasma/breeze")
     (synopsis "Default KDE Plasma theme")
     (description "Artwork, styles and assets for the Breeze visual style for
@@ -192,7 +192,7 @@ call it if it is not associated to a terminal.")
        ("logind" ,elogind)        ;optional loginctl support
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)
        ("wayland" ,wayland)
        ("xcb-util-keysyms" ,xcb-util-keysyms)))
@@ -222,7 +222,7 @@ call it if it is not associated to a terminal.")
      `(("kwayland" ,kwayland)
        ("libxrandr" ,libxrandr)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (arguments
      '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
     (home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
@@ -265,7 +265,7 @@ basic needs and easy to configure for those who want special setups.")
        ("qtdeclarative" ,qtdeclarative)
        ("qtscript" ,qtscript)
        ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("plasma" ,plasma-framework)
        ("zlib" ,zlib)))
     (build-system qt-build-system)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index a0bd90c839..e951031e18 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -263,7 +263,7 @@ This package is part of the KDE base applications module.")
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("pipewire" ,pipewire)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("xcb-util-image" ,xcb-util-image)
        ("zlib" ,zlib)))
     (home-page "https://kde.org/applications/internet/org.kde.krfb")
@@ -355,7 +355,7 @@ This package is part of the KDE administration module.")
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://www.kde.org/applications/system/yakuake/")
     (synopsis "Quad-style terminal emulator for KDE")
     (description "Yakuake is a drop-down terminal emulator based on KDE Konsole
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 40267c6e91..c586f6f866 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -319,7 +319,7 @@ great on your desktop.")
      `(("ktexteditor" ,ktexteditor)
        ("imagemagick" ,imagemagick)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch")
     (synopsis "Create and print cross stitch patterns")
     (description
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 37d9e8674d..3d34429981 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -536,7 +536,7 @@ illustrate project schedules.")
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("quazip" ,quazip)
        ("zlib" ,zlib)))
     (home-page "https://krita.org")
@@ -755,7 +755,7 @@ different notification systems.")
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtwayland" ,qtwayland)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/KDEConnect")
     (synopsis "Enable your devices to communicate with each other")
     (description "KDE Connect is a project that enables all your devices to
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index ae8c22f845..d6a397df71 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -231,7 +231,7 @@ in Qt.")
        ("libxscrnsaver" ,libxscrnsaver)
        ("polkit-qt" ,polkit-qt)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -285,7 +285,7 @@ and memory usage or network traffic.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -328,7 +328,7 @@ LXQt and the system it's running on.")
        ("libqtxdg" ,libqtxdg)
        ("polkit-qt" ,polkit-qt)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -378,7 +378,7 @@ the operating system LXQt is running on.")
        ("libxi" ,libxi)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)
        ("xf86-input-libinput" ,xf86-input-libinput)
        ("xkeyboard-config" ,xkeyboard-config)
@@ -444,7 +444,7 @@ configuration of both LXQt and the underlying operating system.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)
@@ -492,7 +492,7 @@ as a whole and are not limited to distinct applications.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -538,7 +538,7 @@ according to the Desktop Notifications Specification.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -589,7 +589,7 @@ of other programs.")
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)
        ("xcb-util" ,xcb-util)
        ("xkeyboard-config" ,xkeyboard-config)))
@@ -654,7 +654,7 @@ of other programs.")
        ("polkit-qt" ,polkit-qt)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("polkit" ,polkit)
@@ -702,7 +702,7 @@ LXQt.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -750,7 +750,7 @@ when laptop batteries are low on power.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -791,7 +791,7 @@ Qt with LXQt.")
        ("pcre" ,pcre)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)
@@ -838,7 +838,7 @@ allows for launching applications or shutting down the system.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("xdg-user-dirs" ,xdg-user-dirs)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -908,7 +908,7 @@ for the LXQt desktop environment.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("sudo" ,sudo)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -992,7 +992,7 @@ for LXQt.")
        ("menu-cache" ,menu-cache)
        ("pcre" ,pcre)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
@@ -1018,7 +1018,7 @@ components to build desktop file managers which belongs to LXDE.")
     (inputs
      `(("libfm-qt" ,libfm-qt)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)
@@ -1097,7 +1097,7 @@ manager Compton.")
        ("libfm-qt" ,libfm-qt)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
@@ -1132,7 +1132,7 @@ image viewer.")
        ("pango" ,pango)
        ("pcre" ,pcre)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("pkg-config" ,pkg-config)
@@ -1162,7 +1162,7 @@ window manager OpenBox.")
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
@@ -1193,7 +1193,7 @@ window manager OpenBox.")
        ("liblxqt" ,liblxqt)
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
@@ -1244,7 +1244,7 @@ processes currently in existence, much like code{top} or code{ps}.")
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("qtermwidget" ,qtermwidget)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
@@ -1274,7 +1274,7 @@ QTermWidget.")
        ("libqtxdg" ,libqtxdg)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
@@ -1304,7 +1304,7 @@ easily publishing them on internet image hosting services.")
         ("json-glib" ,json-glib)
         ("libfm-qt" ,libfm-qt)
         ("qtbase" ,qtbase-5)
-        ("qtx11extras" ,qtx11extras)))
+        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
       `(("pkg-config" ,pkg-config)
         ("lxqt-build-tools" ,lxqt-build-tools)
@@ -1340,7 +1340,7 @@ like @command{tar} and @command{zip}.")
           ("qtbase" ,qtbase-5)
           ("qtsvg" ,qtsvg-5)
           ("liblxqt" ,liblxqt)
-          ("qtx11extras" ,qtx11extras)
+          ("qtx11extras" ,qtx11extras-5)
           ("libqtxdg" ,libqtxdg)))
       (native-inputs
         `(("lxqt-build-tools" ,lxqt-build-tools)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index d359b1ec20..9507e8a505 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -182,7 +182,7 @@
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("x11" ,libx11)
        ("xext" ,libxext)
        ("xcb" ,libxcb)
@@ -2855,7 +2855,7 @@ social and chat platform.")
        ("qtkeychain" ,qtkeychain)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("usrsctp" ,usrsctp)
        ("x11" ,libx11)
        ("xext" ,libxext)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2420f91282..a2045e3908 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -432,7 +432,7 @@ score, keyboard, guitar, drum and controller views.")
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("sqlite" ,sqlite)
        ("sparsehash" ,sparsehash)
        ("taglib" ,taglib)))
@@ -525,7 +525,7 @@ playing your music.")
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("sqlite" ,sqlite)
        ("taglib" ,taglib)))
     (home-page "https://www.strawberrymusicplayer.org/")
@@ -2767,7 +2767,7 @@ backends, including ALSA, OSS, Network and FluidSynth.")
      `(("drumstick" ,drumstick)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("libxslt" ,libxslt) ;for xsltproc
        ("docbook-xsl" ,docbook-xsl)
@@ -3106,7 +3106,7 @@ from the command line.")
      `(#:tests? #f))                    ; no "check" target
     (inputs
      `(("qt" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
        ("libsndfile" ,libsndfile)
@@ -4638,7 +4638,7 @@ are a C compiler and glib.  Full API documentation and examples are included.")
     (inputs
      `(("sdl" ,sdl)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("fltk" ,fltk)
        ("libogg" ,libogg)
        ("libsamplerate" ,libsamplerate)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index ba58f26b79..2a066a8b68 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -162,7 +162,7 @@ human.")
        ("qrencode" ,qrencode)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("quazip" ,quazip)               ; XC_KEESHARE
        ("readline" ,readline)
        ("yubikey-personalization" ,yubikey-personalization) ; XC_YUBIKEY
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fe5fa35340..ce9dca9c09 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -876,13 +876,13 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
     (description "The QtImageFormats module contains plugins for adding
 support for MNG, TGA, TIFF and WBMP image formats.")))
 
-(define-public qtx11extras
+(define-public qtx11extras-5
   (package (inherit qtsvg-5)
-    (name "qtx11extras")
+    (name "qtx11extras-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtx11extras" version))
              (sha256
               (base32
                "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
@@ -2133,7 +2133,7 @@ module provides support functions to the automatically generated code.")
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebkit" ,qtwebkit)
        ("qtwebsockets" ,qtwebsockets)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (arguments
      `(#:modules ((srfi srfi-1)
@@ -2946,7 +2946,7 @@ color-related widgets.")
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebsockets" ,qtwebsockets)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (propagated-inputs
      `(("python-shiboken-2" ,python-shiboken-2)))
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index 3a0b7165cd..a62d160e4f 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -111,7 +111,7 @@ hundred times faster than real-time.")
          ("qtsvg" ,qtsvg-5)
          ("qttools" ,qttools)              ;for libQt5Help, needed by "studio"
          ("qtwebkit" ,qtwebkit)
-         ("qtx11extras" ,qtx11extras)
+         ("qtx11extras" ,qtx11extras-5)
          ("eudev" ,eudev)
          ("libxml2" ,libxml2)
          ("sdl2" ,sdl2)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b5a0f669dc..eecf6cb065 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1829,7 +1829,7 @@ videoformats depend on the configuration flags of ffmpeg.")
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("samba" ,samba)
        ("sdl" ,sdl)
        ("sdl-image" ,sdl-image)
@@ -3133,7 +3133,7 @@ be used for realtime video capture via Linux-specific APIs.")
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("speexdsp" ,speexdsp)
        ("v4l-utils" ,v4l-utils)
        ("zlib" ,zlib)))
@@ -3399,7 +3399,7 @@ making @dfn{screencasts}.")
        ("libxinerama" ,libxinerama)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments
      `(#:configure-flags
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2361d31241..71b833961e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -320,7 +320,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
    `(("qtbase" ,qtbase-5)
      ("qtscript" ,qtscript)
      ("qtsvg" ,qtsvg-5)
-     ("qtx11extras" ,qtx11extras)))
+     ("qtx11extras" ,qtx11extras-5)))
   (synopsis "Clipboard manager with advanced features")
   (description "CopyQ is clipboard manager with editing and scripting
 features.  CopyQ monitors system clipboard and saves its content in customized
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 07784f474e..82f52f419a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6516,7 +6516,7 @@ and embedded platforms.")
     (name "uim-qt")
     (inputs
      `(("qt" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ,@(package-inputs uim)))
     (arguments
      (substitute-keyword-arguments (package-arguments uim)
-- 
2.31.1

From 1a2d152e3dab6a2799d72af236da04d20380ec38 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 16:51:21 -0500
Subject: [PATCH 07/37] gnu: qtdeclarative: Update to 6.1.0

* gnu/packages/qt.scm (qtxmlpatterns): Remove variable.
* gnu/packages/qt.scm (qtxmlpatterns-5): New variable.
* gnu/packages/qt.scm (qtdeclarative): Update to 6.1.0.
* gnu/packages/qt.scm (qtdeclarative-5): New variable.
---
 gnu/packages/animation.scm        |   2 +-
 gnu/packages/audio.scm            |   4 +-
 gnu/packages/display-managers.scm |   2 +-
 gnu/packages/documentation.scm    |   2 +-
 gnu/packages/education.scm        |   8 +--
 gnu/packages/engineering.scm      |   4 +-
 gnu/packages/finance.scm          |   4 +-
 gnu/packages/game-development.scm |   4 +-
 gnu/packages/games.scm            |  72 +++++++++----------
 gnu/packages/geo.scm              |   4 +-
 gnu/packages/gstreamer.scm        |   2 +-
 gnu/packages/image-processing.scm |   2 +-
 gnu/packages/image-viewers.scm    |   2 +-
 gnu/packages/jami.scm             |   2 +-
 gnu/packages/kde-frameworks.scm   |  40 +++++------
 gnu/packages/kde-multimedia.scm   |   4 +-
 gnu/packages/kde-pim.scm          |  14 ++--
 gnu/packages/kde-plasma.scm       |   6 +-
 gnu/packages/kde-utils.scm        |   2 +-
 gnu/packages/kde.scm              |  20 +++---
 gnu/packages/linphone.scm         |   2 +-
 gnu/packages/messaging.scm        |   6 +-
 gnu/packages/music.scm            |   6 +-
 gnu/packages/qt.scm               | 115 ++++++++++++++++++++----------
 gnu/packages/radio.scm            |   4 +-
 gnu/packages/scribus.scm          |   2 +-
 gnu/packages/sync.scm             |   2 +-
 gnu/packages/telephony.scm        |   2 +-
 gnu/packages/terminals.scm        |   2 +-
 gnu/packages/text-editors.scm     |   2 +-
 gnu/packages/web.scm              |   2 +-
 31 files changed, 194 insertions(+), 151 deletions(-)

diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 272becc140..7a77af8d92 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -405,7 +405,7 @@ waveform until they line up with the proper sounds.")
     (build-system gnu-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)
+       ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg-5)))
     (arguments
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8045ad0d7b..3d88ef9ca0 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2881,7 +2881,7 @@ link REQUIRED)"))
        ("boost-sync" ,boost-sync)
        ("yaml-cpp" ,yaml-cpp)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebsockets" ,qtwebsockets)))
@@ -5094,7 +5094,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
        ("python" ,python)       ;for running tests
        ("portaudio" ,portaudio) ;for portaudio examples
        ("qtbase" ,qtbase-5)       ;for Qt examples
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qttools" ,qttools)))
     (inputs
      `(("jack" ,jack-1)                       ;for JACK examples
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 8f9f0da605..7944894fda 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -81,7 +81,7 @@
        ("libxkbcommon" ,libxkbcommon)
        ("linux-pam" ,linux-pam)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
 
        ;; Some user-defined themes use QtQuick components internally.  Adding
        ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index a2f817d728..96b450f3a2 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -331,7 +331,7 @@ local system.")
        `(("libarchive" ,libarchive)
          ("sqlite" ,sqlite)
          ("qtbase" ,qtbase-5)
-         ("qtdeclarative" ,qtdeclarative)
+         ("qtdeclarative" ,qtdeclarative-5)
          ("qtwebchannel" ,qtwebchannel)
          ("qtwebengine" ,qtwebengine)
          ("qtquickcontrols" ,qtquickcontrols)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index ae1c68fcb9..432e28b672 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -191,13 +191,13 @@ of categories with some of the activities available in that category.
      `(("openssl" ,openssl)
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsensors" ,qtsensors)
        ("qtsvg" ,qtsvg-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
     (description
@@ -712,11 +712,11 @@ language and very flexible regarding to new or unknown keyboard layouts.")
        ("libxcb" ,libxcb)
        ("libxkbfile" ,libxkbfile)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtx11extras" ,qtx11extras-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (home-page "https://edu.kde.org/ktouch/")
     (synopsis "Touch typing tutor")
     (description
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index a3ab2cdb9f..f847f090c2 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2424,7 +2424,7 @@ comments.")))
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)
+       ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("sqlite" ,sqlite)
        ("tbb" ,tbb)
        ("vtk" ,vtk-8)
@@ -2702,7 +2702,7 @@ export filters.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
-       ("qtxmlpatterns" ,qtxmlpatterns)
+       ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("mesa" ,mesa)
        ("glu" ,glu)
        ("glew" ,glew)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 461e8e173d..cbe412bd30 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -774,12 +774,12 @@ the Monero command line client and daemon.")
        ("libgcrypt" ,libgcrypt)
        ("monero" ,monero)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2",qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
      `(#:tests? #f ; No tests
        #:configure-flags
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 05687d2ae3..c0a3c4c60b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -461,7 +461,7 @@ support.")
     (build-system gnu-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (native-inputs
@@ -2430,7 +2430,7 @@ utilities frequently used in roguelikes.")
          ("openal" ,openal)
          ("pulseaudio" ,pulseaudio)
          ("qtbase" ,qtbase-5)
-         ("qtdeclarative" ,qtdeclarative)
+         ("qtdeclarative" ,qtdeclarative-5)
          ("sdl2" ,sdl2)
          ("uuid.h" ,util-linux "lib")
          ("zlib" ,zlib)))
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4fbdd08455..c7d7f09cd2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9303,7 +9303,7 @@ and also provides the base for the FlightGear Flight Simulator.")
        ("openscenegraph" ,openscenegraph-3.4)
        ("plib" ,plib)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("simgear" ,simgear)
        ("speexdsp" ,speexdsp)
@@ -10251,7 +10251,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Stamp drawing toy")
@@ -10298,7 +10298,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Number logic game")
@@ -10337,7 +10337,7 @@ This package is part of the KDE games module.")
        ("ktextwidgets" ,ktextwidgets)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Miniature golf game")
     (description "Kolf is a miniature golf game for one to ten players.  The
@@ -10414,7 +10414,7 @@ other Mah Jongg like games.")
        ("libkdegames" ,libkdegames)
        ("libkmahjongg" ,libkmahjongg)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Tile laying patience")
@@ -10457,7 +10457,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("libkmahjongg" ,libkmahjongg)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Shisen-Sho solitaire game")
     (description "KShisen is a solitaire-like game played using the standard
@@ -10545,7 +10545,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Breakout like game")
     (description "KBreakout is similar to the classics breakout and xboing,
@@ -10584,7 +10584,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Classical mine sweeper game")
     (description "KMines is a classic Minesweeper game.  The idea is to
@@ -10621,7 +10621,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Simple turn-based strategy game")
@@ -10661,7 +10661,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Jezzball arcade game")
@@ -10700,7 +10700,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Single player falling blocks puzzle game")
@@ -10744,7 +10744,7 @@ This package is part of the KDE games module.")
        ("libkdegames" ,libkdegames)
        ("glu" ,glu)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Sudoku puzzle game and solver")
@@ -10801,7 +10801,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones")
     (description "KLines is a simple but highly addictive one player game.
@@ -10845,7 +10845,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Action and puzzle solving game")
     (description "KGoldrunner is an action game where the hero runs through a
@@ -10889,7 +10889,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Three-in-a-row game")
     (description "KDiamond is a three-in-a-row game like Bejeweled.  It
@@ -10925,7 +10925,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Place 4 pieces in a row")
@@ -10965,7 +10965,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Find atoms in a grid by shooting electrons")
@@ -11007,7 +11007,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Turn the board pieces to get all computers connected")
     (description "KNetWalk is a small game where you have to build up a
@@ -11046,7 +11046,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Arcade bombing game")
     (description "Bomber is a single player arcade game.
@@ -11091,7 +11091,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Bomberman clone")
@@ -11128,7 +11128,7 @@ This package is part of the KDE games module.")
        ("phonon" ,phonon)
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (home-page "https://games.kde.org/")
@@ -11190,7 +11190,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("shared-mime-info" ,shared-mime-info)))
     (home-page "https://games.kde.org/")
@@ -11232,7 +11232,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Yahtzee dice game")
     (description "Kiriki is an addictive and fun dice game, designed to be
@@ -11272,7 +11272,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Go board game")
@@ -11318,7 +11318,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Game based on Rubik's Cube")
@@ -11359,7 +11359,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Lieutnant Skat card game")
@@ -11398,7 +11398,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Pac-Man clone")
@@ -11438,7 +11438,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Two player game with shooting spaceships flying around a sun")
@@ -11472,7 +11472,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Classic pen and paper game: five in a line")
@@ -11512,7 +11512,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Port of the classic BSD console game robots")
     (description "Killbots is a simple game of evading killer robots.
@@ -11554,7 +11554,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Snake race played against the computer")
@@ -11592,7 +11592,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Simple ball dodging game")
     (description "In Kollision you use mouse to control a small blue ball in a
@@ -11633,7 +11633,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Battleship board game with built-in game server")
     (description "KBattleship is a Battle Ship game for KDE.
@@ -11673,7 +11673,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Old reversi board game, also known as othello")
@@ -11715,7 +11715,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Dots and Boxes game")
     (description "KSquares is an implementation of the popular paper based
@@ -11752,7 +11752,7 @@ This package is part of the KDE games module.")
        ("kxmlgui" ,kxmlgui)
        ("libkdegames" ,libkdegames)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Simple tactical game for number-crunchers")
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 6270009651..a03e37515e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1664,7 +1664,7 @@ using the dataset of topographical information collected by
        ("libjpeg-turbo" ,libjpeg-turbo)
        ("proj" ,proj)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
@@ -2283,7 +2283,7 @@ growing set of geoscientific methods.")
        ("qca" ,qca)
        ("qscintilla" ,qscintilla)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtkeychain" ,qtkeychain)
        ("qtlocation" ,qtlocation)
        ("qtserialport" ,qtserialport)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index cca892c77f..bf7847a327 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -768,7 +768,7 @@ model to base your own plug-in on, here it is.")
        ("opus" ,opus)
        ("orc" ,orc)
        ;("qtbase" ,qtbase-5)
-       ;("qtdeclarative" ,qtdeclarative)
+       ;("qtdeclarative" ,qtdeclarative-5)
        ;("qtx11extras" ,qtx11extras-5)
        ("soundtouch" ,soundtouch)
        ;; GStreamer is not yet compatible with srt > 1.4.1.
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 26207362bd..d478d40171 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1031,7 +1031,7 @@ combine the information contained in both.")
        ("itk" ,insight-toolkit-4.12)
        ("vtk" ,vtk-6)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("vxl" ,vxl-1)
        ("zlib" ,zlib)))
     (native-inputs
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 650f81330a..33e658d6e9 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -359,7 +359,7 @@ It supports JPEG, PNG and GIF formats.")
        ("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("boost" ,boost)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 204a27f440..e63eaabc19 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -605,7 +605,7 @@ decentralized calling using P2P-DHT.")
        ("qtwebengine" ,qtwebengine)
        ("qtwebchannel" ,qtwebchannel)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)))
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index d772615d70..2c19377442 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -785,7 +785,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
        ("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://invent.kde.org/frameworks/kholidays")
     (synopsis "Library for regional holiday information")
     (description "This library provides a C++ API that determines holiday and
@@ -813,7 +813,7 @@ other special events for a geographical region.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtscript" ,qtscript)))
     (arguments
      `(#:phases
@@ -890,7 +890,7 @@ or user activity.")
        ;; introducing a recursive dependency.
        ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
        ;; Run-time dependency
@@ -920,7 +920,7 @@ of applications that follow the Kirigami Human Interface Guidelines.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item models extending the Qt model-view framework")
     (description "KItemModels provides the following models:
@@ -1026,7 +1026,7 @@ pixel units.")
        ("perl" ,perl)
        ("qttools" ,qttools)
        ;; Optional, for compile-time validation of syntax definition files:
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (arguments
@@ -1342,7 +1342,7 @@ provides uniform access to generation of barcodes with data.")
     (inputs
      `(("glib" ,glib)
        ("pulseaudio" ,pulseaudio)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtbase" ,qtbase-5)))
     (home-page "https://invent.kde.org/libraries/pulseaudio-qt/")
     (synopsis "Qt bindings for PulseAudio")
@@ -1379,7 +1379,7 @@ libpulse.")
        ("kiconthemes" ,kiconthemes) ; optional
        ("kirigami" ,kirigami)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols2" ,qtquickcontrols2)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "QtQuickControls2 style that integrates with the desktop")
@@ -1418,7 +1418,7 @@ feel.")
        ("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("udev" ,eudev)))
     ;; TODO: Add runtime-only dependency MediaPlayerInfo
     (home-page "https://community.kde.org/Frameworks")
@@ -1520,7 +1520,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way."
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("solid" ,solid)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Core components for the KDE Activity concept")
@@ -2124,7 +2124,7 @@ between feed formats.")
        ("kxmlgui" ,kxmlgui)
        ("lmdb" ,lmdb)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("solid" ,solid)))
     (arguments
      `(#:phases
@@ -2183,7 +2183,7 @@ maintaining an index of the contents of your files.")
        ("kactivities" ,kactivities)
        ("kconfig" ,kconfig)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Access usage statistics collected by the activity manager")
     (description "The KActivitiesStats library provides a querying mechanism for
@@ -2282,7 +2282,7 @@ using the XBEL format.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Utilities for KDE System Settings modules")
     (description "KCMUtils provides various classes to work with KCModules.
@@ -2377,7 +2377,7 @@ their settings.")
        ("kxmlgui" ,kxmlgui)
        ("libepoxy" ,libepoxy)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("solid" ,solid)))
     (arguments
      `(#:phases
@@ -2864,7 +2864,7 @@ KIO enabled infrastructure.")
        ("ktextwidgets" ,ktextwidgets)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
     (arguments
@@ -3003,7 +3003,7 @@ widgets with a user-interface defined in terms of actions.")
        ("kservice" ,kservice)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (arguments
      `(#:tests? #f)) ; FIXME: 1/3 tests fail.
     (home-page "https://community.kde.org/Frameworks")
@@ -3054,7 +3054,7 @@ to easily extend the contacts collection.")
        ("kwindowsystem" ,kwindowsystem)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("solid" ,solid)
        ("threadweaver" ,threadweaver)))
     (arguments
@@ -3193,9 +3193,9 @@ types or handled by application specific code.")
        ("libgit2" ,libgit2)
        ("perl" ,perl)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtscript" ,qtscript)
-       ("qtxmlpatterns" ,qtxmlpatterns)
+       ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
     (arguments
@@ -3458,7 +3458,7 @@ setUrl, setUserAgent and call.")
        ("kxmlgui" ,kxmlgui)
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
@@ -3505,7 +3505,7 @@ script engines.")
        ("kio" ,kio)
        ("kirigami" ,kirigami)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (arguments
      `(#:tests? #f  ;; seem to require network; don't find QTQuick components
        #:phases
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index d81ba425d1..a4546be8e3 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -170,7 +170,7 @@ This package is part of the KDE multimedia module.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
@@ -469,7 +469,7 @@ autoloading of subtitle files for use while playing video.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("purpose" ,purpose)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index f7ccd330f1..c946152dcb 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -633,7 +633,7 @@ functions for accessing calendar data using the kcalcore API.")
        ("ki18n" ,ki18n)
        ("kio" ,kio)
        ("qtbase" ,qtbase-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (home-page "https://invent.kde.org/frameworks/kdav")
     (synopsis "DAV protocol implementation with KJobs")
     (description "This is a DAV protocol implementation with KJobs.  Calendars
@@ -740,12 +740,12 @@ for KDE PIM.")
        ;; TODO: libkolab
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtnetworkauth" ,qtnetworkauth)
        ("qtspeech" ,qtspeech)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
       ;; TODO: 5/45 tests fail for quite different reasons, even with
       ;; "offscreen" and dbus
@@ -1097,7 +1097,7 @@ and retrieving certificates from LDAP servers.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
        ("qgpgme" ,qgpgme)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
        ("sonnet" ,sonnet)))
@@ -1356,7 +1356,7 @@ using a Qt/KMime C++ API.")
        ("qca" ,qca)
        ("qgpgme" ,qgpgme)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
        ("qtwebkit" ,qtwebkit)
@@ -1893,7 +1893,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
        ("kwallet" ,kwallet)
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
     (arguments
@@ -1979,7 +1979,7 @@ KDE using certificate-based crypto.")
        ("kwindowsystem" ,kwindowsystem)
        ("libkdepim" ,libkdepim)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
     (arguments
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 237459e7c0..994312fd1a 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -75,7 +75,7 @@
        ("kwayland" ,kwayland) ; optional
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative) ; optional
+       ("qtdeclarative" ,qtdeclarative-5) ; optional
        ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://invent.kde.org/plasma/breeze")
     (synopsis "Default KDE Plasma theme")
@@ -191,7 +191,7 @@ call it if it is not associated to a terminal.")
        ("linux-pam" ,linux-pam)
        ("logind" ,elogind)        ;optional loginctl support
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)
        ("wayland" ,wayland)
@@ -262,7 +262,7 @@ basic needs and easy to configure for those who want special setups.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kservice" ,kservice)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtscript" ,qtscript)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras-5)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index c586f6f866..452cf0173d 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -469,7 +469,7 @@ remind you to take a break now and then.")
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("plasma-framework" ,plasma-framework)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("solid" ,solid)))
     (home-page "https://kde.org/applications/utilities/org.kde.smb4k")
     (synopsis "Samba (SMB) share advanced browser")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3d34429981..023bf20802 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -203,7 +203,7 @@ This package contains GUI widgets for baloo.")
        ("libkleo" ,libkleo)
        ("qgpgme" ,qgpgme)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
        ("syndication" ,syndication)))
@@ -258,7 +258,7 @@ browser for easy news reading.")
          ("kfilemetadata" ,kfilemetadata)
          ("kdoctools" ,kdoctools)
          ("kdeclarative" ,kdeclarative)
-         ("qtdeclarative" ,qtdeclarative)
+         ("qtdeclarative" ,qtdeclarative-5)
          ("qtquickcontrols" ,qtquickcontrols)
          ("qtquickcontrols2" ,qtquickcontrols2)
          ("kiconthemes" ,kiconthemes)
@@ -351,7 +351,7 @@ projects.")
        ("libkomparediff2" ,libkomparediff2)
        ("oxygen-icons" ,oxygen-icons)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols" ,qtquickcontrols)  ;; not checked as requirement
        ("qtquickcontrols2" ,qtquickcontrols2)  ;; not checked as requirement
        ("qtwebkit" ,qtwebkit)
@@ -533,7 +533,7 @@ illustrate project schedules.")
        ("perl" ,perl)
        ("poppler-qt5" ,poppler-qt5)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
@@ -574,7 +574,7 @@ features include brush stabilizers, brush engines and wrap-around mode.")
        ("ki18n" ,ki18n)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (home-page "https://apps.kde.org/en/massif-visualizer")
     (synopsis "Visualize massif data generated by Valgrind")
     (description
@@ -749,7 +749,7 @@ different notification systems.")
        ("pulseaudio-qt" ,pulseaudio-qt)
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
@@ -869,7 +869,7 @@ to perform data analysis.")
      `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://phabricator.kde.org/source/kqtquickcharts/")
     (synopsis "Interactive charts for Qt Quick")
     (description
@@ -992,7 +992,7 @@ Python, PHP, and Perl.")
        ("libsndfile" ,libsndfile)
        ("openal" ,openal)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
     (synopsis "Runtime library for kdegames")
@@ -1054,7 +1054,7 @@ Python, PHP, and Perl.")
        ("phonon" ,phonon)
        ("poppler-qt5" ,poppler-qt5)
        ("qca" ,qca)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("threadweaver" ,threadweaver)
        ("kcrash" ,kcrash)
@@ -1195,7 +1195,7 @@ or Bonjour by other projects).")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:tests? #f))  ;; 4/17 fail
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 49f0caf7a6..4013463f35 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -861,7 +861,7 @@ and video calls or instant messaging capabilities to an application.")
        ("mediastreamer2" ,mediastreamer2)
        ("ortp" ,ortp)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 9507e8a505..b1a1677794 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2330,7 +2330,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("mtxclient" ,mtxclient)
        ("openssl" ,openssl)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols2" ,qtquickcontrols2)
@@ -2383,7 +2383,7 @@ There is support for:
     (inputs
      `(("libqmatrixclient" ,libqmatrixclient)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
@@ -2723,7 +2723,7 @@ as phones, embedded computers or microcontrollers.")
                #t)))))
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtdeclarative" ,qtdeclarative)
+         ("qtdeclarative" ,qtdeclarative-5)
          ("qtwebchannel" ,qtwebchannel)))
       (propagated-inputs
        `(("qtwebengine" ,qtwebengine)))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index a2045e3908..18289bccaa 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -757,7 +757,7 @@ settings (aliasing, linear interpolation and cubic interpolation).")
        ("lrdf" ,lrdf)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)
+       ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("zlib" ,zlib)))
     (home-page "http://www.hydrogen-music.org")
     (synopsis "Drum machine")
@@ -4743,11 +4743,11 @@ standalone JACK client and an LV2 plugin is also available.")
        ("portmidi" ,portmidi)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtscript" ,qtscript)
        ("qtsvg" ,qtsvg-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("qttools" ,qttools)))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ce9dca9c09..ccef655854 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -263,7 +263,7 @@ applications on Wayland.")
      `(("doxygen" ,doxygen)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtscript" ,qtscript)))
     (build-system cmake-build-system)
     (arguments
@@ -897,13 +897,13 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
     (description "The QtX11Extras module includes the library to access X11
 from within Qt 5.")))
 
-(define-public qtxmlpatterns
+(define-public qtxmlpatterns-5
   (package (inherit qtsvg-5)
-    (name "qtxmlpatterns")
+    (name "qtxmlpatterns-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtxmlpatterns" version))
              (sha256
               (base32
                "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
@@ -918,7 +918,7 @@ from within Qt 5.")))
                          (("xmlpatterns ") "# xmlpatterns"))
                #t))))))
     (native-inputs `(("perl" ,perl)
-                     ("qtdeclarative" ,qtdeclarative)))
+                     ("qtdeclarative" ,qtdeclarative-5)))
     (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Qt XML patterns module")
     (description "The QtXmlPatterns module is a XQuery and XPath engine for
@@ -926,12 +926,55 @@ XML and custom data models.  It contains programs such as xmlpatterns and
 xmlpatternsvalidator.")))
 
 (define-public qtdeclarative
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtdeclarative")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "1njvnx1z7nxq219asfbz7dyb25skg577p0jj3xa7nkfmp0a47xp6"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:tests? _ #f) #f)             ;TODO: Enable the tests
+;;       ((#:phases phases)
+;;        `(modify-phases ,phases
+;;           (add-after 'build 'fix-qt5core-install-prefix
+;;             (lambda* (#:key outputs #:allow-other-keys)
+;;               (let ((out (assoc-ref outputs "out")))
+;;                 ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen
+;;                 ;; is provided by qtdeclarative.
+;;                 (substitute*
+;;                     "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
+;;                   (("\\$\\{_qt5Core_install_prefix\\}") out)))
+;;               #t))))
+       ))
+    (native-inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python)
+       ("python-wrapper" ,python-wrapper)
+       ("qtsvg" ,qtsvg)
+       ("vulkan-headers" ,vulkan-headers)))
+    (inputs
+     `(("mesa" ,mesa)
+       ("qtbase" ,qtbase)))
+    (synopsis "Qt QML module (Quick 2)")
+    (description "The Qt QML module provides a framework for developing
+applications and libraries with the QML language.  It defines and implements the
+language and engine infrastructure, and provides an API to enable application
+developers to extend the QML language with custom types and integrate QML code
+with JavaScript and C++.")))
+
+(define-public qtdeclarative-5
+  (package (inherit qtsvg-5)
+    (name "qtdeclarative-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtdeclarative" version))
              (sha256
               (base32
                "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
@@ -979,7 +1022,7 @@ with JavaScript and C++.")))
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (inputs
      `(("bluez" ,bluez)
        ("qtbase" ,qtbase-5)))
@@ -1002,7 +1045,7 @@ with Bluetooth and NFC.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Web Sockets module")
     (description "WebSocket is a web-based protocol designed to enable two-way
@@ -1034,7 +1077,7 @@ consume data received from the server, or both.")))
                #t))))))
     (native-inputs
      `(("perl" ,perl)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Sensors module")
     (description "The Qt Sensors API provides access to sensor hardware via QML
@@ -1075,7 +1118,7 @@ recognition API for devices.")))
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("python" ,python)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("mesa" ,mesa)
@@ -1123,7 +1166,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
      `(("glib" ,glib)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (inputs
      `(("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
@@ -1216,7 +1259,7 @@ and others.")))
                "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj"))))
     (native-inputs
      `(("perl" ,perl)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebsockets" ,qtwebsockets)))
     (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Web communication library for Qt")
@@ -1247,7 +1290,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
     (inputs
      `(("mesa" ,mesa)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebsockets" ,qtwebsockets)
        ("zlib" ,zlib)))
     (synopsis "QPA plugin for running an application via a browser using
@@ -1272,7 +1315,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
      `(("perl" ,perl)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Display web content in a QML application")
     (description "Qt WebView provides a way to display web content in a QML
 application without necessarily including a full web browser stack by using
@@ -1296,7 +1339,7 @@ native APIs where it makes sense.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtserialport" ,qtserialport)))
     (inputs
@@ -1323,7 +1366,7 @@ positioning and geolocation plugins.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("vulkan-headers" ,vulkan-headers)))
     (inputs
      `(("mesa" ,mesa)
@@ -1369,7 +1412,7 @@ ECMAScript and Qt.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Quick Controls and other Quick modules")
     (description "The QtScript module provides classes for making Qt
 applications scriptable.  This module provides a set of extra components that
@@ -1390,7 +1433,7 @@ can be used to build complete interfaces in Qt Quick.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Quick Controls 2 and other Quick 2 modules")
     (description "The Qt Quick Controls 2 module contains the Qt Labs Platform
 module that provides platform integration: native dialogs, menus and menu bars,
@@ -1412,7 +1455,7 @@ not available.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Graphical Effects module")
     (description "The Qt Graphical Effects module provides a set of QML types
 for adding visually impressive and configurable effects to user interfaces.
@@ -1440,7 +1483,7 @@ coloring, and many more.")))
        ("libxrender" ,libxrender)
        ("sdl2" ,sdl2)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Gamepad module")
     (description "The Qt Gamepad module is an add-on library that enables Qt
 applications to support the use of gamepad hardware and in some cases remote
@@ -1468,7 +1511,7 @@ and mobile applications targeting TV-like form factors.")))
                  #t))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt SCXML module")
     (description "The Qt SCXML module provides functionality to create state
 machines from SCXML files.  This includes both dynamically creating state
@@ -1488,7 +1531,7 @@ also contains functionality to support data models and executable content.")))
                "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Purchasing module")
     (description "The Qt Purchasing module provides and in-app API for
 purchasing goods and services.")))
@@ -1508,7 +1551,7 @@ purchasing goods and services.")))
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Charts module")
     (description "The Qt Charts module provides a set of easy to use chart
 components.  It uses the Qt Graphics View Framework, therefore charts can be
@@ -1532,7 +1575,7 @@ selecting one of the charts themes.")
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Data Visualization module")
     (description "The Qt Data Visualization module provides a way to visualize
 data in 3D as bar, scatter, and surface graphs. It is especially useful for
@@ -1594,7 +1637,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
                #t))))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (synopsis "Qt Remote Objects module")
     (description "The Qt Remote Objects module is an @dfn{inter-process
 communication} (IPC) module developed for Qt.  The idea is to extend existing
@@ -1619,9 +1662,9 @@ processes or computers.")))
      `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("perl" ,perl)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (synopsis "Qt Speech module")
     (description "The Qt Speech module enables a Qt application to support
 accessibility features such as text-to-speech, which is useful for end-users
@@ -1946,7 +1989,7 @@ using the Enchant spell-checking library.")
        ("protobuf" ,protobuf)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtwebchannel" ,qtwebchannel)
        ("re2" ,re2)
@@ -2123,7 +2166,7 @@ module provides support functions to the automatically generated code.")
      `(("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
        ("qtconnectivity" ,qtconnectivity)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsensors" ,qtsensors)
@@ -2134,7 +2177,7 @@ module provides support functions to the automatically generated code.")
        ("qtwebkit" ,qtwebkit)
        ("qtwebsockets" ,qtwebsockets)
        ("qtx11extras" ,qtx11extras-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
      `(#:modules ((srfi srfi-1)
                   ((guix build python-build-system) #:select (python-version))
@@ -2234,7 +2277,7 @@ contain over 620 classes.")
        ("python-pyqt" ,python-pyqt)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
     (arguments
@@ -2704,7 +2747,7 @@ different kinds of sliders, and much more.")
        ("fontconfig" ,fontconfig)
        ("libxrender" ,libxrender)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsensors" ,qtsensors)
@@ -2769,7 +2812,7 @@ time Web content can be enhanced with native controls.")
      `(("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)))
+       ("qtdeclarative" ,qtdeclarative-5)))
     (home-page "https://filcuc.github.io/DOtherSide/index.html")
     (synopsis "C language library for creating bindings for the Qt QML language")
     (description
@@ -2885,7 +2928,7 @@ color-related widgets.")
        ("libxslt" ,libxslt)
        ("python-wrapper" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
      `(#:tests? #f
        ;; FIXME: Building tests fails
@@ -2947,7 +2990,7 @@ color-related widgets.")
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebsockets" ,qtwebsockets)
        ("qtx11extras" ,qtx11extras-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+       ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (propagated-inputs
      `(("python-shiboken-2" ,python-shiboken-2)))
     (native-inputs
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 43638082f2..d29fe459c9 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1566,7 +1566,7 @@ receiver.")
        ("rtl-sdr" ,rtl-sdr)
        ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols2" ,qtquickcontrols2)))
@@ -1800,7 +1800,7 @@ voice formats.")
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
        ("qtserialport" ,qtserialport)
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index a9372735bf..a34da459fb 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -88,7 +88,7 @@
        ("poppler" ,poppler)
        ("python" ,python)               ; need Python library
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 66339c5bf1..58bb674a8c 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -193,7 +193,7 @@
        ("openssl" ,openssl)
        ("python-nautilus" ,python-nautilus)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtkeychain" ,qtkeychain)
        ("qtquickcontrols2" ,qtquickcontrols2)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 34e1b21af6..cbe86efee1 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -706,7 +706,7 @@ Mumble consists of two applications for separate usage:
        ("libsndfile" ,libsndfile)
        ("libxml2" ,libxml2)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("readline" ,readline)
        ("speex" ,speex)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 4f800f2a91..ca22c76026 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -646,7 +646,7 @@ embedded kernel situations.")
       (build-system gnu-build-system)
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtdeclarative" ,qtdeclarative)
+         ("qtdeclarative" ,qtdeclarative-5)
          ("qtgraphicaleffects" ,qtgraphicaleffects)
          ("qtquickcontrols" ,qtquickcontrols)))
       (arguments
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 71cf6edacb..dfc45ae857 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -618,7 +618,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
     (inputs
      `(("hunspell" ,hunspell)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsvg" ,qtsvg-5)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 0dd0a8dec5..f1056f67a9 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8153,7 +8153,7 @@ It contains the code shared by all Kiwix ports.")
        ("libzim" ,libzim)
        ("pugixml" ,pugixml)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)
        ("xapian" ,xapian)
-- 
2.31.1

From 72a73f34ff532c3e2b2dd53a9d06d239cf8e5c05 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 16:57:17 -0500
Subject: [PATCH 08/37] gnu: qtconnectivity: Remove variable.

* gnu/packages/qt.scm (qtconnectivity): Remove variable.
* gnu/packages/qt.scm (qtconnectivity): New variable.
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ccef655854..071afc9200 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1009,7 +1009,7 @@ language and engine infrastructure, and provides an API to enable application
 developers to extend the QML language with custom types and integrate QML code
 with JavaScript and C++.")))
 
-(define-public qtconnectivity
+(define-public qtconnectivity-5
   (package (inherit qtsvg-5)
     (name "qtconnectivity")
     (version "5.15.2")
@@ -2165,7 +2165,7 @@ module provides support functions to the automatically generated code.")
     (inputs
      `(("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtconnectivity" ,qtconnectivity)
+       ("qtconnectivity" ,qtconnectivity-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
-- 
2.31.1

From 662d5075508dab9435a7c027a8580d1d92be6688 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:04:47 -0500
Subject: [PATCH 09/37] gnu: qtwebsockets: Remove variable.

* gnu/packages/qt.scm (qtwebsockets): Remove variable.
* gnu/packages/qt.scm (qtwebsockets): New variable.
---
 gnu/packages/audio.scm |  2 +-
 gnu/packages/games.scm |  2 +-
 gnu/packages/qt.scm    | 12 ++++++------
 gnu/packages/radio.scm |  2 +-
 gnu/packages/sync.scm  |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 3d88ef9ca0..0413403e75 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2884,7 +2884,7 @@ link REQUIRED)"))
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtwebsockets" ,qtwebsockets)))
+       ("qtwebsockets" ,qtwebsockets-5)))
     (propagated-inputs                  ;to get native-search-path
      `(("qtwebengine" ,qtwebengine)))
     (home-page "https://github.com/supercollider/supercollider")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7d7f09cd2..10b7a0a646 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -931,7 +931,7 @@ want what you have.")
          ("qtmultimedia" ,qtmultimedia)
          ("qtsvg" ,qtsvg-5)
          ("qttools" ,qttools)
-         ("qtwebsockets" ,qtwebsockets)
+         ("qtwebsockets" ,qtwebsockets-5)
          ("xz" ,xz)
          ("zlib" ,zlib)))
       (home-page "https://cockatrice.github.io")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 071afc9200..364cfbaddc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1030,7 +1030,7 @@ with JavaScript and C++.")))
     (description "The Qt Connectivity modules provides modules for interacting
 with Bluetooth and NFC.")))
 
-(define-public qtwebsockets
+(define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
     (version "5.15.2")
@@ -1054,7 +1054,7 @@ WebSockets module provides C++ and QML interfaces that enable Qt applications
 to act as a server that can process WebSocket requests, or a client that can
 consume data received from the server, or both.")))
 
-(define-public qtsensors
+(define-public qtsensors-5
   (package (inherit qtsvg-5)
     (name "qtsensors")
     (version "5.15.2")
@@ -1260,7 +1260,7 @@ and others.")))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebsockets" ,qtwebsockets)))
+       ("qtwebsockets" ,qtwebsockets-5)))
     (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Web communication library for Qt")
     (description "The Qt WebChannel module enables peer-to-peer communication
@@ -1291,7 +1291,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
      `(("mesa" ,mesa)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("zlib" ,zlib)))
     (synopsis "QPA plugin for running an application via a browser using
 streamed WebGL commands")
@@ -2175,7 +2175,7 @@ module provides support functions to the automatically generated code.")
        ("qttools" ,qttools)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebkit" ,qtwebkit)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
@@ -2988,7 +2988,7 @@ color-related widgets.")
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (propagated-inputs
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index d29fe459c9..8fa89650ff 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1805,7 +1805,7 @@ voice formats.")
        ("qtmultimedia" ,qtmultimedia)
        ("qtserialport" ,qtserialport)
        ("qtspeech" ,qtspeech)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("rtl-sdr" ,rtl-sdr)
        ("serialdv" ,serialdv)
        ("sgp4" ,sgp4)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 58bb674a8c..0711f02108 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -200,7 +200,7 @@
        ("qtsolutions" ,qtsolutions)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("qtwebkit" ,qtwebkit)
        ("sqlite" ,sqlite)
        ("xdg-utils" ,xdg-utils)
-- 
2.31.1

From c245bc0db2e6ddc3890d206558a94ff184cb8edb Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:07:27 -0500
Subject: [PATCH 10/37] gnu: qtsensors: Remove variable.

* gnu/packages/qt.scm (qtsensors): Remove variable.
* gnu/packages/qt.scm (qtsensors-5): New variable.
---
 gnu/packages/education.scm | 2 +-
 gnu/packages/qt.scm        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 432e28b672..e9a6452e6c 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -195,7 +195,7 @@ of categories with some of the activities available in that category.
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (home-page "https://gcompris.net/index-en.html")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 364cfbaddc..ca46250e38 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2169,7 +2169,7 @@ module provides support functions to the automatically generated code.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
@@ -2750,7 +2750,7 @@ different kinds of sliders, and much more.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtwebchannel" ,qtwebchannel)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
@@ -2984,7 +2984,7 @@ color-related widgets.")
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtscript" ,qtscript)
        ("qtscxml" ,qtscxml)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-- 
2.31.1

From d8a332a8b21dcba87dc6ec7bb85639e74e153d41 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:10:11 -0500
Subject: [PATCH 11/37] gnu: qtmultimedia: Remove variable.

* gnu/packages/qt.scm (qtmultimedia): Remove variable.
* gnu/packages/qt.scm (qtmultimedia-5): New variable.
---
 gnu/packages/animation.scm      |  4 ++--
 gnu/packages/astronomy.scm      |  2 +-
 gnu/packages/education.scm      |  4 ++--
 gnu/packages/emulators.scm      |  2 +-
 gnu/packages/engineering.scm    |  2 +-
 gnu/packages/games.scm          |  8 ++++----
 gnu/packages/graphics.scm       |  2 +-
 gnu/packages/irc.scm            |  2 +-
 gnu/packages/jami.scm           |  2 +-
 gnu/packages/kde-frameworks.scm |  2 +-
 gnu/packages/kde-multimedia.scm |  4 ++--
 gnu/packages/kde.scm            |  6 +++---
 gnu/packages/messaging.scm      | 10 +++++-----
 gnu/packages/mpd.scm            |  2 +-
 gnu/packages/music.scm          |  4 ++--
 gnu/packages/networking.scm     |  2 +-
 gnu/packages/qt.scm             | 14 +++++++-------
 gnu/packages/radio.scm          | 10 +++++-----
 gnu/packages/syndication.scm    |  2 +-
 gnu/packages/text-editors.scm   |  2 +-
 gnu/packages/video.scm          |  4 ++--
 gnu/packages/web-browsers.scm   |  2 +-
 22 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 7a77af8d92..00123830c8 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -375,7 +375,7 @@ audio or video backends, ensuring good performance.")
                  #t))))))
       (inputs
        `(("qt" ,qtbase-5)
-         ("qtmultimedia" ,qtmultimedia)
+         ("qtmultimedia" ,qtmultimedia-5)
          ("libsndfile" ,libsndfile)))
       (native-inputs
        `(("qttools" ,qttools)))
@@ -406,7 +406,7 @@ waveform until they line up with the proper sounds.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)))
     (arguments
      `(#:phases
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 82bbc49724..8fca3a6c4e 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -414,7 +414,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtlocation" ,qtlocation)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtscript" ,qtscript)
        ("qtserialport" ,qtserialport)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index e9a6452e6c..db6696b9ab 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -193,7 +193,7 @@ of categories with some of the activities available in that category.
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsensors" ,qtsensors-5)
        ("qtsvg" ,qtsvg-5)
@@ -260,7 +260,7 @@ Currently available boards include:
                (invoke "qmake")))))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)))
+       ("qtmultimedia" ,qtmultimedia-5)))
     (home-page "https://www.tipp10.com/")
     (synopsis "Touch typing tutor")
     (description "Tipp10 is a touch typing tutor.  The ingenious thing about
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 02dd6c124f..71311560fd 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -620,7 +620,7 @@ The following systems are supported:
               ("minizip" ,minizip)
               ("ncurses" ,ncurses)
               ("qtbase" ,qtbase-5)
-              ("qtmultimedia" ,qtmultimedia)
+              ("qtmultimedia" ,qtmultimedia-5)
               ("sdl2" ,sdl2)
               ("sqlite" ,sqlite)
               ("zlib" ,zlib)))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f847f090c2..85f4c83746 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2289,7 +2289,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
        ("opencsg" ,opencsg)
        ("qscintilla" ,qscintilla)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)))
+       ("qtmultimedia" ,qtmultimedia-5)))
     (native-inputs
      `(("bison" ,bison)
        ("flex" ,flex)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 10b7a0a646..faed0d2ec4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -928,7 +928,7 @@ want what you have.")
       (inputs
        `(("protobuf" ,protobuf)
          ("qtbase" ,qtbase-5)
-         ("qtmultimedia" ,qtmultimedia)
+         ("qtmultimedia" ,qtmultimedia-5)
          ("qtsvg" ,qtsvg-5)
          ("qttools" ,qttools)
          ("qtwebsockets" ,qtwebsockets-5)
@@ -10158,7 +10158,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
     `(("pkg-config" ,pkg-config)))
    (inputs
     `(("qtbase" ,qtbase-5)
-      ("qtmultimedia" ,qtmultimedia)
+      ("qtmultimedia" ,qtmultimedia-5)
       ("qtsvg" ,qtsvg-5)))
    (arguments
     '(#:phases
@@ -10250,7 +10250,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.")
        ("libkdegames" ,libkdegames)
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (home-page "https://games.kde.org/")
@@ -11915,7 +11915,7 @@ and chess engines.")
      `(("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8adb793225..2fdd407404 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1937,7 +1937,7 @@ Automated palette selection is supported.")
          ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
          ("qtbase" ,qtbase-5)
          ("qtkeychain" ,qtkeychain)
-         ("qtmultimedia" ,qtmultimedia)
+         ("qtmultimedia" ,qtmultimedia-5)
          ("qtsvg" ,qtsvg-5)
          ("qtx11extras" ,qtx11extras-5)))
       (home-page "https://drawpile.net")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index e75e2b9469..1ec71ffb1b 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -131,7 +131,7 @@
        ("libdbusmenu-qt" ,libdbusmenu-qt)
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtscript" ,qtscript)
        ("qtsvg" ,qtsvg-5)
        ("snorenotify" ,snorenotify)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index e63eaabc19..0b6e7acd10 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -604,7 +604,7 @@ decentralized calling using P2P-DHT.")
        ("qtsvg" ,qtsvg-5)
        ("qtwebengine" ,qtwebengine)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2c19377442..9b78741ae0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1774,7 +1774,7 @@ from DocBook files.")
        ("karchive" ,karchive)
        ("kcoreaddons" ,kcoreaddons)
        ("ki18n" ,ki18n)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtbase" ,qtbase-5)
        ;; Required run-time packages
        ("catdoc" ,catdoc)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index a4546be8e3..6e05c527d2 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -172,7 +172,7 @@ This package is part of the KDE multimedia module.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
@@ -643,7 +643,7 @@ Some features:
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("zlib" ,zlib)))
     (home-page "https://kde.org/applications/multimedia/org.kde.kwave")
     (synopsis "Sound editor for KDE")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 023bf20802..3a42e544eb 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -246,7 +246,7 @@ browser for easy news reading.")
          ("qtbase" ,qtbase-5)
          ("qtscript" ,qtscript)
          ("qtsvg" ,qtsvg-5)
-         ("qtmultimedia" ,qtmultimedia)
+         ("qtmultimedia" ,qtmultimedia-5)
          ("kparts" ,kparts)
          ("knotifications" ,knotifications)
          ("karchive" ,karchive)
@@ -534,7 +534,7 @@ illustrate project schedules.")
        ("poppler-qt5" ,poppler-qt5)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
        ("quazip" ,quazip)
@@ -751,7 +751,7 @@ different notification systems.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtwayland" ,qtwayland)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b1a1677794..4b8754dbfb 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -179,7 +179,7 @@
        ("libidn" ,libidn)
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras-5)
@@ -2226,7 +2226,7 @@ notifications, and Python scripting support.")
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)))
+       ("qtmultimedia" ,qtmultimedia-5)))
     (arguments
      `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
        #:tests? #f))                    ; no tests
@@ -2332,7 +2332,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
        ("spdlog" ,spdlog)
@@ -2384,7 +2384,7 @@ There is support for:
      `(("libqmatrixclient" ,libqmatrixclient)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
@@ -2853,7 +2853,7 @@ social and chat platform.")
        ("qite" ,qite)
        ("qtbase" ,qtbase-5)
        ("qtkeychain" ,qtkeychain)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
        ("usrsctp" ,usrsctp)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 36311061bb..d4c743d68a 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -448,7 +448,7 @@ support")
        ("libmtp" ,libmtp)
        ("mpg123" ,mpg123)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)
        ("taglib" ,taglib)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 18289bccaa..252775d657 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -229,7 +229,7 @@
     (inputs
      `(("dbus" ,dbus)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ;; Plugin dependencies
        ("alsa-lib" ,alsa-lib)
        ("curl" ,curl)
@@ -5502,7 +5502,7 @@ discard bad quality ones.
        ("jack" ,jack-1)
        ("portaudio" ,portaudio)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("gettext" ,gettext-minimal)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3b2baf96a5..0646971408 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1473,7 +1473,7 @@ of the same name.")
        ("lua" ,lua-5.2)                 ;Lua 5.3 unsupported
        ("krb5" ,mit-krb5)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsvg" ,qtsvg-5)
        ("sbc" ,sbc)
        ("snappy" ,snappy)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ca46250e38..89093eb41d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -136,7 +136,7 @@
                #t)))))
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtmultimedia" ,qtmultimedia)))
+         ("qtmultimedia" ,qtmultimedia-5)))
       (home-page "https://github.com/Ri0n/qite/")
       (synopsis "Qt Interactive Text Elements")
       (description "Qite manages interactive elements on QTextEdit.")
@@ -1084,7 +1084,7 @@ consume data received from the server, or both.")))
 and C++ interfaces.  The Qt Sensors API also provides a motion gesture
 recognition API for devices.")))
 
-(define-public qtmultimedia
+(define-public qtmultimedia-5
   (package (inherit qtsvg-5)
     (name "qtmultimedia")
     (version "5.15.2")
@@ -1663,7 +1663,7 @@ processes or computers.")))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (synopsis "Qt Speech module")
     (description "The Qt Speech module enables a Qt application to support
@@ -1990,7 +1990,7 @@ using the Enchant spell-checking library.")
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtwebchannel" ,qtwebchannel)
        ("re2" ,re2)
        ("snappy" ,snappy)
@@ -2168,7 +2168,7 @@ module provides support functions to the automatically generated code.")
        ("qtconnectivity" ,qtconnectivity-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg" ,qtsvg-5)
@@ -2749,7 +2749,7 @@ different kinds of sliders, and much more.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
        ("qtwebchannel" ,qtwebchannel)
        ("libxml2" ,libxml2)
@@ -2980,7 +2980,7 @@ color-related widgets.")
        ("qtbase" ,qtbase-5)
        ("qtdatavis3d" ,qtdatavis3d)
        ("qtlocation" ,qtlocation)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtscript" ,qtscript)
        ("qtscxml" ,qtscxml)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 8fa89650ff..85f510dc30 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -949,7 +949,7 @@ users.")
        ("hamlib" ,wsjtx-hamlib)
        ("libusb" ,libusb)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport)))
     (arguments
      `(#:tests? #f ; No test suite
@@ -1008,7 +1008,7 @@ weak-signal conditions.")
        ("hamlib" ,wsjtx-hamlib)
        ("libusb" ,libusb)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport)))
     (arguments
      `(#:tests? #f ; No test suite
@@ -1568,7 +1568,7 @@ receiver.")
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols2" ,qtquickcontrols2)))
     (arguments
      `(#:configure-flags '("-DRTLSDR=ON")
@@ -1802,7 +1802,7 @@ voice formats.")
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport)
        ("qtspeech" ,qtspeech)
        ("qtwebsockets" ,qtwebsockets-5)
@@ -1879,7 +1879,7 @@ software-defined radio receivers.")
       (inputs
        `(("qcustomplot" ,qcustomplot)
          ("qtbase" ,qtbase-5)
-         ("qtmultimedia" ,qtmultimedia)
+         ("qtmultimedia" ,qtmultimedia-5)
          ("qtserialport" ,qtserialport)))
       (arguments
        `(#:tests? #f  ; No test suite.
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index d0c9fa7635..079dc11c0b 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -567,7 +567,7 @@ formats, including all versions of RSS and Atom.")
     (inputs
      `(("qtwebkit" ,qtwebkit)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("phonon" ,phonon)
        ("sqlite" ,sqlite)))
     (home-page "https://quiterss.org/")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index dfc45ae857..430e66a42e 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -619,7 +619,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
      `(("hunspell" ,hunspell)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index eecf6cb065..86bb71ad64 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -926,7 +926,7 @@ H.264 (MPEG-4 AVC) video streams.")
        ("pcre2" ,pcre2)
        ("pugixml" ,pugixml)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("utfcpp" ,utfcpp)
        ("zlib" ,zlib)))
     (native-inputs
@@ -4475,7 +4475,7 @@ create smoother and stable videos.")
        ("jsoncpp" ,jsoncpp)
        ("libopenshot-audio" ,libopenshot-audio)
        ("qtbase" ,qtbase-5)
-       ("qtmultimedia" ,qtmultimedia)
+       ("qtmultimedia" ,qtmultimedia-5)
        ("zeromq" ,zeromq)))
     (arguments
      `(#:configure-flags
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 64dc326127..edf9068618 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -468,7 +468,7 @@ access.")
          ("font-openmoji" ,font-openmoji)
          ("openssl" ,openssl)
          ("qtbase" ,qtbase-5)
-         ("qtmultimedia" ,qtmultimedia)
+         ("qtmultimedia" ,qtmultimedia-5)
          ("qtsvg" ,qtsvg-5)))
       (home-page "https://kristall.random-projects.net")
       (synopsis "Small-internet graphical client")
-- 
2.31.1

From 6e5458ebb15b6cc495f6b46724138b653826c1ca Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:21:59 -0500
Subject: [PATCH 12/37] gnu: qtwayland: Update to 6.1.0

* gnu/packages/qt.scm (qtwayland): Update to 6.1.0
* gnu/packages/qt.scm (qtwayland-5): New variable.
---
 gnu/packages/kde-frameworks.scm |  2 +-
 gnu/packages/kde.scm            |  2 +-
 gnu/packages/qt.scm             | 58 +++++++++++++++++++++++++++++++--
 gnu/packages/telegram.scm       |  2 +-
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9b78741ae0..3233a0d4f6 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1075,7 +1075,7 @@ integration with a custom editor as well as a ready-to-use
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtwayland" ,qtwayland)
+       ("qtwayland" ,qtwayland-5)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)))
     (arguments
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3a42e544eb..55832f0f2a 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -754,7 +754,7 @@ different notification systems.")
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtwayland" ,qtwayland)
+       ("qtwayland" ,qtwayland-5)
        ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/KDEConnect")
     (synopsis "Enable your devices to communicate with each other")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 89093eb41d..f24f0f1416 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -236,7 +236,7 @@ window managers, that don't provide Qt integration by themselves.")
          ("pkg-config" ,pkg-config)))
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtwayland" ,qtwayland)
+         ("qtwayland" ,qtwayland-5)
          ("wayland" ,wayland)
          ("xkbcommon" ,libxkbcommon)))
       (synopsis "Material Decoration for Qt")
@@ -1133,12 +1133,64 @@ record media, and manage a collection of media content.  It also contains a
 set of plugins for interacting with pulseaudio and GStreamer.")))
 
 (define-public qtwayland
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtwayland")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "15xdf2daal365a0bkhfs5bdmb58ljaimiwxccic6p9hl83z8yznn"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'disable-failing-tests
+             (lambda _
+               ;; FIXME: tst_seatv4::animatedCursor() fails for no good
+               ;; reason and breaks these two tests.
+               (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
+                 (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
+                                  "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
+                  "")
+                 (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
+                  ""))
+               #t))
+           (add-before 'check 'set-test-environment
+             (lambda _
+               ;; Do not fail just because /etc/machine-id is missing.
+               (setenv "DBUS_FATAL_WARNINGS" "0")
+               #t))))))
+    (native-inputs
+     `(("glib" ,glib)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("qtdeclarative" ,qtdeclarative)))
+    (inputs
+     `(("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("libx11" ,libx11)
+       ("libxcomposite" ,libxcomposite)
+       ("libxext" ,libxext)
+       ("libxkbcommon" ,libxkbcommon)
+       ("libxrender" ,libxrender)
+       ("mesa" ,mesa)
+       ("mtdev" ,mtdev)
+       ("qtbase" ,qtbase)
+       ("vulkan-headers" ,vulkan-headers)
+       ("wayland" ,wayland)))
+    (synopsis "Qt Wayland module")
+    (description "The Qt Wayland module provides the QtWayland client and
+compositor libraries.")))
+
+(define-public qtwayland-5
+  (package (inherit qtsvg-5)
+    (name "qtwayland-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtwayland" version))
              (sha256
               (base32
                "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index e787615468..53a1ffbb22 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -541,7 +541,7 @@ Telegram project, for its use in telegram desktop client.")
        ("qt" ,qtbase-5)
        ("qt5ct" ,qt5ct)
        ("qtimageformats" ,qtimageformats-5)
-       ("qtwayland" ,qtwayland)
+       ("qtwayland" ,qtwayland-5)
        ("range-v3" ,range-v3)
        ("rlottie" ,rlottie-for-telegram-desktop)
        ("tgcalls-source"
-- 
2.31.1

From 7c06640f71b64ba72ccab1dbab2fc2f5e24afc4a Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:25:36 -0500
Subject: [PATCH 13/37] gnu: qtserialport: Remove variable.

* gnu/packages/qt.scm (qtserialport): Remove variable.
* gnu/packages/qt.scm (qtserialport-5): New variable.
---
 gnu/packages/astronomy.scm   | 2 +-
 gnu/packages/engineering.scm | 2 +-
 gnu/packages/geo.scm         | 2 +-
 gnu/packages/kde.scm         | 2 +-
 gnu/packages/qt.scm          | 8 ++++----
 gnu/packages/radio.scm       | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 8fca3a6c4e..cb318d6c33 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -416,7 +416,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtscript" ,qtscript)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("zlib" ,zlib)))
     (native-inputs
      `(("gettext" ,gettext-minimal)     ; xgettext is used at compile time
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 85f4c83746..50c2e9b2be 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -702,7 +702,7 @@ multipole-accelerated algorithm.")
                        "phoenix.pro")))))))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("libgit2" ,libgit2)
        ("boost" ,boost)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a03e37515e..15ea116a46 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2286,7 +2286,7 @@ growing set of geoscientific methods.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtkeychain" ,qtkeychain)
        ("qtlocation" ,qtlocation)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
        ("qwt" ,qwt)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 55832f0f2a..aee8648eb2 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -842,7 +842,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
        ("libcerf" ,libcerf)
        ("lz4" ,lz4)
        ("netcdf" ,netcdf)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("zlib" ,zlib)))
     (home-page "https://labplot.kde.org/")
     (synopsis "Interactive graphing and analysis of scientific data")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f24f0f1416..2000d65ec1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1236,7 +1236,7 @@ compositor libraries.")))
     (description "The Qt Wayland module provides the QtWayland client and
 compositor libraries.")))
 
-(define-public qtserialport
+(define-public qtserialport-5
   (package (inherit qtsvg-5)
     (name "qtserialport")
     (version "5.15.2")
@@ -1293,7 +1293,7 @@ interacting with serial ports from within Qt.")))
     (inputs
      `(("libsocketcan" ,libsocketcan)
        ("qtbase" ,qtbase-5)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (synopsis "Qt Serial Bus module")
     (description "The Qt Serial Bus API provides classes and functions to
 access the various industrial serial buses and protocols, such as CAN, ModBus,
@@ -1393,7 +1393,7 @@ native APIs where it makes sense.")))
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (inputs
      `(("icu4c" ,icu4c)
        ("openssl" ,openssl)
@@ -2222,7 +2222,7 @@ module provides support functions to the automatically generated code.")
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
        ("qtwebchannel" ,qtwebchannel)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 85f510dc30..734ddb66dc 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -950,7 +950,7 @@ users.")
        ("libusb" ,libusb)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (arguments
      `(#:tests? #f ; No test suite
        #:phases
@@ -1009,7 +1009,7 @@ weak-signal conditions.")
        ("libusb" ,libusb)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtserialport" ,qtserialport)))
+       ("qtserialport" ,qtserialport-5)))
     (arguments
      `(#:tests? #f ; No test suite
        #:phases
@@ -1803,7 +1803,7 @@ voice formats.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtserialport" ,qtserialport)
+       ("qtserialport" ,qtserialport-5)
        ("qtspeech" ,qtspeech)
        ("qtwebsockets" ,qtwebsockets-5)
        ("rtl-sdr" ,rtl-sdr)
@@ -1880,7 +1880,7 @@ software-defined radio receivers.")
        `(("qcustomplot" ,qcustomplot)
          ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia-5)
-         ("qtserialport" ,qtserialport)))
+         ("qtserialport" ,qtserialport-5)))
       (arguments
        `(#:tests? #f  ; No test suite.
          #:phases
-- 
2.31.1

From 688ae3b6116beecb14c3a937505744f5a226b292 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:27:21 -0500
Subject: [PATCH 14/37] gnu: qtserialbus: Remove variable.

* gnu/packages/qt.scm (qtserialbus): Remove variable.
* gnu/packages/qt.scm (qtserialbus-5): New variable.
---
 gnu/packages/qt.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2000d65ec1..0d145e672b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1267,7 +1267,7 @@ compositor libraries.")))
     (description "The Qt Serial Port module provides the library for
 interacting with serial ports from within Qt.")))
 
-(define-public qtserialbus
+(define-public qtserialbus-5
   (package (inherit qtsvg-5)
     (name "qtserialbus")
     (version "5.15.2")
-- 
2.31.1

From 1edb3fb6ea3ea4665bb6a1c594d3ed89e7e2155e Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:29:26 -0500
Subject: [PATCH 15/37] gnu: qtwebchannel: Remove variable.

* gnu/packages/qt.scm (qtwebchannel): Remove variable.
* gnu/packages/qt.scm (qtwebchannel-5): New variable.
---
 gnu/packages/audio.scm         |  2 +-
 gnu/packages/documentation.scm |  2 +-
 gnu/packages/geo.scm           |  2 +-
 gnu/packages/jami.scm          |  2 +-
 gnu/packages/kde-pim.scm       | 10 +++++-----
 gnu/packages/kde.scm           |  2 +-
 gnu/packages/messaging.scm     |  2 +-
 gnu/packages/qt.scm            | 12 ++++++------
 gnu/packages/sync.scm          |  2 +-
 gnu/packages/text-editors.scm  |  2 +-
 gnu/packages/web.scm           |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 0413403e75..79f526e469 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2883,7 +2883,7 @@ link REQUIRED)"))
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebsockets" ,qtwebsockets-5)))
     (propagated-inputs                  ;to get native-search-path
      `(("qtwebengine" ,qtwebengine)))
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 96b450f3a2..c2eee7c0ce 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -332,7 +332,7 @@ local system.")
          ("sqlite" ,sqlite)
          ("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative-5)
-         ("qtwebchannel" ,qtwebchannel)
+         ("qtwebchannel" ,qtwebchannel-5)
          ("qtwebengine" ,qtwebengine)
          ("qtquickcontrols" ,qtquickcontrols)
          ("qtx11extras" ,qtx11extras-5)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 15ea116a46..93ce66c54a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1666,7 +1666,7 @@ using the dataset of topographical information collected by
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("quazip" ,quazip)
        ("routino" ,routino)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 0b6e7acd10..d386287ebb 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -603,7 +603,7 @@ decentralized calling using P2P-DHT.")
        ("qrencode" ,qrencode)
        ("qtsvg" ,qtsvg-5)
        ("qtwebengine" ,qtwebengine)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index c946152dcb..5592775850 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -743,7 +743,7 @@ for KDE PIM.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtnetworkauth" ,qtnetworkauth)
        ("qtspeech" ,qtspeech)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
@@ -1098,7 +1098,7 @@ and retrieving certificates from LDAP servers.")
        ("qgpgme" ,qgpgme)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("sonnet" ,sonnet)))
     (arguments
@@ -1357,7 +1357,7 @@ using a Qt/KMime C++ API.")
        ("qgpgme" ,qgpgme)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("qtwebkit" ,qtwebkit)
        ("sonnet" ,sonnet)))
@@ -1894,7 +1894,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)))
     (arguments
      `(#:tests? #f)) ;; TODO 6/48 tests fail
@@ -1980,7 +1980,7 @@ KDE using certificate-based crypto.")
        ("libkdepim" ,libkdepim)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)))
     (arguments
      `(#:phases
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aee8648eb2..bd255b0c36 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -204,7 +204,7 @@ This package contains GUI widgets for baloo.")
        ("qgpgme" ,qgpgme)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("syndication" ,syndication)))
     (home-page "https://apps.kde.org/en/akregator")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4b8754dbfb..a12f09e010 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2724,7 +2724,7 @@ as phones, embedded computers or microcontrollers.")
       (inputs
        `(("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative-5)
-         ("qtwebchannel" ,qtwebchannel)))
+         ("qtwebchannel" ,qtwebchannel-5)))
       (propagated-inputs
        `(("qtwebengine" ,qtwebengine)))
       (home-page "https://movim.eu/")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0d145e672b..17774992fa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1299,7 +1299,7 @@ interacting with serial ports from within Qt.")))
 access the various industrial serial buses and protocols, such as CAN, ModBus,
 and others.")))
 
-(define-public qtwebchannel
+(define-public qtwebchannel-5
   (package (inherit qtsvg-5)
     (name "qtwebchannel")
     (version "5.15.2")
@@ -2043,7 +2043,7 @@ using the Enchant spell-checking library.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("re2" ,re2)
        ("snappy" ,snappy)
        ("udev" ,eudev)
@@ -2225,7 +2225,7 @@ module provides support functions to the automatically generated code.")
        ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebkit" ,qtwebkit)
        ("qtwebsockets" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras-5)
@@ -2330,7 +2330,7 @@ contain over 620 classes.")
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)))
     (arguments
      `(#:modules ((srfi srfi-1)
@@ -2803,7 +2803,7 @@ different kinds of sliders, and much more.")
        ("qtlocation" ,qtlocation)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
        ("libx11" ,libx11)
@@ -3039,7 +3039,7 @@ color-related widgets.")
        ("qtsensors" ,qtsensors-5)
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebsockets" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 0711f02108..939a911d0c 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -199,7 +199,7 @@
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsolutions" ,qtsolutions)
        ("qtsvg" ,qtsvg-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebsockets" ,qtwebsockets-5)
        ("qtwebkit" ,qtwebkit)
        ("sqlite" ,sqlite)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 430e66a42e..259ce51856 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -622,7 +622,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsvg" ,qtsvg-5)
-       ("qtwebchannel" ,qtwebchannel)))
+       ("qtwebchannel" ,qtwebchannel-5)))
     (propagated-inputs                  ; To get native-search-path
      `(("qtwebengine" ,qtwebengine)))
     (arguments
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f1056f67a9..d3572999c7 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8154,7 +8154,7 @@ It contains the code shared by all Kiwix ports.")
        ("pugixml" ,pugixml)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebchannel" ,qtwebchannel)
+       ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("xapian" ,xapian)
        ("zlib" ,zlib)
-- 
2.31.1

From e1fbda1532c1b69f87719a506f2251690e14773d Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:30:53 -0500
Subject: [PATCH 16/37] gnu: qtwebglplugin: Remove variable.

* gnu/packages/qt.scm (qtwebglplugin): Remove variable.
* gnu/packages/qt.scm (qtwebglplugin-5): New variable.
---
 gnu/packages/qt.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 17774992fa..9b50326153 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1320,7 +1320,7 @@ between the host (QML/C++ application) and the client (HTML/JavaScript
 application).  The transport mechanism is supported out of the box by the two
 popular web engines, Qt WebKit 2 and Qt WebEngine.")))
 
-(define-public qtwebglplugin
+(define-public qtwebglplugin-5
   (package (inherit qtsvg-5)
     (name "qtwebglplugin")
     (version "5.15.2")
-- 
2.31.1

From 384f918622097f5d1eb42ddca72ca2949159be25 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:32:22 -0500
Subject: [PATCH 17/37] gnu: qtwebview: Remove variable.

* gnu/packages/qt.scm (qtwebview): Remove variable.
* gnu/packages/qt.scm (qtwebview-5): New variable.
---
 gnu/packages/qt.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9b50326153..811291e05e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1353,7 +1353,7 @@ WebGL.  WebGL is a JavaScript API for rendering 2D and 3D graphics within any
 compatible web browser without the use of plug-ins.  The API is similar to
 OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
 
-(define-public qtwebview
+(define-public qtwebview-5
   (package (inherit qtsvg-5)
     (name "qtwebview")
     (version "5.15.2")
-- 
2.31.1

From bec378d331ae4d1331018ef7f40ccab6fa3d8070 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 17:34:04 -0500
Subject: [PATCH 18/37] gnu: qtlocation: Remove variable.

* gnu/packages/qt.scm (qtlocation): Remove variable.
* gnu/packages/qt.scm (qtlocation-5): New variable.
---
 gnu/packages/astronomy.scm | 2 +-
 gnu/packages/geo.scm       | 4 ++--
 gnu/packages/qt.scm        | 8 ++++----
 gnu/packages/radio.scm     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index cb318d6c33..13c6d4fc73 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -413,7 +413,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtscript" ,qtscript)
        ("qtserialport" ,qtserialport-5)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 93ce66c54a..91eaf837b5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1665,7 +1665,7 @@ using the dataset of topographical information collected by
        ("proj" ,proj)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("quazip" ,quazip)
@@ -2285,7 +2285,7 @@ growing set of geoscientific methods.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtkeychain" ,qtkeychain)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 811291e05e..608f9a8973 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1373,7 +1373,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
 application without necessarily including a full web browser stack by using
 native APIs where it makes sense.")))
 
-(define-public qtlocation
+(define-public qtlocation-5
   (package (inherit qtsvg-5)
     (name "qtlocation")
     (version "5.15.2")
@@ -2219,7 +2219,7 @@ module provides support functions to the automatically generated code.")
        ("qtbase" ,qtbase-5)
        ("qtconnectivity" ,qtconnectivity-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport-5)
@@ -2800,7 +2800,7 @@ different kinds of sliders, and much more.")
        ("libxrender" ,libxrender)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
        ("qtwebchannel" ,qtwebchannel-5)
@@ -3031,7 +3031,7 @@ color-related widgets.")
        ("clang-toolchain" ,clang-toolchain)
        ("qtbase" ,qtbase-5)
        ("qtdatavis3d" ,qtdatavis3d)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtscript" ,qtscript)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 734ddb66dc..4758a40432 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1801,7 +1801,7 @@ voice formats.")
        ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport-5)
        ("qtspeech" ,qtspeech)
-- 
2.31.1

From ddc1748db4e952b859e1089916dfad4dd279a19a Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 18:21:33 -0500
Subject: [PATCH 19/37] gnu: qttools: Update to 6.1.0.

* gnu/packages/qt.scm (qttools): Update to 6.1.0.
* gnu/packages/qt.scm (qttools-5): New variable.
---
 gnu/packages/animation.scm        |  2 +-
 gnu/packages/astronomy.scm        |  2 +-
 gnu/packages/audio.scm            | 10 ++---
 gnu/packages/bittorrent.scm       |  2 +-
 gnu/packages/connman.scm          |  2 +-
 gnu/packages/display-managers.scm |  2 +-
 gnu/packages/djvu.scm             |  2 +-
 gnu/packages/education.scm        |  2 +-
 gnu/packages/electronics.scm      |  2 +-
 gnu/packages/emulators.scm        |  2 +-
 gnu/packages/engineering.scm      |  4 +-
 gnu/packages/finance.scm          | 12 +++---
 gnu/packages/game-development.scm |  2 +-
 gnu/packages/games.scm            | 12 +++---
 gnu/packages/geo.scm              |  6 +--
 gnu/packages/gps.scm              |  4 +-
 gnu/packages/graphics.scm         |  2 +-
 gnu/packages/image-processing.scm |  6 +--
 gnu/packages/image-viewers.scm    |  4 +-
 gnu/packages/image.scm            |  2 +-
 gnu/packages/irc.scm              |  2 +-
 gnu/packages/jami.scm             |  2 +-
 gnu/packages/kde-frameworks.scm   | 66 +++++++++++++++----------------
 gnu/packages/kde-pim.scm          | 20 +++++-----
 gnu/packages/kde-utils.scm        |  2 +-
 gnu/packages/kde.scm              | 14 +++----
 gnu/packages/lego.scm             |  2 +-
 gnu/packages/linphone.scm         |  2 +-
 gnu/packages/lxqt.scm             | 52 ++++++++++++------------
 gnu/packages/maths.scm            |  6 +--
 gnu/packages/messaging.scm        |  6 +--
 gnu/packages/music.scm            | 34 ++++++++--------
 gnu/packages/networking.scm       |  2 +-
 gnu/packages/password-utils.scm   |  4 +-
 gnu/packages/photo.scm            |  2 +-
 gnu/packages/python-xyz.scm       |  2 +-
 gnu/packages/qt.scm               | 46 ++++++++++++++++-----
 gnu/packages/radio.scm            |  4 +-
 gnu/packages/robotics.scm         |  2 +-
 gnu/packages/scribus.scm          |  2 +-
 gnu/packages/sync.scm             |  4 +-
 gnu/packages/syndication.scm      |  2 +-
 gnu/packages/synergy.scm          |  2 +-
 gnu/packages/telegram.scm         |  2 +-
 gnu/packages/telephony.scm        |  4 +-
 gnu/packages/text-editors.scm     |  2 +-
 gnu/packages/video.scm            |  4 +-
 47 files changed, 200 insertions(+), 174 deletions(-)

diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 00123830c8..6aa997e33b 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -378,7 +378,7 @@ audio or video backends, ensuring good performance.")
          ("qtmultimedia" ,qtmultimedia-5)
          ("libsndfile" ,libsndfile)))
       (native-inputs
-       `(("qttools" ,qttools)))
+       `(("qttools" ,qttools-5)))
       (home-page "https://www.lostmarble.com/papagayo/")
       (synopsis "Lip-syncing for animations")
       (description
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 13c6d4fc73..32670ea1b4 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -422,7 +422,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
      `(("gettext" ,gettext-minimal)     ; xgettext is used at compile time
        ("perl" ,perl)                   ; for pod2man
        ("qtbase" ,qtbase-5)               ; Qt MOC is needed at compile time
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      `(#:test-target "test"
        #:configure-flags (list "-DENABLE_TESTING=1"
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 79f526e469..6b701da93a 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -498,7 +498,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
        ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "http://alsamodular.sourceforge.net/")
     (synopsis "Realtime modular synthesizer and effect processor")
     (description
@@ -2737,7 +2737,7 @@ different audio devices such as ALSA or PulseAudio.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://qjackctl.sourceforge.io/")
     (synopsis "Jack server control application")
     (description "Control a Jack server.  Allows you to plug various sources
@@ -2865,7 +2865,7 @@ link REQUIRED)"))
     (native-inputs
      `(("ableton-link" ,ableton-link)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
      `(("jack" ,jack-1)
@@ -3554,7 +3554,7 @@ interface.")
     (arguments
      `(#:tests? #f))                    ; no "check" phase
     (native-inputs
-     `(("qttools" ,qttools)
+     `(("qttools" ,qttools-5)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("fluidsynth" ,fluidsynth)
@@ -5095,7 +5095,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
        ("portaudio" ,portaudio) ;for portaudio examples
        ("qtbase" ,qtbase-5)       ;for Qt examples
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("jack" ,jack-1)                       ;for JACK examples
        ("qtquickcontrols" ,qtquickcontrols))) ;for Qt examples
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 5c27a698a2..aa538c578d 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -453,7 +453,7 @@ desktops.")
              #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("boost" ,boost)
        ("libtorrent-rasterbar" ,libtorrent-rasterbar)
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 4cce62d9de..86ecca55f8 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -150,7 +150,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
     (inputs
      `(("qtbase" ,qtbase-5)))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 7944894fda..bc6fe529a5 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -73,7 +73,7 @@
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("elogind" ,elogind)
        ("glib" ,glib)
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 96071b8da1..baf192be70 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -113,7 +113,7 @@ utilities.")
        ("automake" ,automake)
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("djvulibre" ,djvulibre)
        ("glib" ,glib)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index db6696b9ab..4efce2834c 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -185,7 +185,7 @@ of categories with some of the activities available in that category.
        ("gettext" ,gettext-minimal)
        ("kdoctools" ,kdoctools)
        ("perl" ,perl)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
      `(("openssl" ,openssl)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 470c29f99a..240fcfa20b 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -270,7 +270,7 @@ format support.")
                #t))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("boost" ,boost)
        ("glib" ,glib)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 71311560fd..1394849555 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -610,7 +610,7 @@ The following systems are supported:
        (list "-DUSE_LZMA=OFF"           ;do not use bundled LZMA
              "-DUSE_LIBZIP=OFF")))      ;use "zlib" instead
     (native-inputs `(("pkg-config" ,pkg-config)
-                     ("qttools" ,qttools)))
+                     ("qttools" ,qttools-5)))
     (inputs `(("ffmpeg" ,ffmpeg)
               ("libedit" ,libedit)
               ("libelf" ,libelf)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 50c2e9b2be..a20e5ec9af 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2051,7 +2051,7 @@ parallel computing platforms.  It also supports serial execution.")
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("qttools" ,qttools)             ; for lrelease
+     `(("qttools" ,qttools-5)             ; for lrelease
        ("unzip" ,unzip)))
     (arguments
      `(#:phases
@@ -2385,7 +2385,7 @@ comments.")))
     (native-inputs
      `(("doxygen" ,doxygen)
        ("graphviz" ,graphviz)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("pkg-config" ,pkg-config)
        ("python-pyside-2-tools" ,python-pyside-2-tools)
        ("swig" ,swig)))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index cbe412bd30..2b695adb7c 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -131,7 +131,7 @@
        ("pkg-config" ,pkg-config)
        ("python" ,python)               ; for the tests
        ("util-linux" ,util-linux)       ; provides the hexdump command for tests
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("bdb" ,bdb-4.8)                 ; 4.8 required for compatibility
        ("boost" ,boost)
@@ -665,7 +665,7 @@ other machines/servers.  Electroncash does not download the Bitcoin Cash blockch
        ("pkg-config" ,pkg-config)
        ("protobuf" ,protobuf)
        ("python" ,python)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("boost" ,boost)
        ("cppzmq" ,cppzmq)
@@ -1299,7 +1299,7 @@ Trezor wallet.")
      `(("pkg-config" ,pkg-config)
        ("python" ,python)               ; for the tests
        ("util-linux" ,util-linux)       ; provides the hexdump command for tests
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("bdb" ,bdb-5.3)
        ("boost" ,boost)
@@ -1413,7 +1413,7 @@ following three utilities are included with the library:
        ("pkg-config" ,pkg-config)
        ("python" ,python) ; for the tests
        ("util-linux" ,util-linux) ; provides the hexdump command for tests
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("bdb" ,bdb-4.8)
        ("boost" ,boost)
@@ -1493,7 +1493,7 @@ a Qt GUI.")
               (string-append "PREFIX=" %output)
               "features="))))))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("python" ,python)
        ("qtbase" ,qtbase-5)
@@ -1564,7 +1564,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
        ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("util-linux" ,util-linux)))       ; provides the hexdump command for tests
     (home-page "https://flowee.org")
     (synopsis "Flowee infrastructure tools and services")
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index c0a3c4c60b..3c514d23e0 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -465,7 +465,7 @@ support.")
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (arguments
      '(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index faed0d2ec4..6c9cfb7281 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -930,7 +930,7 @@ want what you have.")
          ("qtbase" ,qtbase-5)
          ("qtmultimedia" ,qtmultimedia-5)
          ("qtsvg" ,qtsvg-5)
-         ("qttools" ,qttools)
+         ("qttools" ,qttools-5)
          ("qtwebsockets" ,qtwebsockets-5)
          ("xz" ,xz)
          ("zlib" ,zlib)))
@@ -2406,7 +2406,7 @@ and defeat them with your bubbles!")
              #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("glm" ,glm)
        ("libmodplug" ,libmodplug)
@@ -7257,7 +7257,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available.
     (native-inputs
      `(("cmake" ,cmake-minimal)
        ("gettext-minimal" ,gettext-minimal)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (synopsis "Realistic physics puzzle game")
     (description "The Butterfly Effect (tbe) is a game that uses
 realistic physics simulations to combine lots of simple mechanical
@@ -9312,7 +9312,7 @@ and also provides the base for the FlightGear Flight Simulator.")
     (native-inputs
      `(("cppunit" ,cppunit)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("flightgear-data"
         ,(origin
            (method url-fetch)
@@ -9436,7 +9436,7 @@ play with up to four players simultaneously.  It has network support.")
      `(("clang" ,clang)
        ("ghc" ,ghc)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://hedgewars.org/")
     (synopsis "Turn-based artillery game featuring fighting hedgehogs")
     (description
@@ -11912,7 +11912,7 @@ and chess engines.")
         (base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 91eaf837b5..0ec6f3d2be 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1239,7 +1239,7 @@ map display.  Downloads map data from a number of websites, including
              #t)))
        #:tests? #f)) ; no tests
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("bzip2" ,bzip2)
        ("font-liberation" ,font-liberation)
@@ -1658,7 +1658,7 @@ using the dataset of topographical information collected by
     (build-system qt-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("gdal" ,gdal)
        ("libjpeg-turbo" ,libjpeg-turbo)
@@ -2300,7 +2300,7 @@ growing set of geoscientific methods.")
        ("pkg-config" ,pkg-config)
        ("python-mock" ,python-mock)
        ("python-nose2" ,python-nose2)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("shellcheck" ,shellcheck)
        ("xorg-server" ,xorg-server-for-tests)))
     (home-page "https://qgis.org")
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 0eb4362858..f7b3a63a33 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -89,7 +89,7 @@
        ("zlib" ,zlib)))
     (native-inputs
      `(("which" ,which)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("libxml2" ,libxml2)))              ;'xmllint' needed for the KML tests
     (home-page "https://www.gpsbabel.org/")
     (synopsis "Convert and exchange data with GPS and map programs")
@@ -209,7 +209,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
     (inputs
      `(("qtbase" ,qtbase-5)))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (home-page "https://www.gpxsee.org")
     (synopsis "GPS log file viewer and analyzer")
     (description
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2fdd407404..425924dfbd 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1497,7 +1497,7 @@ exec -a \"$0\" ~a/.brdf-real~%"
                             (chmod "brdf" #o555)))
                         #t)))))
       (native-inputs
-       `(("qttools" ,qttools))) ;for 'qmake'
+       `(("qttools" ,qttools-5))) ;for 'qmake'
       (inputs
        `(("qtbase" ,qtbase-5)
          ("mesa" ,mesa)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index d478d40171..14f700a47e 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -700,7 +700,7 @@ including 2D color images.")
               (lambda _ (chdir "gmic-qt") #t))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("gmic" ,gmic)
        ("qtbase" ,qtbase-5)
@@ -1036,7 +1036,7 @@ combine the information contained in both.")
        ("zlib" ,zlib)))
     (native-inputs
      `(("googletest" ,googletest)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("pkg-config" ,pkg-config)
        ("c3d-src"
         ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")
@@ -1151,7 +1151,7 @@ substituted by matching images.")
            "0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h"))))
       (build-system qt-build-system)
       (native-inputs
-       `(("qttools" ,qttools)))
+       `(("qttools" ,qttools-5)))
       (inputs
        `(("boost" ,boost)
          ("libjpeg" ,libjpeg-turbo)
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 33e658d6e9..69affe23e7 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -356,7 +356,7 @@ It supports JPEG, PNG and GIF formats.")
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
@@ -737,7 +737,7 @@ to set X desktop background.")
        ("qtsvg" ,qtsvg-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)))
+       ("qtlinguist" ,qttools-5)))
     (synopsis "Image viewer supporting all common formats")
     (description "Nomacs is a simple to use image lounge featuring
 semi-transparent widgets that display additional information such as metadata,
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 6e7e1ef870..563a933252 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1822,7 +1822,7 @@ parsing, viewing, modifying, and saving this metadata.")
          "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)))
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 1ec71ffb1b..04be4e32d0 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -125,7 +125,7 @@
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("inxi" ,inxi-minimal)
        ("libdbusmenu-qt" ,libdbusmenu-qt)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index d386287ebb..4af9b908b3 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -594,7 +594,7 @@ decentralized calling using P2P-DHT.")
        ))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("doxygen" ,doxygen)
        ("graphviz" ,graphviz)))
     (inputs
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 3233a0d4f6..01838ade2c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -163,7 +163,7 @@ common build settings used in software produced by the KDE community.")
      ;; TODO: Add building the super experimental QML support
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (arguments
@@ -202,7 +202,7 @@ common build settings used in software produced by the KDE community.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("phonon" ,phonon)
@@ -483,7 +483,7 @@ and the older vCalendar.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("gperf" ,gperf)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
@@ -520,7 +520,7 @@ Internet).")
      `(("dbus" ,dbus)
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("inetutils" ,inetutils)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
      `(("qtbase" ,qtbase-5)))
@@ -583,7 +583,7 @@ propagate their changes to their respective configuration files.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("shared-mime-info" ,shared-mime-info)
        ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
        ("xorg-server" ,xorg-server-for-tests))) ; for the tests
@@ -642,7 +642,7 @@ many more.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("dbus" ,dbus)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtx11extras" ,qtx11extras-5)
@@ -685,7 +685,7 @@ as well as an API to create KDED modules.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("avahi" ,avahi) ; alternativly dnssd could be used
        ("qtbase" ,qtbase-5)))
@@ -782,7 +782,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
              #t)))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)))
@@ -883,7 +883,7 @@ or user activity.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kwindowsystem" ,kwindowsystem)
        ;; TODO: Find a way to activate this optional include without
@@ -969,7 +969,7 @@ model to observers
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
@@ -995,7 +995,7 @@ to flat and hierarchical lists.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (home-page "https://community.kde.org/Frameworks")
@@ -1024,7 +1024,7 @@ pixel units.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("perl" ,perl)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ;; Optional, for compile-time validation of syntax definition files:
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (inputs
@@ -1113,7 +1113,7 @@ represented by a QPoint or a QSize.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
      `(("qtbase" ,qtbase-5)))
@@ -1153,7 +1153,7 @@ configuration pages, message boxes, and password requests.")
        ("pkg-config" ,pkg-config)
        ("dbus" ,dbus) ; for the tests
        ("openbox" ,openbox) ; for the tests
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("xorg-server" ,xorg-server-for-tests))) ; for the tests
     (inputs
      `(("libxrender" ,libxrender)
@@ -1415,7 +1415,7 @@ feel.")
        ("dbus" ,dbus)
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("flex" ,flex)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
@@ -1445,7 +1445,7 @@ system.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("hunspell" ,hunspell)
        ;; TODO: hspell (for Hebrew), Voikko (for Finish)
@@ -1549,7 +1549,7 @@ with other frameworks.")
     (native-inputs
      `(("dbus" ,dbus)
        ("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kcoreaddons" ,kcoreaddons)
        ("polkit-qt" ,polkit-qt)
@@ -1595,7 +1595,7 @@ utilities.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kconfig" ,kconfig)
        ("kwidgetsaddons" ,kwidgetsaddons)
@@ -1861,7 +1861,7 @@ formats.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kcoreaddons" ,kcoreaddons)
        ("kwidgetsaddons" ,kwidgetsaddons)
@@ -1890,7 +1890,7 @@ asynchronous jobs.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("dbus" ,dbus)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kcodecs" ,kcodecs)
        ("kconfig" ,kconfig)
@@ -2210,7 +2210,7 @@ by which applications, and what documents have been linked to which activity.")
      `(("kwidgetsaddons" ,kwidgetsaddons)))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kauth" ,kauth)
        ("kcodecs" ,kcodecs)
@@ -2317,7 +2317,7 @@ KCModules can be created with the KConfigWidgets framework.")
        ("ki18n" ,ki18n)
        ;; todo: PythonModuleGeneration
        ("qtbase" ,qtbase-5)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2448,7 +2448,7 @@ started on demand.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kconfig" ,kconfig)
        ("kcoreaddons" ,kcoreaddons)
@@ -2522,7 +2522,7 @@ with su and ssh respectively.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kconfig" ,kconfig)
        ("kcoreaddons" ,kcoreaddons)
@@ -2596,7 +2596,7 @@ emoticons coming from different providers.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kconfig" ,kconfig)
        ("kcrash" ,kcrash)
@@ -2631,7 +2631,7 @@ window does not need focus for them to be activated.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("shared-mime-info" ,shared-mime-info)))
     (inputs
      `(("karchive" ,karchive)
@@ -2761,7 +2761,7 @@ consumption.")
        ("solid" ,solid)))
     (native-inputs
      `(("dbus" ,dbus)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(;; TODO:  LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
@@ -3250,7 +3250,7 @@ library.")
        ("sonnet" ,sonnet)))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kauth" ,kauth)
        ("kcodecs" ,kcodecs)
@@ -3332,7 +3332,7 @@ the passwords on KDE work spaces.")
        ("kconfigwidgets" ,kconfigwidgets)))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("attica" ,attica)
        ("kauth" ,kauth)
@@ -3671,7 +3671,7 @@ workspace.")
        ("networkmanager-qt" ,networkmanager-qt)
        ("openssl" ,openssl)
        ("qtsvg" ,qtsvg-5)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("qtx11extras" ,qtx11extras-5)))
     ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
     ;; share/kf5/kssl/ca-bundle.crt
@@ -3827,7 +3827,7 @@ support.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("kdoctools" ,kdoctools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("ki18n" ,ki18n)
        ("kjs" ,kjs)
@@ -3856,7 +3856,7 @@ QObjects, so you can script your applications.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("kdoctools" ,kdoctools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kcompletion" ,kcompletion)
        ("kcoreaddons" ,kcoreaddons)
@@ -3894,7 +3894,7 @@ KParts instead.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("kdoctools" ,kdoctools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("kcompletion" ,kcompletion)
        ("kcoreaddons" ,kcoreaddons)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index 5592775850..bea2ad8ed8 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -58,7 +58,7 @@
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("shared-mime-info" ,shared-mime-info)))
     (inputs
      `(("boost" ,boost)
@@ -544,7 +544,7 @@ one of the APIs mentioned above.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("akonadi" ,akonadi)
        ("akonadi-calendar" ,akonadi-calendar)
@@ -787,7 +787,7 @@ package.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("akonadi" ,akonadi)
        ("akonadi-calendar" ,akonadi-calendar)
@@ -1137,7 +1137,7 @@ manager from KDE.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("dbus" ,dbus)
        ("gnupg" ,gnupg)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("akonadi" ,akonadi)
        ("akonadi-contacts" ,akonadi-contacts)
@@ -1535,7 +1535,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("dbus" ,dbus)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("kdoctools" ,kdoctools)))
     (inputs
      `(("akonadi" ,akonadi)
@@ -1662,7 +1662,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("karchive" ,karchive)
        ("akonadi" ,akonadi)
@@ -1721,7 +1721,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("grantlee" ,grantlee)
        ("kcodecs" ,kcodecs)
@@ -1835,7 +1835,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("akonadi" ,akonadi)
        ("akonadi-contacts" ,akonadi-contacts)
@@ -1883,7 +1883,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
        ("ki18n" ,ki18n)
@@ -1920,7 +1920,7 @@ various Google services.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("kdoctools" ,kdoctools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("boost" ,boost)
        ("gpgme" ,gpgme)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 452cf0173d..de907ae713 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -343,7 +343,7 @@ either be created or generated from a image.")
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("kdoctools" ,kdoctools)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("shared-mime-info" ,shared-mime-info)))
     (inputs
      `(("kbookmarks" ,kbookmarks)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index bd255b0c36..75d39174de 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -236,7 +236,7 @@ browser for easy news reading.")
       (native-inputs
        `(("extra-cmake-modules" ,extra-cmake-modules)
          ("pkg-config" ,pkg-config)
-         ("qttools" ,qttools)))
+         ("qttools" ,qttools-5)))
       (inputs
        `(("shared-mime-info" ,shared-mime-info)
          ("frei0r-plugins" ,frei0r-plugins)
@@ -324,7 +324,7 @@ projects.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
        ("shared-mime-info" ,shared-mime-info)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("boost" ,boost)
        ("clang" ,clang)
@@ -443,7 +443,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)))
@@ -690,7 +690,7 @@ cards.")
      `(("qtbase" ,qtbase-5)))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://techbase.kde.org/Projects/Snorenotify")
     (synopsis "Qt notification framework")
     (description "Snorenotify is a multi platform Qt notification framework.
@@ -809,7 +809,7 @@ communicate with each other.  Here's a few things KDE Connect can do:
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("breeze" ,breeze) ;for dark themes
        ("breeze-icons" ,breeze-icons) ;for icons
@@ -927,7 +927,7 @@ unmount drives and view them in a file manager.")
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("perl" ,perl)
        ("python" ,python)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("kdoctools" ,kdoctools)))
     (inputs
      `(("qtbase" ,qtbase-5)
@@ -1184,7 +1184,7 @@ or Bonjour by other projects).")
     (build-system qt-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ;; For optional component "Survey target expression parser"
        ("bison" ,bison)
        ("flex" ,flex)
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm
index 5b72c0e0be..271a1930b4 100644
--- a/gnu/packages/lego.scm
+++ b/gnu/packages/lego.scm
@@ -112,7 +112,7 @@ restrictions that stem from limitations of the standard RCX firmware.")
                 "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("qttools" ,qttools)))           ; for lrelease
+     `(("qttools" ,qttools-5)))           ; for lrelease
     (inputs
      `(("mesa" ,mesa)
        ("qtbase" ,qtbase-5)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 4013463f35..e605001526 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -852,7 +852,7 @@ and video calls or instant messaging capabilities to an application.")
                         grammar-dest)))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("bctoolbox" ,bctoolbox)
        ("belcard" ,belcard)
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index d6a397df71..08c1318aa3 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -234,7 +234,7 @@ in Qt.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://lxqt.github.io")
     (synopsis "Core utility library for all LXQt components")
     (description "liblxqt provides the basic libraries shared by the
@@ -288,7 +288,7 @@ and memory usage or network traffic.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -331,7 +331,7 @@ LXQt and the system it's running on.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -386,7 +386,7 @@ the operating system LXQt is running on.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -447,7 +447,7 @@ configuration of both LXQt and the underlying operating system.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("lxqt-build-tools" ,lxqt-build-tools)))
     (arguments
      '(#:tests? #f                      ; no tests
@@ -495,7 +495,7 @@ as a whole and are not limited to distinct applications.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no test target
        #:phases
@@ -541,7 +541,7 @@ according to the Desktop Notifications Specification.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -596,7 +596,7 @@ of other programs.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (propagated-inputs
      ;; Propagating KWINDOWSYSTEM so that the list of opened applications
      ;; shows up in lxqt-panel's taskbar plugin.
@@ -659,7 +659,7 @@ of other programs.")
      `(("pkg-config" ,pkg-config)
        ("polkit" ,polkit)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no test target
        #:phases
@@ -706,7 +706,7 @@ LXQt.")
        ("solid" ,solid)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -753,7 +753,7 @@ when laptop batteries are low on power.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -794,7 +794,7 @@ Qt with LXQt.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("lxqt-build-tools" ,lxqt-build-tools)))
     (arguments
      '(#:tests? #f                      ; no tests
@@ -843,7 +843,7 @@ allows for launching applications or shutting down the system.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      `(#:tests? #f
        #:phases
@@ -912,7 +912,7 @@ for the LXQt desktop environment.")
        ("sudo" ,sudo)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("lxqt-build-tools" ,lxqt-build-tools)))
     (arguments
      '(#:tests? #f                      ; no tests
@@ -996,7 +996,7 @@ for LXQt.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://lxqt.github.io")
     (synopsis "Qt binding for libfm")
     (description "libfm-qt is the Qt port of libfm, a library providing
@@ -1021,7 +1021,7 @@ components to build desktop file managers which belongs to LXDE.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("lxqt-build-tools" ,lxqt-build-tools)))
     (arguments
      '(#:tests? #f                      ; no tests
@@ -1063,7 +1063,7 @@ LXDE.")
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f                      ; no tests
        #:phases
@@ -1101,7 +1101,7 @@ manager Compton.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                    ; no tests
     (home-page "https://lxqt.github.io")
@@ -1136,7 +1136,7 @@ image viewer.")
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                    ; no tests
     (home-page "https://lxqt.github.io")
@@ -1166,7 +1166,7 @@ window manager OpenBox.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                    ; no tests
     (home-page "https://lxqt.github.io")
@@ -1196,7 +1196,7 @@ window manager OpenBox.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                    ; no tests
     (home-page "https://lxqt.github.io")
@@ -1222,7 +1222,7 @@ processes currently in existence, much like code{top} or code{ps}.")
        ("utf8proc" ,utf8proc)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                    ; no tests
     (home-page "https://lxqt.github.io")
@@ -1248,7 +1248,7 @@ processes currently in existence, much like code{top} or code{ps}.")
        ("qtermwidget" ,qtermwidget)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                      ; no tests
     (home-page "https://lxqt.github.io")
@@ -1277,7 +1277,7 @@ QTermWidget.")
        ("qtx11extras" ,qtx11extras-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (arguments
      '(#:tests? #f))                    ; no tests
     (home-page "https://lxqt.github.io")
@@ -1308,7 +1308,7 @@ easily publishing them on internet image hosting services.")
     (native-inputs
       `(("pkg-config" ,pkg-config)
         ("lxqt-build-tools" ,lxqt-build-tools)
-        ("qttools" ,qttools)))
+        ("qttools" ,qttools-5)))
     (arguments
       '(#:tests? #f))
     (home-page "https://lxqt.github.io")
@@ -1344,7 +1344,7 @@ like @command{tar} and @command{zip}.")
           ("libqtxdg" ,libqtxdg)))
       (native-inputs
         `(("lxqt-build-tools" ,lxqt-build-tools)
-          ("qtlinguist" ,qttools)))
+          ("qtlinguist" ,qttools-5)))
       (arguments
         `(#:tests? #f                   ; no tests
           #:phases
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8be6d19cfc..981c594e0f 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2318,7 +2318,7 @@ ASCII text files using Gmsh's own scripting language.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ;;("python-astropy" ,python-astropy) ;; FIXME: Package this.
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("python-sip" ,python-sip-4)))
     (inputs
      `(("ghostscript" ,ghostscript) ;optional, for EPS/PS output
@@ -4548,7 +4548,7 @@ evaluates expressions using the standard order of operations.")
     (build-system gnu-build-system)
     (native-inputs `(("gettext" ,gettext-minimal)
                      ("qtbase" ,qtbase-5)
-                     ("qttools" ,qttools)))
+                     ("qttools" ,qttools-5)))
     (inputs `(("libx11" ,libx11)
               ("zlib" ,zlib)
               ("libpng" ,libpng)
@@ -6064,7 +6064,7 @@ functions.")
         "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"))))
     (build-system cmake-build-system)
     (inputs `(("qtbase" ,qtbase-5)))
-    (native-inputs `(("qttools" ,qttools)))
+    (native-inputs `(("qttools" ,qttools-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index a12f09e010..4bfca01c04 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1609,7 +1609,7 @@ instant messenger with audio and video chat capabilities.")
        ("sqlcipher" ,sqlcipher)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qmake" ,qttools)))
+       ("qmake" ,qttools-5)))
     (home-page "https://qtox.github.io/")
     (synopsis "Tox chat client using Qt")
     (description "qTox is a Tox client that follows the Tox design
@@ -2340,7 +2340,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)))
+       ("qtlinguist" ,qttools-5)))
     (home-page "https://github.com/Nheko-Reborn/nheko")
     (synopsis "Desktop client for Matrix using Qt and C++14")
     (description "@code{Nheko} want to provide a native desktop app for the
@@ -2388,7 +2388,7 @@ There is support for:
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("xdg-utils" ,xdg-utils)))
     (arguments
      `(#:tests? #f))                    ; no tests
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 252775d657..1e99ef5782 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -413,7 +413,7 @@ score, keyboard, guitar, drum and controller views.")
      `(("gettext" ,gettext-minimal)
        ("googletest" ,googletest)
        ("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)))
+       ("qtlinguist" ,qttools-5)))
     (inputs
      `(("boost" ,boost)
        ("chromaprint" ,chromaprint)
@@ -507,7 +507,7 @@ playing your music.")
      `(("gettext" ,gettext-minimal)
        ("googletest" ,googletest)
        ("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)
+       ("qtlinguist" ,qttools-5)
        ("xorg-server" ,xorg-server-for-tests)))
     (inputs
      `(("alsa-lib" ,alsa-lib)
@@ -745,7 +745,7 @@ settings (aliasing, linear interpolation and cubic interpolation).")
     (native-inputs
      `(("cppunit" ,cppunit)
        ("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)))
+       ("qtlinguist" ,qttools-5)))
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
@@ -2041,7 +2041,7 @@ users to select LV2 plugins and run them with jalv.")
        ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://synthv1.sourceforge.io")
     (synopsis "Polyphonic subtractive synthesizer")
     (description
@@ -2074,7 +2074,7 @@ oscillators and stereo effects.")
        ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://drumkv1.sourceforge.io")
     (synopsis "Drum-kit sampler synthesizer with stereo effects")
     (description
@@ -2107,7 +2107,7 @@ effects.")
        ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://samplv1.sourceforge.io")
     (synopsis "Polyphonic sampler synthesizer with stereo effects")
     (description
@@ -2140,7 +2140,7 @@ effects.")
        ("qtbase" ,qtbase-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://padthv1.sourceforge.io")
     (synopsis "Polyphonic additive synthesizer")
     (description
@@ -2719,7 +2719,7 @@ browser.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("alsa-lib" ,alsa-lib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -2771,7 +2771,7 @@ backends, including ALSA, OSS, Network and FluidSynth.")
     (native-inputs
      `(("libxslt" ,libxslt) ;for xsltproc
        ("docbook-xsl" ,docbook-xsl)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("pkg-config" ,pkg-config)))
     (home-page "https://vmpk.sourceforge.io/")
     (synopsis "Virtual MIDI piano keyboard")
@@ -3122,7 +3122,7 @@ from the command line.")
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://qtractor.org/")
     (synopsis "Audio/MIDI multi-track sequencer")
     (description
@@ -4430,7 +4430,7 @@ develop custom plugins for use in other applications without programming.")
        ("lv2" ,lv2)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "http://qmidiarp.sourceforge.net/")
     (synopsis "MIDI arpeggiator")
     (description "QMidiArp is an advanced MIDI arpeggiator, programmable step
@@ -4458,7 +4458,7 @@ modules running in parallel.")
        ("alsa-lib" ,alsa-lib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "http://alsamodular.sourceforge.net/")
     (synopsis "MIDI event router and filter")
     (description "QMidiRoute is a MIDI event router and filter.  MIDI note,
@@ -4620,7 +4620,7 @@ are a C compiler and glib.  Full API documentation and examples are included.")
              #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ;; rpmalloc is a public domain memory allocator. This version specified
        ;; below is the version required by LMMS.
        ;; To get the new commit of rpmalloc to use here, run
@@ -4750,7 +4750,7 @@ standalone JACK client and an LV2 plugin is also available.")
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (synopsis "Music composition and notation software")
     (description
      "MuseScore is a music score typesetter.  Its main purpose is the creation
@@ -4828,7 +4828,7 @@ sample library.")
        ("rubberband" ,rubberband)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (home-page "https://muse-sequencer.github.io/")
     (synopsis "MIDI/Audio sequencer")
     (description "MusE is a MIDI/Audio sequencer with recording and editing
@@ -5018,7 +5018,7 @@ specification and header.")
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)))
+       ("qtlinguist" ,qttools-5)))
     (synopsis "Music composition and editing environment based around a MIDI
 sequencer")
     (description "Rosegarden is a music composition and editing environment
@@ -5508,7 +5508,7 @@ discard bad quality ones.
      `(("gettext" ,gettext-minimal)
        ("hicolor-icon-theme" ,hicolor-icon-theme)
        ("itstool" ,itstool)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (synopsis "Musical instrument tuner")
     (description "FMIT is a graphical utility for tuning musical instruments,
 with error and volume history, and advanced features.")
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 0646971408..0eb6a1d1e5 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1486,7 +1486,7 @@ of the same name.")
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (synopsis "Network traffic analyzer")
     (description "Wireshark is a network protocol analyzer, or @dfn{packet
 sniffer}, that lets you capture and interactively browse the contents of
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 2a066a8b68..5bdfba6a2e 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -151,7 +151,7 @@ human.")
              #t)))))
     (native-inputs
      `(("asciidoctor" ,ruby-asciidoctor)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("argon2" ,argon2)
        ("libgcrypt" ,libgcrypt)
@@ -695,7 +695,7 @@ key URIs using the standard otpauth:// scheme.")
              (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)))
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index ead70c3e22..77fa016026 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -613,7 +613,7 @@ and enhance them.")
                        "Photoflare.pro")))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("graphicsmagick" ,graphicsmagick)
        ("libomp" ,libomp)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index deff74b3b2..2428c9777e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23246,7 +23246,7 @@ with features similar to the @command{wget} utility.")
         ("python-translation-finder" ,python-translation-finder)
         ("python-watchdog" ,python-watchdog)))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (home-page "https://framagit.org/tyreunom/offlate")
     (synopsis "Offline translation interface for online translation tools")
     (description "Offlate offers a unified interface for different translation
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 608f9a8973..10c20d62e4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -186,7 +186,7 @@
          (add-after 'install 'qt-wrap
            (assoc-ref qt:%standard-phases 'qt-wrap)))))
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)))
@@ -1404,6 +1404,32 @@ native APIs where it makes sense.")))
 positioning and geolocation plugins.")))
 
 (define-public qttools
+  (package (inherit qtsvg)
+    (name "qttools")
+    (version "6.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "0ghz89zdf2wgck4mwsfip2xh9sp01gf54yyk842hp8r024606qv2"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+    (native-inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("perl" ,perl)
+       ("qtdeclarative" ,qtdeclarative)
+       ("vulkan-headers" ,vulkan-headers)))
+    (inputs
+     `(("mesa" ,mesa)
+       ("qtbase" ,qtbase)))
+    (synopsis "Qt Tools and Designer modules")
+    (description "The Qt Tools module provides a set of applications to browse
+the documentation, translate applications, generate help files and other stuff
+that helps in Qt development.")))
+
+(define-public qttools-5
   (package (inherit qtsvg-5)
     (name "qttools")
     (version "5.15.2")
@@ -1441,7 +1467,7 @@ that helps in Qt development.")))
              (patches (search-patches "qtscript-disable-tests.patch"))))
     (native-inputs
      `(("perl" ,perl)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (synopsis "Qt Script module")
@@ -1744,7 +1770,7 @@ message.")))
      `(#:tests? #f))                    ;no test
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("enchant" ,enchant)
        ("qtbase" ,qtbase-5)))
@@ -2224,7 +2250,7 @@ module provides support functions to the automatically generated code.")
        ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebkit" ,qtwebkit)
        ("qtwebsockets" ,qtwebsockets-5)
@@ -2570,7 +2596,7 @@ This package provides the Python bindings.")))
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)))
     (arguments
@@ -2717,7 +2743,7 @@ that can be only started once per user.
   (inputs
    `(("qtbase" ,qtbase-5)
      ("qtsvg" ,qtsvg-5)
-     ("qttools" ,qttools)))
+     ("qttools" ,qttools-5)))
   (arguments
    `(#:phases
      (modify-phases %standard-phases
@@ -2861,7 +2887,7 @@ time Web content can be enhanced with native controls.")
          "09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("qttools" ,qttools)))
+     `(("qttools" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)))
@@ -2899,7 +2925,7 @@ a binding language:
       (build-system cmake-build-system)
       (arguments `(#:tests? #f)) ; There are no tests
       (native-inputs
-       `(("qttools" ,qttools)))
+       `(("qttools" ,qttools-5)))
       (inputs
        `(("qtbase" ,qtbase-5)))
       (home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets")
@@ -3048,7 +3074,7 @@ color-related widgets.")
     (native-inputs
      `(("cmake" ,cmake-minimal)
        ("python" ,python-wrapper)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("which" ,which)))
     (arguments
      `(#:tests? #f
@@ -3142,7 +3168,7 @@ generate Python bindings for your C or C++ code.")
              (apply invoke (cons "qmake" make-flags)))))))
     (native-inputs
      `(("qtbase" ,qtbase-5)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("glu" ,glu)))
     (home-page "http://libqglviewer.com")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 4758a40432..0113efb159 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -940,7 +940,7 @@ users.")
      `(("asciidoc" ,asciidoc)
        ("gfortran" ,gfortran)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("ruby-asciidoctor" ,ruby-asciidoctor)))
     (inputs
      `(("boost" ,boost)
@@ -999,7 +999,7 @@ weak-signal conditions.")
      `(("asciidoc" ,asciidoc)
        ("gfortran" ,gfortran)
        ("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("ruby-asciidoctor" ,ruby-asciidoctor)))
     (inputs
      `(("boost" ,boost)
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index a62d160e4f..387649e574 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -109,7 +109,7 @@ hundred times faster than real-time.")
          ("protobuf" ,protobuf-3.5)               ;for logging
          ("qtbase" ,qtbase-5)
          ("qtsvg" ,qtsvg-5)
-         ("qttools" ,qttools)              ;for libQt5Help, needed by "studio"
+         ("qttools" ,qttools-5)              ;for libQt5Help, needed by "studio"
          ("qtwebkit" ,qtwebkit)
          ("qtx11extras" ,qtx11extras-5)
          ("eudev" ,eudev)
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index a34da459fb..b315744c5f 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -92,7 +92,7 @@
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("util-linux" ,util-linux)))
     (home-page "https://www.scribus.net")
     (synopsis "Desktop publishing and page layout program")
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 939a911d0c..c43561f004 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -177,7 +177,7 @@
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("ruby" ,ruby)))
     (inputs
      `(("appstream" ,appstream)
@@ -350,7 +350,7 @@ See also: megacmd, the official tool set by MEGA.")
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
-       ("qtlinguist" ,qttools)))
+       ("qtlinguist" ,qttools-5)))
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtkeychain" ,qtkeychain)
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 079dc11c0b..f22901865e 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -563,7 +563,7 @@ formats, including all versions of RSS and Atom.")
                                     "/bin/lrelease")))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("qtwebkit" ,qtwebkit)
        ("qtbase" ,qtbase-5)
diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm
index b241d29f6a..93b83e6be7 100644
--- a/gnu/packages/synergy.scm
+++ b/gnu/packages/synergy.scm
@@ -73,7 +73,7 @@
                  (("/usr") out))
                #t))))))
     (native-inputs
-     `(("qttools" ,qttools)))           ; for Qt5LinguistTools
+     `(("qttools" ,qttools-5)))           ; for Qt5LinguistTools
     (inputs
      `(("avahi" ,avahi)
        ("python"  ,python-wrapper)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 53a1ffbb22..0b901b1fbf 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -379,7 +379,7 @@ Telegram project, for its use in telegram desktop client.")
        ("gtk+:bin" ,gtk+ "bin")
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("alsa" ,alsa-lib)
        ("c++-gsl" ,c++-gsl)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index cbe86efee1..eed82071e0 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -651,7 +651,7 @@ address of one of the participants.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (synopsis "Low-latency, high quality voice chat software")
     (description
      "Mumble is an low-latency, high quality voice chat
@@ -695,7 +695,7 @@ Mumble consists of two applications for separate usage:
     (native-inputs
      `(("bison" ,bison)
        ("flex" ,flex)
-       ("qttools" ,qttools)))
+       ("qttools" ,qttools-5)))
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("bcg729" ,bcg729)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 259ce51856..cfb9c601d7 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -614,7 +614,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("qttools" ,qttools)))           ; for lrelease
+       ("qttools" ,qttools-5)))           ; for lrelease
     (inputs
      `(("hunspell" ,hunspell)
        ("qtbase" ,qtbase-5)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 86bb71ad64..f2aca194be 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -938,7 +938,7 @@ H.264 (MPEG-4 AVC) video streams.")
        ("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("po4a" ,po4a)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("ruby" ,ruby)))
     (arguments
      `(#:configure-flags
@@ -2701,7 +2701,7 @@ for use with HTML5 video.")
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)
        ("python" ,python-wrapper)
-       ("qttools" ,qttools)
+       ("qttools" ,qttools-5)
        ("yasm" ,yasm)))
     ;; FIXME: Once packaged, add libraries not found during the build.
     (inputs
-- 
2.31.1

From 0909c78e1b0763e68c3a8db9d70d56acf862657c Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 18:32:53 -0500
Subject: [PATCH 20/37] gnu: qtscript: Remove variable.

 * gnu/packages/qt.scm (qtscript): Remove variable.
 * gnu/packages/qt.scm (qtscript-5): New variable.
---
 gnu/packages/astronomy.scm       | 2 +-
 gnu/packages/engineering.scm     | 2 +-
 gnu/packages/games.scm           | 2 +-
 gnu/packages/irc.scm             | 2 +-
 gnu/packages/kde-frameworks.scm  | 8 ++++----
 gnu/packages/kde-internet.scm    | 2 +-
 gnu/packages/kde-plasma.scm      | 2 +-
 gnu/packages/kde-systemtools.scm | 2 +-
 gnu/packages/kde-utils.scm       | 4 ++--
 gnu/packages/kde.scm             | 2 +-
 gnu/packages/music.scm           | 2 +-
 gnu/packages/qt.scm              | 6 +++---
 gnu/packages/tex.scm             | 2 +-
 gnu/packages/xdisorg.scm         | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 32670ea1b4..d4e3dcecb9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -415,7 +415,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
      `(("qtbase" ,qtbase-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtserialport" ,qtserialport-5)
        ("zlib" ,zlib)))
     (native-inputs
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index a20e5ec9af..f79c122850 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2701,7 +2701,7 @@ export filters.")
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("mesa" ,mesa)
        ("glu" ,glu)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6c9cfb7281..bb4e21f949 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5200,7 +5200,7 @@ in-window at 640x480 resolution or fullscreen.")
               ("openal" ,openal)
               ("physfs" ,physfs)
               ("qtbase" ,qtbase-5)
-              ("qtscript" ,qtscript)
+              ("qtscript" ,qtscript-5)
               ("openssl" ,openssl)
               ("sdl2" ,sdl2)
               ("utfcpp" ,utfcpp)))
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 04be4e32d0..0d93b93e61 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -132,7 +132,7 @@
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtsvg" ,qtsvg-5)
        ("snorenotify" ,snorenotify)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 01838ade2c..4e18af65fe 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -814,7 +814,7 @@ other special events for a geographical region.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtscript" ,qtscript)))
+       ("qtscript" ,qtscript-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2782,7 +2782,7 @@ consumption.")
        ("libxml2" ,libxml2)
        ("libxslt" ,libxslt)
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtx11extras" ,qtx11extras-5)
        ("sonnet" ,sonnet)))
     (arguments
@@ -3194,7 +3194,7 @@ types or handled by application specific code.")
        ("perl" ,perl)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)
        ("solid" ,solid)
        ("sonnet" ,sonnet)))
@@ -3904,7 +3904,7 @@ KParts instead.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)))
+       ("qtscript" ,qtscript-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Frameworks 5 solution for application scripting")
     (description "Kross is a scripting bridge for the KDE Development Platform
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 223e1aab7a..c0fee36988 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -413,7 +413,7 @@ This package is part of the KDE networking module.")
        ("oxygen-icons" ,oxygen-icons) ; default icon set
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtwebkit" ,qtwebkit)
        ("solid" ,solid)
        ("syndication" ,syndication)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 994312fd1a..f15cf1fe65 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -263,7 +263,7 @@ basic needs and easy to configure for those who want special setups.")
        ("kservice" ,kservice)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtwebkit" ,qtwebkit)
        ("qtx11extras" ,qtx11extras-5)
        ("plasma" ,plasma-framework)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index e951031e18..619323ee91 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -214,7 +214,7 @@ document meta data file.")
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)))
+       ("qtscript" ,qtscript-5)))
     (arguments
      `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus
     (home-page "http://www.kde.org/")
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index de907ae713..08f0d930bd 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -69,7 +69,7 @@
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)))
+       ("qtscript" ,qtscript-5)))
     (arguments
      `(#:tests? #f ;; 2/7 tests fail
        #:phases
@@ -364,7 +364,7 @@ either be created or generated from a image.")
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)))
+       ("qtscript" ,qtscript-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 75d39174de..cbfe007e34 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -244,7 +244,7 @@ browser for easy news reading.")
          ("rttr" ,rttr)
          ("mlt" ,mlt)
          ("qtbase" ,qtbase-5)
-         ("qtscript" ,qtscript)
+         ("qtscript" ,qtscript-5)
          ("qtsvg" ,qtsvg-5)
          ("qtmultimedia" ,qtmultimedia-5)
          ("kparts" ,kparts)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1e99ef5782..579044728c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4745,7 +4745,7 @@ standalone JACK client and an LV2 plugin is also available.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (native-inputs
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 10c20d62e4..f8dbee62a3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -264,7 +264,7 @@ applications on Wayland.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtscript" ,qtscript)))
+       ("qtscript" ,qtscript-5)))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
@@ -1454,7 +1454,7 @@ that helps in Qt development.")))
 the documentation, translate applications, generate help files and other stuff
 that helps in Qt development.")))
 
-(define-public qtscript
+(define-public qtscript-5
   (package (inherit qtsvg-5)
     (name "qtscript")
     (version "5.15.2")
@@ -3060,7 +3060,7 @@ color-related widgets.")
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtscxml" ,qtscxml)
        ("qtsensors" ,qtsensors-5)
        ("qtspeech" ,qtspeech)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6e7609fafa..6e485e248b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6501,7 +6501,7 @@ PDF documents.")
     (inputs
      `(("poppler-qt5" ,poppler-qt5)
        ("qtbase" ,qtbase-5)
-       ("qtscript" ,qtscript)
+       ("qtscript" ,qtscript-5)
        ("qtwebkit" ,qtwebkit)
        ("zlib" ,zlib)))
     (native-inputs
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 71b833961e..408d826b4a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -318,7 +318,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
      #:tests? #f)) ; Test suite is a rather manual process.
   (inputs
    `(("qtbase" ,qtbase-5)
-     ("qtscript" ,qtscript)
+     ("qtscript" ,qtscript-5)
      ("qtsvg" ,qtsvg-5)
      ("qtx11extras" ,qtx11extras-5)))
   (synopsis "Clipboard manager with advanced features")
-- 
2.31.1

From 21bf2cc2458bdae781691f8d7131be7e99fde9f7 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 18:58:53 -0500
Subject: [PATCH 21/37] gnu: qtquickcontrols-2: Remove variable.

 * gnu/packages/qt.scm (qtquickcontrols-2): Remove variable.
 * gnu/packages/qt.scm (qtquickcontrols-2-5): New variable.
---
 gnu/packages/qt.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f8dbee62a3..ee20f04cf8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1475,7 +1475,7 @@ that helps in Qt development.")))
 The following guides and references cover aspects of programming with
 ECMAScript and Qt.")))
 
-(define-public qtquickcontrols
+(define-public qtquickcontrols-2-5
   (package (inherit qtsvg-5)
     (name "qtquickcontrols")
     (version "5.15.2")
-- 
2.31.1

From 955663db2d651e410c74b83b8bc0c6f4dc32146c Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:00:01 -0500
Subject: [PATCH 22/37] gnu: qtquickcontrols: Remove variable.

 * gnu/packages/qt.scm (qtquickcontrols): Remove variable.
 * gnu/packages/qt.scm (qtquickcontrols-5): New variable.
---
 gnu/packages/qt.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ee20f04cf8..bbb17ff0dd 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1477,7 +1477,7 @@ ECMAScript and Qt.")))
 
 (define-public qtquickcontrols-2-5
   (package (inherit qtsvg-5)
-    (name "qtquickcontrols")
+    (name "qtquickcontrols-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
@@ -1496,9 +1496,9 @@ ECMAScript and Qt.")))
 applications scriptable.  This module provides a set of extra components that
 can be used to build complete interfaces in Qt Quick.")))
 
-(define-public qtquickcontrols2
+(define-public qtquickcontrols2-5
   (package (inherit qtsvg-5)
-    (name "qtquickcontrols2")
+    (name "qtquickcontrols2-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-- 
2.31.1

From 5aa78a4dd1705e8b92b9e87116c6e167d7f72653 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:02:22 -0500
Subject: [PATCH 23/37] gnu: qtquickcontrols2: Remove variable.

 * gnu/packages/qt.scm (qtquickcontrols2): Remove variable.
 * gnu/packages/qt.scm (qtquickcontrols2-5): New variable.
---
 gnu/packages/display-managers.scm | 2 +-
 gnu/packages/education.scm        | 2 +-
 gnu/packages/finance.scm          | 2 +-
 gnu/packages/jami.scm             | 2 +-
 gnu/packages/kde-frameworks.scm   | 6 +++---
 gnu/packages/kde-multimedia.scm   | 4 ++--
 gnu/packages/kde.scm              | 6 +++---
 gnu/packages/linphone.scm         | 2 +-
 gnu/packages/messaging.scm        | 4 ++--
 gnu/packages/music.scm            | 2 +-
 gnu/packages/radio.scm            | 2 +-
 gnu/packages/sync.scm             | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index bc6fe529a5..75726fa8a6 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -88,7 +88,7 @@
        ;; 'wrap-qt-program'.
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
 
        ("shadow" ,shadow)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 4efce2834c..6b1bedcf6b 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -714,7 +714,7 @@ language and very flexible regarding to new or unknown keyboard layouts.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (home-page "https://edu.kde.org/ktouch/")
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 2b695adb7c..c3ba5a31da 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -777,7 +777,7 @@ the Monero command line client and daemon.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2",qtquickcontrols2)
+       ("qtquickcontrols2",qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 4af9b908b3..b1731911f4 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -608,7 +608,7 @@ decentralized calling using P2P-DHT.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2)))
+       ("qtquickcontrols2" ,qtquickcontrols2-5)))
     (propagated-inputs
      `(("libring" ,libring)))           ;for dring
     (home-page "https://jami.net")
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 4e18af65fe..e6f92f1ac7 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -891,7 +891,7 @@ or user activity.")
        ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ;; Run-time dependency
        ("qtgraphicaleffects" ,qtgraphicaleffects)))
@@ -1380,7 +1380,7 @@ libpulse.")
        ("kirigami" ,kirigami)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)))
+       ("qtquickcontrols2" ,qtquickcontrols2-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "QtQuickControls2 style that integrates with the desktop")
     (description "This is a style for QtQuickControls2 which is using
@@ -3459,7 +3459,7 @@ setUrl, setUserAgent and call.")
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)))
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 6e05c527d2..40b32fa5b1 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -174,7 +174,7 @@ This package is part of the KDE multimedia module.")
        ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
        ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
@@ -472,7 +472,7 @@ autoloading of subtitle files for use while playing video.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency
+       ("qtquickcontrols2" ,qtquickcontrols2-5) ; not listed as dependency
        ("qtx11extras" ,qtx11extras-5)))
     (arguments
      `(#:tests? #f ; test program gets built, but is not found
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index cbfe007e34..7cfac4efc2 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -260,7 +260,7 @@ browser for easy news reading.")
          ("kdeclarative" ,kdeclarative)
          ("qtdeclarative" ,qtdeclarative-5)
          ("qtquickcontrols" ,qtquickcontrols)
-         ("qtquickcontrols2" ,qtquickcontrols2)
+         ("qtquickcontrols2" ,qtquickcontrols2-5)
          ("kiconthemes" ,kiconthemes)
          ("breeze" ,breeze) ; make dark them available easily
          ("breeze-icons" ,breeze-icons) ; recommended icon set
@@ -353,7 +353,7 @@ projects.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtquickcontrols" ,qtquickcontrols)  ;; not checked as requirement
-       ("qtquickcontrols2" ,qtquickcontrols2)  ;; not checked as requirement
+       ("qtquickcontrols2" ,qtquickcontrols2-5)  ;; not checked as requirement
        ("qtwebkit" ,qtwebkit)
        ("threadweaver" ,threadweaver)
 
@@ -753,7 +753,7 @@ different notification systems.")
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtwayland" ,qtwayland-5)
        ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/KDEConnect")
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index e605001526..e7314f46b6 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -864,7 +864,7 @@ and video calls or instant messaging capabilities to an application.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)))
     (synopsis "Desktop client for the Linphone SIP softphone")
     (description "Linphone is a SIP softphone for voice and video over IP calling
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4bfca01c04..3ad03e28ea 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2333,7 +2333,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("spdlog" ,spdlog)
        ("tweeny" ,tweeny)
@@ -2386,7 +2386,7 @@ There is support for:
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools-5)
        ("xdg-utils" ,xdg-utils)))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 579044728c..b1e765c049 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4744,7 +4744,7 @@ standalone JACK client and an LV2 plugin is also available.")
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtscript" ,qtscript-5)
        ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 0113efb159..c6173100a9 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1569,7 +1569,7 @@ receiver.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)))
+       ("qtquickcontrols2" ,qtquickcontrols2-5)))
     (arguments
      `(#:configure-flags '("-DRTLSDR=ON")
        #:tests? #f))
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index c43561f004..c9454dacf1 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -196,7 +196,7 @@
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtkeychain" ,qtkeychain)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsolutions" ,qtsolutions)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel-5)
-- 
2.31.1

From 8a0dc9bbf6624dcdfd5900aacbdd95640e0ab778 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:03:52 -0500
Subject: [PATCH 24/37] gnu: qtgraphicaleffects: Remove variable.

 * gnu/packages/qt.scm (qtgraphicaleffects): Remove variable.
 * gnu/packages/qt.scm (qtgraphicaleffects-5): New variable.
---
 gnu/packages/display-managers.scm | 2 +-
 gnu/packages/education.scm        | 4 ++--
 gnu/packages/finance.scm          | 2 +-
 gnu/packages/jami.scm             | 2 +-
 gnu/packages/kde-frameworks.scm   | 2 +-
 gnu/packages/kde-multimedia.scm   | 4 ++--
 gnu/packages/kde.scm              | 4 ++--
 gnu/packages/linphone.scm         | 2 +-
 gnu/packages/messaging.scm        | 2 +-
 gnu/packages/qt.scm               | 4 ++--
 gnu/packages/radio.scm            | 2 +-
 gnu/packages/sync.scm             | 2 +-
 gnu/packages/terminals.scm        | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 75726fa8a6..6948491d66 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -86,7 +86,7 @@
        ;; Some user-defined themes use QtQuick components internally.  Adding
        ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to
        ;; 'wrap-qt-program'.
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 6b1bedcf6b..94846ce915 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -192,7 +192,7 @@ of categories with some of the activities available in that category.
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsensors" ,qtsensors-5)
@@ -713,7 +713,7 @@ language and very flexible regarding to new or unknown keyboard layouts.")
        ("libxkbfile" ,libxkbfile)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index c3ba5a31da..0060d335e8 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -775,7 +775,7 @@ the Monero command line client and daemon.")
        ("monero" ,monero)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2",qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index b1731911f4..6a4be92cb7 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -606,7 +606,7 @@ decentralized calling using P2P-DHT.")
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2-5)))
     (propagated-inputs
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index e6f92f1ac7..b72ccf03fb 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -894,7 +894,7 @@ or user activity.")
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ;; Run-time dependency
-       ("qtgraphicaleffects" ,qtgraphicaleffects)))
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "QtQuick components for mobile user interfaces")
     (description "Kirigami is a set of high level QtQuick components looking
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 40b32fa5b1..e0c1559a77 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -171,7 +171,7 @@ This package is part of the KDE multimedia module.")
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5) ; not listed as dependency
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
@@ -470,7 +470,7 @@ autoloading of subtitle files for use while playing video.")
        ("purpose" ,purpose)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2-5) ; not listed as dependency
        ("qtx11extras" ,qtx11extras-5)))
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 7cfac4efc2..f741bcafce 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -266,7 +266,7 @@ browser for easy news reading.")
          ("breeze-icons" ,breeze-icons) ; recommended icon set
          ("purpose" ,purpose)
          ("qtwebkit" ,qtwebkit)
-         ("qtgraphicaleffects" ,qtgraphicaleffects)
+         ("qtgraphicaleffects" ,qtgraphicaleffects-5)
          ("kplotting" ,kplotting)))
       (arguments
        `(#:tests? #f                    ;TODO needs X
@@ -750,7 +750,7 @@ different notification systems.")
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index e7314f46b6..3e0f50267b 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -862,7 +862,7 @@ and video calls or instant messaging capabilities to an application.")
        ("ortp" ,ortp)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3ad03e28ea..360e3735b4 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2331,7 +2331,7 @@ for the Matrix protocol.  It is built on to of @code{Boost.Asio}.")
        ("openssl" ,openssl)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bbb17ff0dd..41d58f80ef 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1518,9 +1518,9 @@ module that provides platform integration: native dialogs, menus and menu bars,
 and tray icons.  It falls back to Qt Widgets when a native implementation is
 not available.")))
 
-(define-public qtgraphicaleffects
+(define-public qtgraphicaleffects-5
   (package (inherit qtsvg-5)
-    (name "qtgraphicaleffects")
+    (name "qtgraphicaleffects-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index c6173100a9..98e0f0e6a6 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1567,7 +1567,7 @@ receiver.")
        ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)))
     (arguments
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index c9454dacf1..112f5ee285 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -194,7 +194,7 @@
        ("python-nautilus" ,python-nautilus)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtkeychain" ,qtkeychain)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsolutions" ,qtsolutions)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index ca22c76026..dd5b62df76 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -647,7 +647,7 @@ embedded kernel situations.")
       (inputs
        `(("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative-5)
-         ("qtgraphicaleffects" ,qtgraphicaleffects)
+         ("qtgraphicaleffects" ,qtgraphicaleffects-5)
          ("qtquickcontrols" ,qtquickcontrols)))
       (arguments
        `(#:phases
-- 
2.31.1

From 58d2c654d7ee330457dcdabea26477d0a7637ead Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:05:32 -0500
Subject: [PATCH 25/37] gnu: qtgamepad: Remove variable.

 * gnu/packages/qt.scm (qtgamepad): Remove variable.
 * gnu/packages/qt.scm (qtgamepad-5): New variable.
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 41d58f80ef..4d9b8009c7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1542,9 +1542,9 @@ components.  The API consists of over 20 effects provided as separate QML
 types.  The effects cover functional areas such as blending, masking, blurring,
 coloring, and many more.")))
 
-(define-public qtgamepad
+(define-public qtgamepad-5
   (package (inherit qtsvg-5)
-    (name "qtgamepad")
+    (name "qtgamepad-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-- 
2.31.1

From 99408c7659621d39dd3c722cbb33c572aabb1888 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:18:18 -0500
Subject: [PATCH 26/37] gnu: qtscxml: Update to 6.1.0.

* gnu/packages/qt.scm (qtscxml): Update to 6.1.0.
* gnu/packages/qt.scm (qtscxml-5): New variable.
---
 gnu/packages/qt.scm | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4d9b8009c7..c893b46c2c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1570,12 +1570,42 @@ primary target audience are embedded devices with fullscreen user interfaces,
 and mobile applications targeting TV-like form factors.")))
 
 (define-public qtscxml
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtscxml")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "1sk3qcby547rv6bai2j2zd3ydg3aa7p48is68kh72h8r5sf80df8"))
+             (modules '((guix build utils)))
+;;             (snippet
+;;              '(begin
+;;                 (delete-file-recursively "tests/3rdparty")
+;;                 ;; the scion test refers to the bundled 3rd party test code.
+;;                 (substitute* "tests/auto/auto.pro"
+;;                   (("scion") "#"))
+;;                 #t))
+             ))
+    (inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (synopsis "Qt SCXML module")
+    (description "The Qt SCXML module provides functionality to create state
+machines from SCXML files.  This includes both dynamically creating state
+machines (loading the SCXML file and instantiating states and transitions) and
+generating a C++ file that has a class implementing the state machine.  It
+also contains functionality to support data models and executable content.")))
+
+(define-public qtscxml-5
+  (package (inherit qtsvg-5)
+    (name "qtscxml-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtscxml" version))
              (sha256
               (base32
                "1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0"))
@@ -3061,7 +3091,7 @@ color-related widgets.")
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtscript" ,qtscript-5)
-       ("qtscxml" ,qtscxml)
+       ("qtscxml" ,qtscxml-5)
        ("qtsensors" ,qtsensors-5)
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg-5)
-- 
2.31.1

From 0cea47a15f4cba005d7c4074110226354e9c1da1 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:23:45 -0500
Subject: [PATCH 27/37] gnu: qtpurchasing: Remove variable.

 * gnu/packages/qt.scm (qtpurchasing): Remove variable.
 * gnu/packages/qt.scm (qtpurchasing-5): New variable.
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c893b46c2c..f42c7bc45f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1627,9 +1627,9 @@ machines (loading the SCXML file and instantiating states and transitions) and
 generating a C++ file that has a class implementing the state machine.  It
 also contains functionality to support data models and executable content.")))
 
-(define-public qtpurchasing
+(define-public qtpurchasing-5
   (package (inherit qtsvg-5)
-    (name "qtpurchasing")
+    (name "qtpurchasing-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-- 
2.31.1

From 4a9aa113cfa55de7591acb4c3be77d1eb15443bc Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:34:06 -0500
Subject: [PATCH 28/37] gnu: qtcharts: Update to 6.1.0.

* gnu/packages/qt.scm (qtcharts): Update to 6.1.0.
* gnu/packages/qt.scm (qtcharts-5): New variable.
---
 gnu/packages/kde.scm   |  2 +-
 gnu/packages/qt.scm    | 28 ++++++++++++++++++++++++++--
 gnu/packages/radio.scm |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index f741bcafce..57c6d7192b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1194,7 +1194,7 @@ or Bonjour by other projects).")
        ))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtcharts" ,qtcharts)
+       ("qtcharts" ,qtcharts-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (arguments
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f42c7bc45f..cd8591ccde 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1645,12 +1645,36 @@ also contains functionality to support data models and executable content.")))
 purchasing goods and services.")))
 
 (define-public qtcharts
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtcharts")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "1kfzrnaihp674nbhayf4pg8g69ggbhcb8z90ry8yv7pjndadqw4g"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (synopsis "Qt Charts module")
+    (description "The Qt Charts module provides a set of easy to use chart
+components.  It uses the Qt Graphics View Framework, therefore charts can be
+easily integrated to modern user interfaces.  Qt Charts can be used as QWidgets,
+QGraphicsWidget, or QML types. Users can easily create impressive graphs by
+selecting one of the charts themes.")
+    (license license:gpl3)))
+
+(define-public qtcharts-5
+  (package (inherit qtsvg-5)
+    (name "qtcharts-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtcharts" version))
              (sha256
               (base32
                "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 98e0f0e6a6..7823759269 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1565,7 +1565,7 @@ receiver.")
        ("mpg123" ,mpg123)
        ("rtl-sdr" ,rtl-sdr)
        ("qtbase" ,qtbase-5)
-       ("qtcharts" ,qtcharts)
+       ("qtcharts" ,qtcharts-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
@@ -1799,7 +1799,7 @@ voice formats.")
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtcharts" ,qtcharts)
+       ("qtcharts" ,qtcharts-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
-- 
2.31.1

From 94166766a5b9b96ff96709c59c6c79c5fc17ac02 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 19:51:22 -0500
Subject: [PATCH 29/37] gnu: qtdatavis3d: Update to 6.1.0.

* gnu/packages/qt.scm (qtdatavis3d): Update to 6.1.0.
* gnu/packages/qt.scm (qtdatavis3d-5): New variable.
---
 gnu/packages/qt.scm | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cd8591ccde..068df405f4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1692,13 +1692,38 @@ QGraphicsWidget, or QML types. Users can easily create impressive graphs by
 selecting one of the charts themes.")
     (license license:gpl3)))
 
-(define-public qtdatavis3d
+;;(define-public qtdatavis3d
+;;  (package (inherit qtsvg)
+;;    (name "qtdatavis3d")
+;;    (version "6.1.0")
+;;    (source (origin
+;;             (method url-fetch)
+;;             (uri (qt5-urls name version))
+;;             (sha256
+;;              (base32
+;;               "12rrig0bgrl33gxpvqhgr2fx3gpiv4pfr9cxv3nijfxc55nn93q6"))))
+;;    (arguments
+;;     (substitute-keyword-arguments (package-arguments qtsvg)
+;;       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+;;    (inputs
+;;     `(("libxkbcommon" ,libxkbcommon)
+;;       ("qtbase" ,qtbase)
+;;       ("qtdeclarative" ,qtdeclarative)))
+;;    (synopsis "Qt Data Visualization module")
+;;    (description "The Qt Data Visualization module provides a way to visualize
+;;data in 3D as bar, scatter, and surface graphs. It is especially useful for
+;;visualizing depth maps and large quantities of rapidly changing data, such as
+;;data received from multiple sensors. The look and feel of graphs can be
+;;customized by using themes or by adding custom items and labels to them.")
+;;    (license license:gpl3)))
+
+(define-public qtdatavis3d-5
   (package (inherit qtsvg-5)
-    (name "qtdatavis3d")
+    (name "qtdatavis3d-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtdatavis3d" version))
              (sha256
               (base32
                "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
@@ -3110,7 +3135,7 @@ color-related widgets.")
        ("libxslt" ,libxslt)
        ("clang-toolchain" ,clang-toolchain)
        ("qtbase" ,qtbase-5)
-       ("qtdatavis3d" ,qtdatavis3d)
+       ("qtdatavis3d" ,qtdatavis3d-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
-- 
2.31.1

From c99e2da740a7fe1c933493ccfb08caf45aa9d0c9 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 20:10:00 -0500
Subject: [PATCH 30/37] gnu: qtnetworkauth: Update to 6.1.0.

* gnu/packages/qt.scm (qtnetworkauth): Update to 6.1.0.
* gnu/packages/qt.scm (qtnetworkauth-5): New variable.
---
 gnu/packages/kde-internet.scm |  2 +-
 gnu/packages/kde-pim.scm      |  2 +-
 gnu/packages/qt.scm           | 30 ++++++++++++++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index c0fee36988..ff1eab00fb 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -91,7 +91,7 @@
        ("qca" ,qca)
        ("qoauth" ,qoauth)
        ("qtbase" ,qtbase-5)
-       ("qtnetworkauth" ,qtnetworkauth)
+       ("qtnetworkauth" ,qtnetworkauth-5)
        ("qtwebkit" ,qtwebkit)
        ("sonnet" ,sonnet)))
     (home-page "https://kde.org/applications/internet/org.kde.choqok")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index bea2ad8ed8..a82f0bd1b0 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -741,7 +741,7 @@ for KDE PIM.")
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtnetworkauth" ,qtnetworkauth)
+       ("qtnetworkauth" ,qtnetworkauth-5)
        ("qtspeech" ,qtspeech)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 068df405f4..04d481de16 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1742,12 +1742,38 @@ customized by using themes or by adding custom items and labels to them.")
     (license license:gpl3)))
 
 (define-public qtnetworkauth
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtnetworkauth")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "1lxx3vlc2bzp2a38iq7w0q5v4xgymlaahpn6pmja6ddnwi0sks5s"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'remove-failing-test
+             (lambda _
+               ;; These tests can't find their test data.
+               (substitute* "tests/auto/auto.pro"
+                 (("oauth1 ") "# oauth1 "))
+               #t))))))
+    (inputs
+     `(("qtbase" ,qtbase)))
+    (synopsis "Qt Network Authorization module")
+    (description "The Qt Network Authorization module provides an
+implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
+
+(define-public qtnetworkauth-5
+  (package (inherit qtsvg-5)
+    (name "qtnetworkauth-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtnetworkauth" version))
              (sha256
               (base32
                "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
-- 
2.31.1

From b4d042e1e786eaef630b1f03e70cf4254b9094c4 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 20:12:00 -0500
Subject: [PATCH 31/37] gnu: qtpurchasing: Remove variable.

 * gnu/packages/qt.scm (qtremoteobjects): Remove variable.
 * gnu/packages/qt.scm (qtremoteobjects-5): New variable.
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 04d481de16..ae62c9cfee 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1793,9 +1793,9 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
     (description "The Qt Network Authorization module provides an
 implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
 
-(define-public qtremoteobjects
+(define-public qtremoteobjects-5
   (package (inherit qtsvg-5)
-    (name "qtremoteobjects")
+    (name "qtremoteobjects-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-- 
2.31.1

From 84df7d4a5988609dac7a635d6804e4d48ca297de Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Fri, 21 May 2021 20:19:13 -0500
Subject: [PATCH 32/37] gnu: qtspell: Remove variable.

 * gnu/packages/qt.scm (qtspeech): Remove variable.
 * gnu/packages/qt.scm (qtspeech-5): New variable.
---
 gnu/packages/games.scm          | 2 +-
 gnu/packages/kde-frameworks.scm | 4 ++--
 gnu/packages/kde-pim.scm        | 4 ++--
 gnu/packages/kde-utils.scm      | 2 +-
 gnu/packages/kde.scm            | 2 +-
 gnu/packages/qt.scm             | 6 +++---
 gnu/packages/radio.scm          | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bb4e21f949..53adde135b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11916,7 +11916,7 @@ and chess engines.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (arguments
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b72ccf03fb..9275e0cad8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1898,7 +1898,7 @@ asynchronous jobs.")
        ("kwindowsystem" ,kwindowsystem)
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ;; TODO: Think about adding dbusmenu-qt5 from
        ;; https://launchpad.net/libdbusmenu-qt
        ("qtx11extras" ,qtx11extras-5)))
@@ -3263,7 +3263,7 @@ library.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)))
+       ("qtspeech" ,qtspeech-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
     (description "KTextWidgets provides widgets for displaying and editing text.
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index a82f0bd1b0..f0f06da67f 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -742,7 +742,7 @@ for KDE PIM.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtnetworkauth" ,qtnetworkauth-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
@@ -1737,7 +1737,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 08f0d930bd..628e57f7d2 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -197,7 +197,7 @@ whom pressing buttons hurts.")
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)))
+       ("qtspeech" ,qtspeech-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.kmouth")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 57c6d7192b..520a9fb0dc 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1045,7 +1045,7 @@ Python, PHP, and Perl.")
        ("kio" ,kio)
        ("kparts" ,kparts)
        ("kpty" ,kpty)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("kwallet" ,kwallet)
        ("kwindowsystem" ,kwindowsystem)
        ("libkexiv2" ,libkexiv2)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ae62c9cfee..722c614009 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1827,9 +1827,9 @@ communication} (IPC) module developed for Qt.  The idea is to extend existing
 Qt's functionalities to enable an easy exchange of information between
 processes or computers.")))
 
-(define-public qtspeech
+(define-public qtspeech-5
   (package (inherit qtsvg-5)
-    (name "qtspeech")
+    (name "qtspeech-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
@@ -3168,7 +3168,7 @@ color-related widgets.")
        ("qtscript" ,qtscript-5)
        ("qtscxml" ,qtscxml-5)
        ("qtsensors" ,qtsensors-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebsockets" ,qtwebsockets-5)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 7823759269..0abb4dbace 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1804,7 +1804,7 @@ voice formats.")
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtwebsockets" ,qtwebsockets-5)
        ("rtl-sdr" ,rtl-sdr)
        ("serialdv" ,serialdv)
-- 
2.31.1

From 2f282e2109a1f9d0d5140dd1f66a2d0484194680 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Sat, 22 May 2021 05:10:23 -0500
Subject: [PATCH 33/37] gnu: qtquickcontrols: Remove variable.

 * gnu/packages/qt.scm (qtquickcontrols): Remove variable.
 * gnu/packages/qt.scm (qtquickcontrols2): Update to 6.1.0.
 * gnu/packages/qt.scm (qtquickcontrols-5): New variable.
 * gnu/packages/qt.scm (qtquickcontrols2-5): New variable.
---
 gnu/packages/audio.scm            | 2 +-
 gnu/packages/display-managers.scm | 2 +-
 gnu/packages/documentation.scm    | 2 +-
 gnu/packages/education.scm        | 2 +-
 gnu/packages/finance.scm          | 2 +-
 gnu/packages/jami.scm             | 2 +-
 gnu/packages/kde-multimedia.scm   | 4 ++--
 gnu/packages/kde.scm              | 6 +++---
 gnu/packages/linphone.scm         | 2 +-
 gnu/packages/messaging.scm        | 2 +-
 gnu/packages/qt.scm               | 8 ++++----
 gnu/packages/telephony.scm        | 2 +-
 gnu/packages/terminals.scm        | 2 +-
 gnu/packages/text-editors.scm     | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 6b701da93a..67969dcd61 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5098,7 +5098,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.")
        ("qttools" ,qttools-5)))
     (inputs
      `(("jack" ,jack-1)                       ;for JACK examples
-       ("qtquickcontrols" ,qtquickcontrols))) ;for Qt examples
+       ("qtquickcontrols" ,qtquickcontrols-5))) ;for Qt examples
     (propagated-inputs
      ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp
      ;; contains '#include <asio.hpp>'.
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 6948491d66..a0c926373a 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -87,7 +87,7 @@
        ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to
        ;; 'wrap-qt-program'.
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
 
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index c2eee7c0ce..ae8246f16e 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -334,7 +334,7 @@ local system.")
          ("qtdeclarative" ,qtdeclarative-5)
          ("qtwebchannel" ,qtwebchannel-5)
          ("qtwebengine" ,qtwebengine)
-         ("qtquickcontrols" ,qtquickcontrols)
+         ("qtquickcontrols" ,qtquickcontrols-5)
          ("qtx11extras" ,qtx11extras-5)
          ("xcb-util-keyms" ,xcb-util-keysyms)))
       (home-page "https://zealdocs.org/")
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 94846ce915..6600078b11 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -194,7 +194,7 @@ of categories with some of the activities available in that category.
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtsensors" ,qtsensors-5)
        ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 0060d335e8..ef7a2c9387 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -776,7 +776,7 @@ the Monero command line client and daemon.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2",qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 6a4be92cb7..d8d497f38b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -607,7 +607,7 @@ decentralized calling using P2P-DHT.")
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)))
     (propagated-inputs
      `(("libring" ,libring)))           ;for dring
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index e0c1559a77..af6ddfab26 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -173,7 +173,7 @@ This package is part of the KDE multimedia module.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5) ; not listed as dependency
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras-5)
@@ -471,7 +471,7 @@ autoloading of subtitle files for use while playing video.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5) ; not listed as dependency
        ("qtx11extras" ,qtx11extras-5)))
     (arguments
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 520a9fb0dc..92f83baf43 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -259,7 +259,7 @@ browser for easy news reading.")
          ("kdoctools" ,kdoctools)
          ("kdeclarative" ,kdeclarative)
          ("qtdeclarative" ,qtdeclarative-5)
-         ("qtquickcontrols" ,qtquickcontrols)
+         ("qtquickcontrols" ,qtquickcontrols-5)
          ("qtquickcontrols2" ,qtquickcontrols2-5)
          ("kiconthemes" ,kiconthemes)
          ("breeze" ,breeze) ; make dark them available easily
@@ -352,7 +352,7 @@ projects.")
        ("oxygen-icons" ,oxygen-icons)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols" ,qtquickcontrols)  ;; not checked as requirement
+       ("qtquickcontrols" ,qtquickcontrols-5)  ;; not checked as requirement
        ("qtquickcontrols2" ,qtquickcontrols2-5)  ;; not checked as requirement
        ("qtwebkit" ,qtwebkit)
        ("threadweaver" ,threadweaver)
@@ -752,7 +752,7 @@ different notification systems.")
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtwayland" ,qtwayland-5)
        ("qtx11extras" ,qtx11extras-5)))
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 3e0f50267b..59cf452b24 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -863,7 +863,7 @@ and video calls or instant messaging capabilities to an application.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)))
     (synopsis "Desktop client for the Linphone SIP softphone")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 360e3735b4..54e3ba5a83 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2385,7 +2385,7 @@ There is support for:
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtquickcontrols2" ,qtquickcontrols2-5)
        ("qtsvg" ,qtsvg-5)
        ("qttools" ,qttools-5)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 722c614009..85e3f6adf0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1392,7 +1392,7 @@ native APIs where it makes sense.")))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols2-5)
        ("qtserialport" ,qtserialport-5)))
     (inputs
      `(("icu4c" ,icu4c)
@@ -1475,7 +1475,7 @@ that helps in Qt development.")))
 The following guides and references cover aspects of programming with
 ECMAScript and Qt.")))
 
-(define-public qtquickcontrols-2-5
+(define-public qtquickcontrols-5
   (package (inherit qtsvg-5)
     (name "qtquickcontrols-5")
     (version "5.15.2")
@@ -1502,7 +1502,7 @@ can be used to build complete interfaces in Qt Quick.")))
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtquickcontrols2" version))
              (sha256
               (base32
                "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
@@ -3164,7 +3164,7 @@ color-related widgets.")
        ("qtdatavis3d" ,qtdatavis3d-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtscript" ,qtscript-5)
        ("qtscxml" ,qtscxml-5)
        ("qtsensors" ,qtsensors-5)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index eed82071e0..ceb689fb8b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -707,7 +707,7 @@ Mumble consists of two applications for separate usage:
        ("libxml2" ,libxml2)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("readline" ,readline)
        ("speex" ,speex)
        ("speexdsp" ,speexdsp)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index dd5b62df76..79c229a896 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -648,7 +648,7 @@ embedded kernel situations.")
        `(("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative-5)
          ("qtgraphicaleffects" ,qtgraphicaleffects-5)
-         ("qtquickcontrols" ,qtquickcontrols)))
+         ("qtquickcontrols" ,qtquickcontrols-5)))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index cfb9c601d7..00e761f055 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -620,7 +620,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols" ,qtquickcontrols-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel-5)))
     (propagated-inputs                  ; To get native-search-path
-- 
2.31.1

From 52bb6ec4a025683604d07fc650394ae2d0a860cb Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Sat, 22 May 2021 05:33:17 -0500
Subject: [PATCH 34/37] gnu: qtwebengine: Remove variable.

 * gnu/packages/qt.scm (qtwebengine): Remove variable.
 * gnu/packages/qt.scm (qtwebengine-5): New variable.
---
 gnu/packages/audio.scm         |  2 +-
 gnu/packages/documentation.scm |  2 +-
 gnu/packages/ebook.scm         |  2 +-
 gnu/packages/education.scm     |  4 ++--
 gnu/packages/geo.scm           |  4 ++--
 gnu/packages/jami.scm          |  2 +-
 gnu/packages/kde-pim.scm       | 12 ++++++------
 gnu/packages/kde.scm           |  2 +-
 gnu/packages/messaging.scm     |  2 +-
 gnu/packages/qt.scm            | 30 ++++++++++++++++++++++++++----
 gnu/packages/sync.scm          |  2 +-
 gnu/packages/text-editors.scm  |  2 +-
 gnu/packages/vpn.scm           |  2 +-
 gnu/packages/web-browsers.scm  |  2 +-
 gnu/packages/web.scm           |  2 +-
 15 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 67969dcd61..c542af8a7f 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2886,7 +2886,7 @@ link REQUIRED)"))
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebsockets" ,qtwebsockets-5)))
     (propagated-inputs                  ;to get native-search-path
-     `(("qtwebengine" ,qtwebengine)))
+     `(("qtwebengine" ,qtwebengine-5)))
     (home-page "https://github.com/supercollider/supercollider")
     (synopsis "Synthesis engine and programming language")
     (description "SuperCollider is a synthesis engine (@code{scsynth} or
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index ae8246f16e..d730c4c6ae 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -333,7 +333,7 @@ local system.")
          ("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative-5)
          ("qtwebchannel" ,qtwebchannel-5)
-         ("qtwebengine" ,qtwebengine)
+         ("qtwebengine" ,qtwebengine-5)
          ("qtquickcontrols" ,qtquickcontrols-5)
          ("qtx11extras" ,qtx11extras-5)
          ("xcb-util-keyms" ,xcb-util-keysyms)))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 565b800e96..a39eb0decc 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -197,7 +197,7 @@ with Microsoft Compiled HTML (CHM) files")
        ("python-regex" ,python-regex)
        ("python-speechd" ,speech-dispatcher)
        ("python-zeroconf" ,python-zeroconf)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("sqlite" ,sqlite)))
     (arguments
      `(;; Calibre is using setuptools by itself, but the setup.py is not
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 6600078b11..b36f2ee66d 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -786,7 +786,7 @@ adjust the level of difficulty.")
                (for-each (lambda (program)
                            (wrap-program program
                              `("QTWEBENGINEPROCESS_PATH" =
-                               (,qtwebengineprocess))
+                               (,qtwebengine-5process))
                              `("PATH" prefix (,(string-append
                                                 (assoc-ref inputs "mpv")
                                                 "/bin")))
@@ -813,7 +813,7 @@ adjust the level of difficulty.")
        ("python-sip" ,python-sip)
        ;; `qtwebengine' is included in `pyqtwebengine', included here for easy
        ;; wrapping.
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (home-page "https://apps.ankiweb.net/")
     (synopsis "Powerful, intelligent flash cards")
     (description "Anki is a program which makes remembering things
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 0ec6f3d2be..b18ac8d6fa 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1667,7 +1667,7 @@ using the dataset of topographical information collected by
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("quazip" ,quazip)
        ("routino" ,routino)
        ("sqlite" ,sqlite)                      ; See wrap phase
@@ -1701,7 +1701,7 @@ using the dataset of topographical information collected by
                (for-each (lambda (program)
                            (wrap-program program
                              `("QTWEBENGINEPROCESS_PATH" =
-                               (,qtwebengineprocess))))
+                               (,qtwebengine-5process))))
                          (find-files bin ".*")))
              #t)))))
     (synopsis "GPS mapping application")
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index d8d497f38b..e718f2b0bd 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -602,7 +602,7 @@ decentralized calling using P2P-DHT.")
        ("network-manager" ,network-manager)
        ("qrencode" ,qrencode)
        ("qtsvg" ,qtsvg-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtdeclarative" ,qtdeclarative-5)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index f0f06da67f..dc343fce73 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -744,7 +744,7 @@ for KDE PIM.")
        ("qtnetworkauth" ,qtnetworkauth-5)
        ("qtspeech" ,qtspeech-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
       ;; TODO: 5/45 tests fail for quite different reasons, even with
@@ -1099,7 +1099,7 @@ and retrieving certificates from LDAP servers.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:phases
@@ -1358,7 +1358,7 @@ using a Qt/KMime C++ API.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("qtwebkit" ,qtwebkit)
        ("sonnet" ,sonnet)))
     (arguments
@@ -1698,7 +1698,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
        ("libxslt" ,libxslt)
        ("purpose" ,purpose)
        ("qtbase" ,qtbase-5)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (arguments
      `(#:tests? #f)) ;; TODO tests hang
     (home-page "https://invent.kde.org/pim/pimcommon")
@@ -1895,7 +1895,7 @@ and allows one to view/extract message formatted text in Rich Text Format.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (arguments
      `(#:tests? #f)) ;; TODO 6/48 tests fail
     (home-page "https://invent.kde.org/pim/libkgapi")
@@ -1981,7 +1981,7 @@ KDE using certificate-based crypto.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 92f83baf43..23b9998a1b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -205,7 +205,7 @@ This package contains GUI widgets for baloo.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("syndication" ,syndication)))
     (home-page "https://apps.kde.org/en/akregator")
     (synopsis "KDE Feed Reader")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 54e3ba5a83..66cd0400ec 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2726,7 +2726,7 @@ as phones, embedded computers or microcontrollers.")
          ("qtdeclarative" ,qtdeclarative-5)
          ("qtwebchannel" ,qtwebchannel-5)))
       (propagated-inputs
-       `(("qtwebengine" ,qtwebengine)))
+       `(("qtwebengine" ,qtwebengine-5)))
       (home-page "https://movim.eu/")
       (synopsis "Desktop Application for Movim")
       (description
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 85e3f6adf0..cf44a55af6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1496,6 +1496,28 @@ ECMAScript and Qt.")))
 applications scriptable.  This module provides a set of extra components that
 can be used to build complete interfaces in Qt Quick.")))
 
+(define-public qtquickcontrols2
+  (package (inherit qtsvg)
+    (name "qtquickcontrols2")
+    (version "6.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtquickcontrols2" version))
+             (sha256
+              (base32
+               "0nbxjp1plh6qpbb6cmkz6nyh2a77hmni2shjbc4rzxadwxwiskvq"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (synopsis "Qt Quick Controls 2 and other Quick 2 modules")
+    (description "The Qt Quick Controls 2 module contains the Qt Labs Platform
+module that provides platform integration: native dialogs, menus and menu bars,
+and tray icons.  It falls back to Qt Widgets when a native implementation is
+not available.")))
+
 (define-public qtquickcontrols2-5
   (package (inherit qtsvg-5)
     (name "qtquickcontrols2-5")
@@ -1887,15 +1909,15 @@ using the Enchant spell-checking library.")
     ;; COPYING file specify GPL3, but source code files all refer to GPL2+.
     (license license:gpl2+)))
 
-(define-public qtwebengine
+(define-public qtwebengine-5
   (package
     (inherit qtsvg-5)
-    (name "qtwebengine")
+    (name "qtwebengine-5")
     (version (package-version qtbase))
     (source
      (origin
        (method url-fetch)
-       (uri (qt5-urls name version))
+       (uri (qt5-urls "qtwebengine" version))
        (sha256
         (base32
          "1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8"))
@@ -2462,7 +2484,7 @@ contain over 620 classes.")
        ("qtsvg" ,qtsvg-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (arguments
      `(#:modules ((srfi srfi-1)
                   ((guix build python-build-system) #:select (python-version))
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 112f5ee285..9f7864bccb 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -206,7 +206,7 @@
        ("xdg-utils" ,xdg-utils)
        ("zlib" ,zlib)))
     (propagated-inputs
-     `(("qtwebengine" ,qtwebengine)))
+     `(("qtwebengine" ,qtwebengine-5)))
     (synopsis "Desktop sync client for Nextcloud")
     (description "Nextcloud-Desktop is a tool to synchronize files from
 Nextcloud Server with your computer.")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 00e761f055..7b21b62ac6 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -624,7 +624,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel-5)))
     (propagated-inputs                  ; To get native-search-path
-     `(("qtwebengine" ,qtwebengine)))
+     `(("qtwebengine" ,qtwebengine-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index a952e3f0db..4532b58af5 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -340,7 +340,7 @@ and probably others.")
        ("python-pyxdg" ,python-pyxdg)
        ("python-structlog" ,python-structlog)
        ("python-toml" ,python-toml)
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (native-inputs
      `(("python-pytest" ,python-pytest)
        ("python-setuptools-scm" ,python-setuptools-scm)))
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index edf9068618..02bf12cfe3 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -510,7 +510,7 @@ interface.")
        ("python-pyqt" ,python-pyqt)
        ;; While qtwebengine is provided by python-pyqtwebengine, it's
        ;; included here so we can wrap QTWEBENGINEPROCESS_PATH.
-       ("qtwebengine" ,qtwebengine)))
+       ("qtwebengine" ,qtwebengine-5)))
     (arguments
      `(;; FIXME: With the existance of qtwebengine, tests can now run.  But
        ;; they are still disabled because test phase hangs.  It's not readily
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d3572999c7..ccb1a1b610 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8155,7 +8155,7 @@ It contains the code shared by all Kiwix ports.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel-5)
-       ("qtwebengine" ,qtwebengine)
+       ("qtwebengine" ,qtwebengine-5)
        ("xapian" ,xapian)
        ("zlib" ,zlib)
        ("zstd" ,zstd "lib")))
-- 
2.31.1

From 52e8e0bbea2018ab5bc7ca0ab1a16be18cc755ec Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Sun, 23 May 2021 07:44:59 -0500
Subject: [PATCH 35/37] gnu: octave: Use qttools-5

    * gnu/packages/maths.scm (luakit): Use qttools-5
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 981c594e0f..cc2290d923 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2055,7 +2055,7 @@ script files.")
        ("qt" ,qtbase-5)
        ,@(package-inputs octave-cli)))
     (native-inputs
-     `(("qttools" , qttools) ;for lrelease
+     `(("qttools" , qttools-5) ;for lrelease
        ("texlive" ,(texlive-union (list texlive-epsf))) ; for texi2dvi
        ,@(package-native-inputs octave-cli)))
     (arguments
-- 
2.31.1

From e7498b3ff9bd650d7e64110b63225a926e6597fd Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Mon, 24 May 2021 09:40:23 -0500
Subject: [PATCH 36/37] gnu: qtdatavis3d: New variable.

    * gnu/packages/qt.scm (qtdatavis3d): New variable.
---
 gnu/packages/qt.scm | 48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cf44a55af6..0a978f8467 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1714,30 +1714,30 @@ QGraphicsWidget, or QML types. Users can easily create impressive graphs by
 selecting one of the charts themes.")
     (license license:gpl3)))
 
-;;(define-public qtdatavis3d
-;;  (package (inherit qtsvg)
-;;    (name "qtdatavis3d")
-;;    (version "6.1.0")
-;;    (source (origin
-;;             (method url-fetch)
-;;             (uri (qt5-urls name version))
-;;             (sha256
-;;              (base32
-;;               "12rrig0bgrl33gxpvqhgr2fx3gpiv4pfr9cxv3nijfxc55nn93q6"))))
-;;    (arguments
-;;     (substitute-keyword-arguments (package-arguments qtsvg)
-;;       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-;;    (inputs
-;;     `(("libxkbcommon" ,libxkbcommon)
-;;       ("qtbase" ,qtbase)
-;;       ("qtdeclarative" ,qtdeclarative)))
-;;    (synopsis "Qt Data Visualization module")
-;;    (description "The Qt Data Visualization module provides a way to visualize
-;;data in 3D as bar, scatter, and surface graphs. It is especially useful for
-;;visualizing depth maps and large quantities of rapidly changing data, such as
-;;data received from multiple sensors. The look and feel of graphs can be
-;;customized by using themes or by adding custom items and labels to them.")
-;;    (license license:gpl3)))
+(define-public qtdatavis3d
+  (package (inherit qtsvg)
+    (name "qtdatavis3d")
+    (version "6.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "12rrig0bgrl33gxpvqhgr2fx3gpiv4pfr9cxv3nijfxc55nn93q6"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+    (inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (synopsis "Qt Data Visualization module")
+    (description "The Qt Data Visualization module provides a way to visualize
+data in 3D as bar, scatter, and surface graphs. It is especially useful for
+visualizing depth maps and large quantities of rapidly changing data, such as
+data received from multiple sensors. The look and feel of graphs can be
+customized by using themes or by adding custom items and labels to them.")
+    (license license:gpl3)))
 
 (define-public qtdatavis3d-5
   (package (inherit qtsvg-5)
-- 
2.31.1

From 41849c504dcde7cfedaa1a629e3c4d8768b83027 Mon Sep 17 00:00:00 2001
From: Eric Brown <[email-masked]>
Date: Mon, 24 May 2021 10:01:29 -0500
Subject: [PATCH 37/37] gnu: qt5compat: New variable.

    * gnu/packages/qt.scm (qt5compat): New variable.
---
 gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0a978f8467..bd136a1028 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -799,6 +799,35 @@ HostData=lib/qt5
     (description "The QtSvg module provides classes for displaying the
  contents of SVG files.")))
 
+(define-public qt5compat
+  (package (inherit qtsvg)
+    (name "qt5compat")
+    (version "6.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "0g6jiw620k02p96mzdkv21frwcgcf4bjggainawbif024z5fdmy7"))
+             (modules '((guix build utils)))
+;;             (snippet
+;;              '(begin
+;;                 (delete-file-recursively "tests/3rdparty")
+;;                 ;; the scion test refers to the bundled 3rd party test code.
+;;                 (substitute* "tests/auto/auto.pro"
+;;                   (("scion") "#"))
+;;                 #t))
+             ))
+    (native-inputs `(("perl" ,perl)))
+    (inputs
+     `(("icu4c" ,icu4c)
+       ("libxkbcommon" ,libxkbcommon)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (synopsis "Qt 5 Compatibility module")
+    (description "The Qt Compatibility module provides contains 
+unsupported Qt 5 APIs.")))
+
 (define-public qtimageformats
   (package (inherit qtsvg)
     (name "qtimageformats")
-- 
2.31.1