Merge master into staging-next

2020-04-03 21:54:40 +02:00
parent ac46ffbcfc 3420bd63b9
commit 92124ed660
357 changed files with 6567 additions and 4186 deletions
@@ -155,6 +155,7 @@ let
      qtserialport = callPackage ../modules/qtserialport.nix {};
      qtspeech = callPackage ../modules/qtspeech.nix {};
      qtsvg = callPackage ../modules/qtsvg.nix {};
+      qtscxml = callPackage ../modules/qtscxml.nix {};
      qttools = callPackage ../modules/qttools.nix {};
      qttranslations = callPackage ../modules/qttranslations.nix {};
      qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};