From 176e3c9146d01d35b871b7a00e3c8c2482b008ec Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 26 Feb 2017 12:28:40 +0100 Subject: Add preliminary Qt5 in Gtk2 support This crashes virtually all of the time in straight Gtk hosts unless XInitThreads is called before any Gtk functions. A portable solution to this is needed, but I have no idea what that might be. --- src/instance.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/instance.c') diff --git a/src/instance.c b/src/instance.c index 29ff3f9..f05cc86 100644 --- a/src/instance.c +++ b/src/instance.c @@ -1,5 +1,5 @@ /* - Copyright 2007-2015 David Robillard + Copyright 2007-2017 David Robillard Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -44,6 +44,8 @@ suil_ui_supported(const char* container_type_uri, return SUIL_WRAPPING_NATIVE; } else if ((!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, QT4_UI_URI)) + || (!strcmp(container_type_uri, GTK2_UI_URI) + && !strcmp(ui_type_uri, QT5_UI_URI)) || (!strcmp(container_type_uri, QT4_UI_URI) && !strcmp(ui_type_uri, GTK2_UI_URI)) || (!strcmp(container_type_uri, QT5_UI_URI) @@ -92,6 +94,12 @@ open_wrapper(SuilHost* host, module_name = "suil_qt4_in_gtk2"; } #endif +#ifdef SUIL_WITH_QT5_IN_GTK2 + if (!strcmp(container_type_uri, GTK2_UI_URI) + && !strcmp(ui_type_uri, QT5_UI_URI)) { + module_name = "suil_qt5_in_gtk2"; + } +#endif #ifdef SUIL_WITH_X11_IN_GTK2 if (!strcmp(container_type_uri, GTK2_UI_URI) && !strcmp(ui_type_uri, X11_UI_URI)) { -- cgit v1.2.1