Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / bin / test_glview_simple.c

diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c
index a87931a..9a81128 100644 (file)
--- a/src/bin/test_glview_simple.c
+++ b/src/bin/test_glview_simple.c
@@ -239,9 +239,17 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
    if (!(gld = calloc(1, sizeof(GLData)))) return;
 
    // Set the engine to opengl_x11
+<<<<<<< HEAD
    elm_engine_set("opengl_x11");
 
    win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC);
+=======
+   elm_config_preferred_engine_set("opengl_x11");
+   win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC);
+   // Set preferred engine back to default from config
+   elm_config_preferred_engine_set(NULL);
+   
+>>>>>>> remotes/origin/upstream
    elm_win_title_set(win, "GLView Simple");
    elm_win_autodel_set(win, EINA_TRUE);