From b24813c66f99275e00f8110d7cb6bac61dcb2f8c Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Fri, 30 Nov 2012 16:06:56 +0200 Subject: [PATCH] mainloop-tests: fix in running qt tests with GLIB_ENABLED Qt default uses glib mainloop, so we cannot use same glib as subloop. --- src/common/tests/mainloop-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/tests/mainloop-test.c b/src/common/tests/mainloop-test.c index 5274dc5..82a88fa 100644 --- a/src/common/tests/mainloop-test.c +++ b/src/common/tests/mainloop-test.c @@ -1653,7 +1653,7 @@ int main(int argc, char *argv[]) MRP_UNUSED(setup_deferred); /* XXX TODO: add deferred tests... */ #ifdef GLIB_ENABLED - if (cfg.mainloop_type != MAINLOOP_GLIB) { + if (cfg.mainloop_type != MAINLOOP_GLIB && cfg.mainloop_type != MAINLOOP_QT) { if (cfg.ngio > 0 || cfg.ngtimer > 0) glib_pump_setup(ml); } -- 2.7.4