forked from quickshell/quickshell
		
	all: add DEPENDENCIES entries to qml modules
Fixes some qmlls/qmllint issues.
This commit is contained in:
		
							parent
							
								
									9980f8587e
								
							
						
					
					
						commit
						a931adf033
					
				
					 17 changed files with 27 additions and 2 deletions
				
			
		| 
						 | 
					@ -44,6 +44,7 @@ target_link_libraries(quickshell-core PRIVATE quickshell-build)
 | 
				
			||||||
qt_add_qml_module(quickshell-core
 | 
					qt_add_qml_module(quickshell-core
 | 
				
			||||||
	URI Quickshell
 | 
						URI Quickshell
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQuick
 | 
				
			||||||
	OPTIONAL_IMPORTS Quickshell._Window
 | 
						OPTIONAL_IMPORTS Quickshell._Window
 | 
				
			||||||
	DEFAULT_IMPORTS Quickshell._Window
 | 
						DEFAULT_IMPORTS Quickshell._Window
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,7 +14,11 @@ qt_add_library(quickshell-dbusmenu STATIC
 | 
				
			||||||
	${DBUS_INTERFACES}
 | 
						${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
 | 
					# dbus headers
 | 
				
			||||||
target_include_directories(quickshell-dbusmenu PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 | 
					target_include_directories(quickshell-dbusmenu PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,6 +16,7 @@ endif()
 | 
				
			||||||
qt_add_qml_module(quickshell-io
 | 
					qt_add_qml_module(quickshell-io
 | 
				
			||||||
	URI Quickshell.Io
 | 
						URI Quickshell.Io
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml
 | 
				
			||||||
	QML_FILES
 | 
						QML_FILES
 | 
				
			||||||
		FileView.qml
 | 
							FileView.qml
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,6 +6,7 @@ qt_add_library(quickshell-service-greetd STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-service-greetd
 | 
					qt_add_qml_module(quickshell-service-greetd
 | 
				
			||||||
	URI Quickshell.Services.Greetd
 | 
						URI Quickshell.Services.Greetd
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-greetd PRIVATE ${QT_DEPS})
 | 
					target_link_libraries(quickshell-service-greetd PRIVATE ${QT_DEPS})
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,6 +30,7 @@ target_include_directories(quickshell-service-mpris PRIVATE ${CMAKE_CURRENT_BINA
 | 
				
			||||||
qt_add_qml_module(quickshell-service-mpris
 | 
					qt_add_qml_module(quickshell-service-mpris
 | 
				
			||||||
	URI Quickshell.Services.Mpris
 | 
						URI Quickshell.Services.Mpris
 | 
				
			||||||
  VERSION 0.1
 | 
					  VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-mpris PRIVATE ${QT_DEPS} quickshell-dbus)
 | 
					target_link_libraries(quickshell-service-mpris PRIVATE ${QT_DEPS} quickshell-dbus)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@ target_include_directories(quickshell-service-notifications PRIVATE ${CMAKE_CURR
 | 
				
			||||||
qt_add_qml_module(quickshell-service-notifications
 | 
					qt_add_qml_module(quickshell-service-notifications
 | 
				
			||||||
	URI Quickshell.Services.Notifications
 | 
						URI Quickshell.Services.Notifications
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-notifications PRIVATE ${QT_DEPS} quickshell-dbus)
 | 
					target_link_libraries(quickshell-service-notifications PRIVATE ${QT_DEPS} quickshell-dbus)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,6 +8,7 @@ qt_add_library(quickshell-service-pam STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-service-pam
 | 
					qt_add_qml_module(quickshell-service-pam
 | 
				
			||||||
	URI Quickshell.Services.Pam
 | 
						URI Quickshell.Services.Pam
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-pam PRIVATE ${QT_DEPS} pam ${PAM_LIBRARIES})
 | 
					target_link_libraries(quickshell-service-pam PRIVATE ${QT_DEPS} pam ${PAM_LIBRARIES})
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,6 +16,7 @@ qt_add_library(quickshell-service-pipewire STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-service-pipewire
 | 
					qt_add_qml_module(quickshell-service-pipewire
 | 
				
			||||||
	URI Quickshell.Services.Pipewire
 | 
						URI Quickshell.Services.Pipewire
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-pipewire PRIVATE ${QT_DEPS} PkgConfig::pipewire)
 | 
					target_link_libraries(quickshell-service-pipewire PRIVATE ${QT_DEPS} PkgConfig::pipewire)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,6 +41,7 @@ target_include_directories(quickshell-service-statusnotifier PRIVATE ${CMAKE_CUR
 | 
				
			||||||
qt_add_qml_module(quickshell-service-statusnotifier
 | 
					qt_add_qml_module(quickshell-service-statusnotifier
 | 
				
			||||||
  URI Quickshell.Services.SystemTray
 | 
					  URI Quickshell.Services.SystemTray
 | 
				
			||||||
  VERSION 0.1
 | 
					  VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell Quickshell.DBusMenu
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-statusnotifier PRIVATE ${QT_DEPS} quickshell-dbus quickshell-dbusmenuplugin)
 | 
					target_link_libraries(quickshell-service-statusnotifier PRIVATE ${QT_DEPS} quickshell-dbus quickshell-dbusmenuplugin)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,6 +30,7 @@ target_include_directories(quickshell-service-upower PRIVATE ${CMAKE_CURRENT_BIN
 | 
				
			||||||
qt_add_qml_module(quickshell-service-upower
 | 
					qt_add_qml_module(quickshell-service-upower
 | 
				
			||||||
	URI Quickshell.Services.UPower
 | 
						URI Quickshell.Services.UPower
 | 
				
			||||||
  VERSION 0.1
 | 
					  VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-upower PRIVATE ${QT_DEPS} quickshell-dbus)
 | 
					target_link_libraries(quickshell-service-upower PRIVATE ${QT_DEPS} quickshell-dbus)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -106,6 +106,7 @@ target_link_libraries(quickshell-wayland-init PRIVATE ${QT_DEPS})
 | 
				
			||||||
qt_add_qml_module(quickshell-wayland
 | 
					qt_add_qml_module(quickshell-wayland
 | 
				
			||||||
	URI Quickshell.Wayland
 | 
						URI Quickshell.Wayland
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQuick Quickshell
 | 
				
			||||||
	IMPORTS ${WAYLAND_MODULES}
 | 
						IMPORTS ${WAYLAND_MODULES}
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,7 @@ qt_add_library(quickshell-hyprland-focus-grab STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-hyprland-focus-grab
 | 
					qt_add_qml_module(quickshell-hyprland-focus-grab
 | 
				
			||||||
	URI Quickshell.Hyprland._FocusGrab
 | 
						URI Quickshell.Hyprland._FocusGrab
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wl_proto(quickshell-hyprland-focus-grab
 | 
					wl_proto(quickshell-hyprland-focus-grab
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,7 @@ qt_add_library(quickshell-hyprland-global-shortcuts STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-hyprland-global-shortcuts
 | 
					qt_add_qml_module(quickshell-hyprland-global-shortcuts
 | 
				
			||||||
	URI Quickshell.Hyprland._GlobalShortcuts
 | 
						URI Quickshell.Hyprland._GlobalShortcuts
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wl_proto(quickshell-hyprland-global-shortcuts
 | 
					wl_proto(quickshell-hyprland-global-shortcuts
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,6 +8,7 @@ qt_add_library(quickshell-hyprland-ipc STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-hyprland-ipc
 | 
					qt_add_qml_module(quickshell-hyprland-ipc
 | 
				
			||||||
	URI Quickshell.Hyprland._Ipc
 | 
						URI Quickshell.Hyprland._Ipc
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-hyprland-ipc PRIVATE ${QT_DEPS})
 | 
					target_link_libraries(quickshell-hyprland-ipc PRIVATE ${QT_DEPS})
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,7 @@ qt_add_library(quickshell-wayland-toplevel-management STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-wayland-toplevel-management
 | 
					qt_add_qml_module(quickshell-wayland-toplevel-management
 | 
				
			||||||
	URI Quickshell.Wayland._ToplevelManagement
 | 
						URI Quickshell.Wayland._ToplevelManagement
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQml Quickshell Quickshell.Wayland
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wl_proto(quickshell-wayland-toplevel-management
 | 
					wl_proto(quickshell-wayland-toplevel-management
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,13 @@ qt_add_library(quickshell-wayland-layershell STATIC
 | 
				
			||||||
	window.cpp
 | 
						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")
 | 
					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)
 | 
					target_link_libraries(quickshell-wayland-layershell PRIVATE ${QT_DEPS} wayland-client)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,6 +9,7 @@ qt_add_library(quickshell-window STATIC
 | 
				
			||||||
qt_add_qml_module(quickshell-window
 | 
					qt_add_qml_module(quickshell-window
 | 
				
			||||||
	URI Quickshell._Window
 | 
						URI Quickshell._Window
 | 
				
			||||||
	VERSION 0.1
 | 
						VERSION 0.1
 | 
				
			||||||
 | 
						DEPENDENCIES QtQuick Quickshell
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_library(quickshell-window-init OBJECT init.cpp)
 | 
					add_library(quickshell-window-init OBJECT init.cpp)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue