Fix global menu on 64-bit systems with X11
When Wayland support for global menu was added (0b86feeeb5), X11 support was broken since QWindow::winId returns WId what is a quintptr that expands to uint32 on 32-bit and to uint64 on 64-bit, while AppMenu d-bus service accepts only uint32.
			
			
This commit is contained in:
		
							parent
							
								
									1ebf27bfa1
								
							
						
					
					
						commit
						d986e70a89
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -577,7 +577,7 @@ void RegisterAppMenu(QWindow *window, const QString &menuPath) {
 | 
			
		|||
		qsl("RegisterWindow"));
 | 
			
		||||
 | 
			
		||||
	message.setArguments({
 | 
			
		||||
		window->winId(),
 | 
			
		||||
		uint(window->winId()),
 | 
			
		||||
		QVariant::fromValue(QDBusObjectPath(menuPath))
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -598,7 +598,7 @@ void UnregisterAppMenu(QWindow *window) {
 | 
			
		|||
		qsl("UnregisterWindow"));
 | 
			
		||||
 | 
			
		||||
	message.setArguments({
 | 
			
		||||
		window->winId()
 | 
			
		||||
		uint(window->winId())
 | 
			
		||||
	});
 | 
			
		||||
 | 
			
		||||
	QDBusConnection::sessionBus().send(message);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue