From 36ca0497de7f1ecf671bfb45aa3c10e4a997c043 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Thu, 4 Dec 2014 16:41:12 +0100
Subject: [PATCH] qt5: set explicit routes for Nitpicker's 'Framebuffer' and
 'Input' sessions

Setting explicit routes for Nitpicker's 'Framebuffer' and 'Input' sessionsi
avoids ambiguities if a Qt application provides these services, too.

Fixes #1316
---
 repos/libports/run/qt5_common.inc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index a64be5f45..63a796d69 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -55,6 +55,20 @@ proc qt5_start_nodes { feature_arg } {
 		<start name="nitpicker">
 			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Nitpicker"/></provides>
+			<route> }
+	append_if [use_fb_sdl feature] start_nodes { 
+				<service name="Framebuffer"> <child name="fb_sdl" /> </service>
+				<service name="Input"> <child name="fb_sdl" /> </service>
+	}
+	append_if [use_fb_drv feature] start_nodes {
+				<service name="Framebuffer"> <child name="fb_drv" /> </service>
+	}
+	append_if [use_ps2_drv feature] start_nodes {
+				<service name="Input"> <child name="ps2_drv" /> </service>
+	}
+	append start_nodes {
+				<any-service> <parent /> <any-child /> </any-service>
+			</route>
 			<config>
 				<domain name="pointer"   layer="1" xray="no" origin="pointer" />
 				<domain name="decorator" layer="2" xray="opaque" />