diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 601e6e8734..0bb607abfc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5459,7 +5459,7 @@ (define-public ableton-link qttools)) (inputs (list jack-1 ;for JACK examples - qtquickcontrols)) ;for Qt examples + qtquickcontrols-5)) ;for Qt examples (propagated-inputs ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; contains '#include '. diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index e19935daa8..7e0218dbb7 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -91,7 +91,7 @@ (define-public sddm ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 shadow diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 74356318a1..2f4755de55 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -385,7 +385,7 @@ (define-public zeal ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keyms" ,xcb-util-keysyms))) (home-page "https://zealdocs.org/") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 690de4d7de..cb0d71cc54 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -183,7 +183,7 @@ (define-public gcompris-qt qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsensors qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3a757deddf..7ad1873a85 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3424,7 +3424,7 @@ (define-public uranium qtbase qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (arguments diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3b3cd70257..ff6efa0a84 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -805,7 +805,7 @@ (define-public monero-gui ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 181068cc24..8d8d29c0db 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -610,7 +610,7 @@ (define-public jami qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2)) (home-page "https://jami.net") (synopsis "Qt Jami client") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 1c79cd16bc..34da2ef3f2 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -175,7 +175,7 @@ (define-public elisa qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtx11extras @@ -531,7 +531,7 @@ (define-public kamoso qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 ; not listed as dependency qtx11extras)) (arguments diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a0d73b5252..143cb3b6a9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -289,7 +289,7 @@ (define-public kdenlive qtgraphicaleffects qtmultimedia-5 qtnetworkauth - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtsvg-5 @@ -346,7 +346,7 @@ (define-public kdevelop ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement + ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -748,7 +748,7 @@ (define-public kdeconnect qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d30f598c7e..a488fc3244 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -854,7 +854,7 @@ (define-public linphone-desktop qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cc2525aa57..13246d0fbe 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2499,7 +2499,7 @@ (define-public quaternion qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qttools diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 708de406c4..fb6fb5245c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1587,7 +1587,7 @@ (define-public qtlocation (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative-5 qtquickcontrols qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -1636,7 +1636,7 @@ (define-public qtscript The following guides and references cover aspects of programming with ECMAScript and Qt."))) -(define-public qtquickcontrols +(define-public qtquickcontrols-5 (package (inherit qtsvg-5) (name "qtquickcontrols") (version "5.15.2") @@ -3268,7 +3268,7 @@ (define-public python-pyside-2 qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtscxml @@ -3317,7 +3317,7 @@ (define-public python-pyside-2 "qtdeclarative-5" "qtlocation" "qtmultimedia-5" - "qtquickcontrols" + "qtquickcontrols-5" "qtquickcontrols2" "qtscript" "qtscxml" diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5ef93fc3f1..c711c3512f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -707,7 +707,7 @@ (define-public twinkle libxml2 qtbase-5 qtdeclarative-5 - qtquickcontrols + qtquickcontrols-5 readline speex speexdsp diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7abf5b6328..6642620155 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -669,7 +669,7 @@ (define-public ghostwriter qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 30ff377cee..347e84db6f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4860,7 +4860,7 @@ (define-public shotcut qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtwebkit diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6d9dcfb53f..71444d6bb6 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -258,7 +258,7 @@ (define-public bitmask ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs