forked from quickshell/quickshell
		
	build: fix PostReloadHook resolution in LSP
This commit is contained in:
		
							parent
							
								
									a45fc03c7d
								
							
						
					
					
						commit
						4d8055f1cd
					
				
					 9 changed files with 20 additions and 5 deletions
				
			
		| 
						 | 
					@ -122,6 +122,10 @@ private:
 | 
				
			||||||
class PostReloadHook
 | 
					class PostReloadHook
 | 
				
			||||||
    : public QObject
 | 
					    : public QObject
 | 
				
			||||||
    , public QQmlParserStatus {
 | 
					    , public QQmlParserStatus {
 | 
				
			||||||
 | 
						Q_OBJECT;
 | 
				
			||||||
 | 
						QML_ANONYMOUS;
 | 
				
			||||||
 | 
						Q_INTERFACES(QQmlParserStatus);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	PostReloadHook(QObject* parent = nullptr): QObject(parent) {}
 | 
						PostReloadHook(QObject* parent = nullptr): QObject(parent) {}
 | 
				
			||||||
	void classBegin() override {}
 | 
						void classBegin() override {}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,6 +21,7 @@ qt_add_qml_module(quickshell-io
 | 
				
			||||||
		FileView.qml
 | 
							FileView.qml
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					qs_add_module_deps_light(quickshell-io Quickshell)
 | 
				
			||||||
install_qml_module(quickshell-io)
 | 
					install_qml_module(quickshell-io)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-io PRIVATE Qt::Quick)
 | 
					target_link_libraries(quickshell-io PRIVATE Qt::Quick)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -91,6 +91,7 @@ class JsonAdapter
 | 
				
			||||||
    , public QQmlParserStatus {
 | 
					    , public QQmlParserStatus {
 | 
				
			||||||
	Q_OBJECT;
 | 
						Q_OBJECT;
 | 
				
			||||||
	QML_ELEMENT;
 | 
						QML_ELEMENT;
 | 
				
			||||||
 | 
						Q_INTERFACES(QQmlParserStatus);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	void classBegin() override {}
 | 
						void classBegin() override {}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,6 @@ qt_add_qml_module(quickshell-service-notifications
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
qs_add_module_deps_light(quickshell-service-notifications Quickshell)
 | 
					qs_add_module_deps_light(quickshell-service-notifications Quickshell)
 | 
				
			||||||
 | 
					 | 
				
			||||||
install_qml_module(quickshell-service-notifications)
 | 
					install_qml_module(quickshell-service-notifications)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(quickshell-service-notifications PRIVATE Qt::Quick Qt::DBus)
 | 
					target_link_libraries(quickshell-service-notifications PRIVATE Qt::Quick Qt::DBus)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -171,7 +171,11 @@ public:
 | 
				
			||||||
	[[nodiscard]] QBindable<QString> bindableDesktopEntry() const { return &this->bDesktopEntry; };
 | 
						[[nodiscard]] QBindable<QString> bindableDesktopEntry() const { return &this->bDesktopEntry; };
 | 
				
			||||||
	[[nodiscard]] QBindable<QString> bindableImage() const { return &this->bImage; };
 | 
						[[nodiscard]] QBindable<QString> bindableImage() const { return &this->bImage; };
 | 
				
			||||||
	[[nodiscard]] QBindable<bool> bindableHasInlineReply() const { return &this->bHasInlineReply; };
 | 
						[[nodiscard]] QBindable<bool> bindableHasInlineReply() const { return &this->bHasInlineReply; };
 | 
				
			||||||
	[[nodiscard]] QBindable<QString> bindableInlineReplyPlaceholder() const { return &this->bInlineReplyPlaceholder; };
 | 
					
 | 
				
			||||||
 | 
						[[nodiscard]] QBindable<QString> bindableInlineReplyPlaceholder() const {
 | 
				
			||||||
 | 
							return &this->bInlineReplyPlaceholder;
 | 
				
			||||||
 | 
						};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	[[nodiscard]] QBindable<QVariantMap> bindableHints() const { return &this->bHints; };
 | 
						[[nodiscard]] QBindable<QVariantMap> bindableHints() const { return &this->bHints; };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	[[nodiscard]] NotificationCloseReason::Enum closeReason() const;
 | 
						[[nodiscard]] NotificationCloseReason::Enum closeReason() const;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,6 +17,9 @@ class PamContext
 | 
				
			||||||
    : public QObject
 | 
					    : public QObject
 | 
				
			||||||
    , public QQmlParserStatus {
 | 
					    , public QQmlParserStatus {
 | 
				
			||||||
	Q_OBJECT;
 | 
						Q_OBJECT;
 | 
				
			||||||
 | 
						QML_ELEMENT;
 | 
				
			||||||
 | 
						Q_INTERFACES(QQmlParserStatus);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// clang-format off
 | 
						// clang-format off
 | 
				
			||||||
	/// If the pam context is actively performing an authentication.
 | 
						/// If the pam context is actively performing an authentication.
 | 
				
			||||||
	///
 | 
						///
 | 
				
			||||||
| 
						 | 
					@ -49,7 +52,6 @@ class PamContext
 | 
				
			||||||
	/// If the user's response should be visible. Only valid when @@responseRequired is true.
 | 
						/// If the user's response should be visible. Only valid when @@responseRequired is true.
 | 
				
			||||||
	Q_PROPERTY(bool responseVisible READ isResponseVisible NOTIFY responseVisibleChanged);
 | 
						Q_PROPERTY(bool responseVisible READ isResponseVisible NOTIFY responseVisibleChanged);
 | 
				
			||||||
	// clang-format on
 | 
						// clang-format on
 | 
				
			||||||
	QML_ELEMENT;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	explicit PamContext(QObject* parent = nullptr): QObject(parent) {}
 | 
						explicit PamContext(QObject* parent = nullptr): QObject(parent) {}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,6 +30,7 @@ qt_add_qml_module(quickshell-hyprland
 | 
				
			||||||
	IMPORTS ${HYPRLAND_MODULES}
 | 
						IMPORTS ${HYPRLAND_MODULES}
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					qs_add_module_deps_light(quickshell-io Quickshell)
 | 
				
			||||||
install_qml_module(quickshell-hyprland)
 | 
					install_qml_module(quickshell-hyprland)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# intentionally no pch as the module is empty
 | 
					# intentionally no pch as the module is empty
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -56,6 +56,8 @@ class HyprlandFocusGrab
 | 
				
			||||||
    : public QObject
 | 
					    : public QObject
 | 
				
			||||||
    , public QQmlParserStatus {
 | 
					    , public QQmlParserStatus {
 | 
				
			||||||
	Q_OBJECT;
 | 
						Q_OBJECT;
 | 
				
			||||||
 | 
						QML_ELEMENT;
 | 
				
			||||||
 | 
						Q_INTERFACES(QQmlParserStatus);
 | 
				
			||||||
	/// If the focus grab is active. Defaults to false.
 | 
						/// If the focus grab is active. Defaults to false.
 | 
				
			||||||
	///
 | 
						///
 | 
				
			||||||
	/// When set to true, an input grab will be created for the listed windows.
 | 
						/// When set to true, an input grab will be created for the listed windows.
 | 
				
			||||||
| 
						 | 
					@ -66,7 +68,6 @@ class HyprlandFocusGrab
 | 
				
			||||||
	Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged);
 | 
						Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged);
 | 
				
			||||||
	/// The list of windows to whitelist for input.
 | 
						/// The list of windows to whitelist for input.
 | 
				
			||||||
	Q_PROPERTY(QList<QObject*> windows READ windows WRITE setWindows NOTIFY windowsChanged);
 | 
						Q_PROPERTY(QList<QObject*> windows READ windows WRITE setWindows NOTIFY windowsChanged);
 | 
				
			||||||
	QML_ELEMENT;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	explicit HyprlandFocusGrab(QObject* parent = nullptr): QObject(parent) {}
 | 
						explicit HyprlandFocusGrab(QObject* parent = nullptr): QObject(parent) {}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -85,6 +85,9 @@ class WrapperManager
 | 
				
			||||||
    : public QObject
 | 
					    : public QObject
 | 
				
			||||||
    , public QQmlParserStatus {
 | 
					    , public QQmlParserStatus {
 | 
				
			||||||
	Q_OBJECT;
 | 
						Q_OBJECT;
 | 
				
			||||||
 | 
						QML_ELEMENT;
 | 
				
			||||||
 | 
						Q_INTERFACES(QQmlParserStatus);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// clang-format off
 | 
						// clang-format off
 | 
				
			||||||
	/// The wrapper component's selected child.
 | 
						/// The wrapper component's selected child.
 | 
				
			||||||
	///
 | 
						///
 | 
				
			||||||
| 
						 | 
					@ -102,7 +105,6 @@ class WrapperManager
 | 
				
			||||||
	/// This property may not be changed after Component.onCompleted.
 | 
						/// This property may not be changed after Component.onCompleted.
 | 
				
			||||||
	Q_PROPERTY(QQuickItem* wrapper READ wrapper WRITE setWrapper NOTIFY wrapperChanged FINAL);
 | 
						Q_PROPERTY(QQuickItem* wrapper READ wrapper WRITE setWrapper NOTIFY wrapperChanged FINAL);
 | 
				
			||||||
	// clang-format on
 | 
						// clang-format on
 | 
				
			||||||
	QML_ELEMENT;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	explicit WrapperManager(QObject* parent = nullptr): QObject(parent) {}
 | 
						explicit WrapperManager(QObject* parent = nullptr): QObject(parent) {}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue