Use list in CMakeFiles instead of set

keepassxreboot · Jun 29, 2022 · d51dfab · d51dfab
1 parent 052fa52
commit d51dfab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -454,7 +454,7 @@ include(CLangFormat)
 set(QT_COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools)
 if(UNIX AND NOT APPLE)
     if(WITH_XC_X11)
-        set(QT_COMPONENTS ${QT_COMPONENTS} X11Extras)
+        list(APPEND QT_COMPONENTS X11Extras)
     endif()
     find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
 elseif(APPLE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -208,8 +208,7 @@ if(UNIX AND NOT APPLE)
             gui/osutils/nixutils/ScreenLockListenerDBus.cpp
             gui/osutils/nixutils/NixUtils.cpp)
     if(WITH_XC_X11)
-        set(keepassx_SOURCES
-            ${keepassx_SOURCES}
+        list(APPEND keepassx_SOURCES
             gui/osutils/nixutils/X11Funcs.cpp)
     endif()
     qt5_add_dbus_adaptor(keepassx_SOURCES
@@ -365,7 +364,7 @@ endif()
 if(UNIX AND NOT APPLE)
     target_link_libraries(keepassx_core Qt5::DBus)
     if(WITH_XC_X11)
-        target_link_libraries(keepassx_core Qt5::DBus Qt5::X11Extras X11)
+        target_link_libraries(keepassx_core Qt5::X11Extras X11)
     endif()
     include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 endif()

diff --git a/src/gui/osutils/nixutils/NixUtils.cpp b/src/gui/osutils/nixutils/NixUtils.cpp
@@ -184,9 +184,7 @@ bool NixUtils::isCapslockEnabled()
 
 void NixUtils::registerNativeEventFilter()
 {
-#ifdef WITH_XC_X11
     qApp->installNativeEventFilter(this);
-#endif
 }
 
 bool NixUtils::nativeEventFilter(const QByteArray& eventType, void* message, long*)