all: add DEPENDENCIES entries to qml modules

outfoxxed · outfoxxed · commit 21a4347330c7 · 2024-10-31T14:03:59.000-07:00
Fixes some qmlls/qmllint issues.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -44,6 +44,7 @@ target_link_libraries(quickshell-core PRIVATE quickshell-build)
 qt_add_qml_module(quickshell-core
 	URI Quickshell
 	VERSION 0.1
+	DEPENDENCIES QtQuick
 	OPTIONAL_IMPORTS Quickshell._Window
 	DEFAULT_IMPORTS Quickshell._Window
 )
diff --git a/src/dbus/dbusmenu/CMakeLists.txt b/src/dbus/dbusmenu/CMakeLists.txt
@@ -14,7 +14,11 @@ qt_add_library(quickshell-dbusmenu STATIC
 	${DBUS_INTERFACES}
 )
 
-qt_add_qml_module(quickshell-dbusmenu URI Quickshell.DBusMenu VERSION 0.1)
+qt_add_qml_module(quickshell-dbusmenu
+	URI Quickshell.DBusMenu
+	VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
+)
 
 # dbus headers
 target_include_directories(quickshell-dbusmenu PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
@@ -16,6 +16,7 @@ endif()
 qt_add_qml_module(quickshell-io
 	URI Quickshell.Io
 	VERSION 0.1
+	DEPENDENCIES QtQml
 	QML_FILES
 		FileView.qml
 )
diff --git a/src/services/greetd/CMakeLists.txt b/src/services/greetd/CMakeLists.txt
@@ -6,6 +6,7 @@ qt_add_library(quickshell-service-greetd STATIC
 qt_add_qml_module(quickshell-service-greetd
 	URI Quickshell.Services.Greetd
 	VERSION 0.1
+	DEPENDENCIES QtQml
 )
 
 target_link_libraries(quickshell-service-greetd PRIVATE ${QT_DEPS})
diff --git a/src/services/mpris/CMakeLists.txt b/src/services/mpris/CMakeLists.txt
@@ -30,6 +30,7 @@ target_include_directories(quickshell-service-mpris PRIVATE ${CMAKE_CURRENT_BINA
 qt_add_qml_module(quickshell-service-mpris
 	URI Quickshell.Services.Mpris
   VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
 )
 
 target_link_libraries(quickshell-service-mpris PRIVATE ${QT_DEPS} quickshell-dbus)
diff --git a/src/services/notifications/CMakeLists.txt b/src/services/notifications/CMakeLists.txt
@@ -20,6 +20,7 @@ target_include_directories(quickshell-service-notifications PRIVATE ${CMAKE_CURR
 qt_add_qml_module(quickshell-service-notifications
 	URI Quickshell.Services.Notifications
 	VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
 )
 
 target_link_libraries(quickshell-service-notifications PRIVATE ${QT_DEPS} quickshell-dbus)
diff --git a/src/services/pam/CMakeLists.txt b/src/services/pam/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_add_library(quickshell-service-pam STATIC
 qt_add_qml_module(quickshell-service-pam
 	URI Quickshell.Services.Pam
 	VERSION 0.1
+	DEPENDENCIES QtQml
 )
 
 target_link_libraries(quickshell-service-pam PRIVATE ${QT_DEPS} pam ${PAM_LIBRARIES})
diff --git a/src/services/pipewire/CMakeLists.txt b/src/services/pipewire/CMakeLists.txt
@@ -16,6 +16,7 @@ qt_add_library(quickshell-service-pipewire STATIC
 qt_add_qml_module(quickshell-service-pipewire
 	URI Quickshell.Services.Pipewire
 	VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
 )
 
 target_link_libraries(quickshell-service-pipewire PRIVATE ${QT_DEPS} PkgConfig::pipewire)
diff --git a/src/services/status_notifier/CMakeLists.txt b/src/services/status_notifier/CMakeLists.txt
@@ -41,6 +41,7 @@ target_include_directories(quickshell-service-statusnotifier PRIVATE ${CMAKE_CUR
 qt_add_qml_module(quickshell-service-statusnotifier
   URI Quickshell.Services.SystemTray
   VERSION 0.1
+	DEPENDENCIES QtQml Quickshell Quickshell.DBusMenu
 )
 
 target_link_libraries(quickshell-service-statusnotifier PRIVATE ${QT_DEPS} quickshell-dbus quickshell-dbusmenuplugin)
diff --git a/src/services/upower/CMakeLists.txt b/src/services/upower/CMakeLists.txt
@@ -30,6 +30,7 @@ target_include_directories(quickshell-service-upower PRIVATE ${CMAKE_CURRENT_BIN
 qt_add_qml_module(quickshell-service-upower
 	URI Quickshell.Services.UPower
   VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
 )
 
 target_link_libraries(quickshell-service-upower PRIVATE ${QT_DEPS} quickshell-dbus)
diff --git a/src/wayland/CMakeLists.txt b/src/wayland/CMakeLists.txt
@@ -106,6 +106,7 @@ target_link_libraries(quickshell-wayland-init PRIVATE ${QT_DEPS})
 qt_add_qml_module(quickshell-wayland
 	URI Quickshell.Wayland
 	VERSION 0.1
+	DEPENDENCIES QtQuick Quickshell
 	IMPORTS ${WAYLAND_MODULES}
 )
 
diff --git a/src/wayland/hyprland/focus_grab/CMakeLists.txt b/src/wayland/hyprland/focus_grab/CMakeLists.txt
@@ -7,6 +7,7 @@ qt_add_library(quickshell-hyprland-focus-grab STATIC
 qt_add_qml_module(quickshell-hyprland-focus-grab
 	URI Quickshell.Hyprland._FocusGrab
 	VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
 )
 
 wl_proto(quickshell-hyprland-focus-grab
diff --git a/src/wayland/hyprland/global_shortcuts/CMakeLists.txt b/src/wayland/hyprland/global_shortcuts/CMakeLists.txt
@@ -7,6 +7,7 @@ qt_add_library(quickshell-hyprland-global-shortcuts STATIC
 qt_add_qml_module(quickshell-hyprland-global-shortcuts
 	URI Quickshell.Hyprland._GlobalShortcuts
 	VERSION 0.1
+	DEPENDENCIES QtQml
 )
 
 wl_proto(quickshell-hyprland-global-shortcuts
diff --git a/src/wayland/hyprland/ipc/CMakeLists.txt b/src/wayland/hyprland/ipc/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_add_library(quickshell-hyprland-ipc STATIC
 qt_add_qml_module(quickshell-hyprland-ipc
 	URI Quickshell.Hyprland._Ipc
 	VERSION 0.1
+	DEPENDENCIES QtQml Quickshell
 )
 
 target_link_libraries(quickshell-hyprland-ipc PRIVATE ${QT_DEPS})
diff --git a/src/wayland/toplevel_management/CMakeLists.txt b/src/wayland/toplevel_management/CMakeLists.txt
@@ -7,6 +7,7 @@ qt_add_library(quickshell-wayland-toplevel-management STATIC
 qt_add_qml_module(quickshell-wayland-toplevel-management
 	URI Quickshell.Wayland._ToplevelManagement
 	VERSION 0.1
+	DEPENDENCIES QtQml Quickshell Quickshell.Wayland
 )
 
 wl_proto(quickshell-wayland-toplevel-management
diff --git a/src/wayland/wlr_layershell/CMakeLists.txt b/src/wayland/wlr_layershell/CMakeLists.txt
@@ -4,7 +4,13 @@ qt_add_library(quickshell-wayland-layershell STATIC
 	window.cpp
 )
 
-qt_add_qml_module(quickshell-wayland-layershell URI Quickshell.Wayland._WlrLayerShell VERSION 0.1)
+qt_add_qml_module(quickshell-wayland-layershell
+	URI Quickshell.Wayland._WlrLayerShell
+	VERSION 0.1
+	# Quickshell.Wayland currently creates a dependency cycle, add it here once the main
+	# ls class is moved to this module.
+	DEPENDENCIES QtQuick Quickshell
+)
 
 wl_proto(quickshell-wayland-layershell wlr-layer-shell-unstable-v1 "${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml")
 target_link_libraries(quickshell-wayland-layershell PRIVATE ${QT_DEPS} wayland-client)
diff --git a/src/window/CMakeLists.txt b/src/window/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_library(quickshell-window STATIC
 qt_add_qml_module(quickshell-window
 	URI Quickshell._Window
 	VERSION 0.1
+	DEPENDENCIES QtQuick Quickshell
 )
 
 add_library(quickshell-window-init OBJECT init.cpp)

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ target_link_libraries(quickshell-core PRIVATE quickshell-build)`
`44`	`44`	`qt_add_qml_module(quickshell-core`
`45`	`45`	`URI Quickshell`
`46`	`46`	`VERSION 0.1`
	`47`	`+ DEPENDENCIES QtQuick`
`47`	`48`	`OPTIONAL_IMPORTS Quickshell._Window`
`48`	`49`	`DEFAULT_IMPORTS Quickshell._Window`
`49`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ endif()`
`16`	`16`	`qt_add_qml_module(quickshell-io`
`17`	`17`	`URI Quickshell.Io`
`18`	`18`	`VERSION 0.1`
	`19`	`+ DEPENDENCIES QtQml`
`19`	`20`	`QML_FILES`
`20`	`21`	`FileView.qml`
`21`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ qt_add_library(quickshell-service-greetd STATIC`
`6`	`6`	`qt_add_qml_module(quickshell-service-greetd`
`7`	`7`	`URI Quickshell.Services.Greetd`
`8`	`8`	`VERSION 0.1`
	`9`	`+ DEPENDENCIES QtQml`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`target_link_libraries(quickshell-service-greetd PRIVATE ${QT_DEPS})`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ target_include_directories(quickshell-service-mpris PRIVATE ${CMAKE_CURRENT_BINA`
`30`	`30`	`qt_add_qml_module(quickshell-service-mpris`
`31`	`31`	`URI Quickshell.Services.Mpris`
`32`	`32`	`VERSION 0.1`
	`33`	`+ DEPENDENCIES QtQml Quickshell`
`33`	`34`	`)`
`34`	`35`
`35`	`36`	`target_link_libraries(quickshell-service-mpris PRIVATE ${QT_DEPS} quickshell-dbus)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ target_include_directories(quickshell-service-notifications PRIVATE ${CMAKE_CURR`
`20`	`20`	`qt_add_qml_module(quickshell-service-notifications`
`21`	`21`	`URI Quickshell.Services.Notifications`
`22`	`22`	`VERSION 0.1`
	`23`	`+ DEPENDENCIES QtQml Quickshell`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`target_link_libraries(quickshell-service-notifications PRIVATE ${QT_DEPS} quickshell-dbus)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ qt_add_library(quickshell-service-pam STATIC`
`8`	`8`	`qt_add_qml_module(quickshell-service-pam`
`9`	`9`	`URI Quickshell.Services.Pam`
`10`	`10`	`VERSION 0.1`
	`11`	`+ DEPENDENCIES QtQml`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`target_link_libraries(quickshell-service-pam PRIVATE ${QT_DEPS} pam ${PAM_LIBRARIES})`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ qt_add_library(quickshell-service-pipewire STATIC`
`16`	`16`	`qt_add_qml_module(quickshell-service-pipewire`
`17`	`17`	`URI Quickshell.Services.Pipewire`
`18`	`18`	`VERSION 0.1`
	`19`	`+ DEPENDENCIES QtQml Quickshell`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`target_link_libraries(quickshell-service-pipewire PRIVATE ${QT_DEPS} PkgConfig::pipewire)`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ target_include_directories(quickshell-service-statusnotifier PRIVATE ${CMAKE_CUR`
`41`	`41`	`qt_add_qml_module(quickshell-service-statusnotifier`
`42`	`42`	`URI Quickshell.Services.SystemTray`
`43`	`43`	`VERSION 0.1`
	`44`	`+ DEPENDENCIES QtQml Quickshell Quickshell.DBusMenu`
`44`	`45`	`)`
`45`	`46`
`46`	`47`	`target_link_libraries(quickshell-service-statusnotifier PRIVATE ${QT_DEPS} quickshell-dbus quickshell-dbusmenuplugin)`