1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
diff --git a/suil/src/qt4_in_gtk2.cpp b/suil/src/qt4_in_gtk2.cpp
index 4bd61a2..e958ce6 100644
--- a/suil/src/qt4_in_gtk2.cpp
+++ b/suil/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;
|
