From 46c977f391ef57727bd6d4bb03d44c61103f1885 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Tue, 21 Jul 2015 17:28:18 +0900 Subject: [PATCH] vl.c: used QT UI when no "-display" specified Change-Id: I35e27621ab5724a7ba8061ea9a71d26ac69e6667 Signed-off-by: SeokYeon Hwang --- vl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 5fa904ac20..96fe56370a 100644 --- a/vl.c +++ b/vl.c @@ -4192,16 +4192,14 @@ int main(int argc, char **argv, char **envp) if (display_type == DT_DEFAULT && !display_remote) { #if defined(CONFIG_MARU) - // FIXME: for compatibility... // If no display_type is specified, - // we use DT_MARU_SDL on Linux, Windows and - // use DT_MARU_SHM on MacOS. -#if defined(CONFIG_SDL) + // we use DT_MARU_QT_OFFSCREEN +#if defined(CONFIG_QT) + display_type = DT_MARU_QT_OFFSCREEN; +#elif defined(CONFIG_SDL) && defined(CONFIG_JAVA_UI) display_type = DT_MARU_SDL; -#elif defined(CONFIG_USE_SHM) +#elif defined(CONFIG_USE_SHM) && defined(CONFIG_JAVA_UI) display_type = DT_MARU_SHM; -#elif defined(CONFIG_QT) - display_type = DT_MARU_QT; #endif #elif defined(CONFIG_GTK) display_type = DT_GTK; -- 2.34.1