Resolve correctly the three-way merge between https://github.com/NixOS/nixpkgs/pull/251681, https://github.com/NixOS/nixpkgs/pull/227900, and https://github.com/NixOS/nixpkgs/pull/246022 |
||
---|---|---|
.. | ||
qt3d.nix | ||
qtbase.nix | ||
qtcharts.nix | ||
qtconnectivity.nix | ||
qtdatavis3d.nix | ||
qtdeclarative.nix | ||
qtdoc.nix | ||
qtgamepad.nix | ||
qtgraphicaleffects.nix | ||
qtimageformats.nix | ||
qtlocation.nix | ||
qtlottie.nix | ||
qtmacextras.nix | ||
qtmultimedia.nix | ||
qtnetworkauth.nix | ||
qtpim.nix | ||
qtpositioning.nix | ||
qtquickcontrols.nix | ||
qtquickcontrols2.nix | ||
qtremoteobjects.nix | ||
qtscript.nix | ||
qtscxml.nix | ||
qtsensors.nix | ||
qtserialbus.nix | ||
qtserialport.nix | ||
qtspeech.nix | ||
qtsvg.nix | ||
qtsystems.nix | ||
qttools.nix | ||
qttranslations.nix | ||
qtvirtualkeyboard.nix | ||
qtwayland-app_id.patch | ||
qtwayland.nix | ||
qtwebchannel.nix | ||
qtwebengine.nix | ||
qtwebglplugin.nix | ||
qtwebkit.nix | ||
qtwebsockets.nix | ||
qtwebview.nix | ||
qtx11extras.nix | ||
qtxmlpatterns.nix |