diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d16bc6e..1eb34d0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,17 +39,18 @@ endif()
 if("${Qt5_DIR}" STREQUAL "" AND "${Qt6_DIR}" STREQUAL "")
     message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!")
 else()
-    # TODO ckeck find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
     if(NOT "${Qt5_DIR}" STREQUAL "")
-        find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg WebEngine WebEngineCore Widgets)
-        set(Qt Qt${Qt5_VERSION_MAJOR}) # TODO find better solution for Qt namespace
+        find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
+        find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
+        set(Qt Qt${Qt5_VERSION_MAJOR})
         set(Qt_VERSION       ${Qt5_VERSION})
         set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
         set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR})
         set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH})
     elseif(NOT "${Qt6_DIR}" STREQUAL "")
-        find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg WebEngineCore WebEngineQuick Widgets)
-        set(Qt Qt${Qt6_VERSION_MAJOR}) # TODO find better solution for Qt namespace
+        find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
+        find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick)
+        set(Qt Qt${Qt6_VERSION_MAJOR})
         set(Qt_VERSION       ${Qt6_VERSION})
         set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
         set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})