diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index 5725678516b..61ae19ef534 100644
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -231,8 +231,10 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("mpi", when="+mpi")
     conflicts("mpi", when="~mpi")
 
-    depends_on("qmake", when="@5.12.0:+qt")
-    depends_on("qt", when="@5.3.0:5.11+qt")
+    with when("+qt")
+        depends_on("qmake", when="@5.12.0:")
+        depends_on("qt", when="@5.3.0:5.11")
+        depends_on("qt@:4", when="@:5.2.0")
     with when("^[virtuals=qmake] qt-base"):
         depends_on("qt-base+gui+network+widgets")
         depends_on("qt-base+opengl", when="+opengl2")
@@ -241,10 +243,9 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
         depends_on("qt-5compat")
         depends_on("qt-svg")
     with when("^[virtuals=qmake] qt"):
+        depends_on("qt+sql")
         depends_on("qt+opengl", when="+opengl2")
         depends_on("qt~opengl", when="~opengl2")
-    depends_on("qt@:4", when="@:5.2.0+qt")
-    depends_on("qt+sql", when="+qt")
 
     depends_on("gl@3.2:", when="+opengl2")
     depends_on("gl@1.2:", when="~opengl2")