diff options
| author | David Robillard <d@drobilla.net> | 2014-02-08 19:04:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-02-08 19:04:24 +0000 |
| commit | 76dd49933b94061ac7d71cef20447f4a43086fd5 (patch) | |
| tree | 5017761bdc1c2194b1ed9ac64728f9cddf4e6234 | |
| parent | 7c92d5922dfa1423fc12fe331c32426ee7be185e (diff) | |
| download | suil-76dd49933b94061ac7d71cef20447f4a43086fd5.tar.gz suil-76dd49933b94061ac7d71cef20447f4a43086fd5.tar.bz2 suil-76dd49933b94061ac7d71cef20447f4a43086fd5.zip | |
Fix embedding several Qt UIs in Gtk (apply #961).
git-svn-id: http://svn.drobilla.net/lad/trunk/suil@5335 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/qt4_in_gtk2.cpp | 10 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,9 @@ +suil 0.8.1 unstable; + + * Fix embedding several Qt UIs in Gtk + + -- David Robillard <d@drobilla.net> Sat, 08 Feb 2014 13:44:47 -0500 + suil 0.8.0 stable; * Add suil_instance_get_handle (patch from Rui Nuno Capela) diff --git a/src/qt4_in_gtk2.cpp b/src/qt4_in_gtk2.cpp index 4bd61a2..e958ce6 100644 --- a/src/qt4_in_gtk2.cpp +++ b/src/qt4_in_gtk2.cpp @@ -59,7 +59,6 @@ suil_qt_wrapper_finalize(GObject* gobject) delete self->qembed; self->qembed = NULL; - delete self->app; self->app = NULL; self->wrapper->impl = NULL; @@ -144,8 +143,13 @@ suil_wrapper_new(SuilHost* host, SuilQtWrapper* const wrap = SUIL_QT_WRAPPER( g_object_new(SUIL_TYPE_QT_WRAPPER, NULL)); - static int argc = 0; - wrap->app = new QApplication(argc, NULL, true); + if (qApp) { + wrap->app = qApp; + } else { + static int argc = 0; + wrap->app = new QApplication(argc, NULL, true); + } + wrap->wrapper = NULL; wrapper->impl = wrap; @@ -9,7 +9,7 @@ import waflib.extras.autowaf as autowaf # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -SUIL_VERSION = '0.8.0' +SUIL_VERSION = '0.8.1' SUIL_MAJOR_VERSION = '0' # Mandatory waf variables |