From 7e8d6ff0bc1e5ac3742e3e5be42ff7d3ac7c98d4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 11 Apr 2013 18:07:53 -0500 Subject: Automated update from Qt3 --- src/kernel/qapplication_x11.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/kernel/qapplication_x11.cpp') diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 68eaa904e..5faeb3995 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -1652,7 +1652,7 @@ void tqt_init_internal( int *argcptr, char **argv, } #endif - if ( display ) { + if ( display && ((!argcptr) || (!argv)) ) { // TQt part of other application appForeignDpy = TRUE; @@ -2465,6 +2465,11 @@ void tqt_init( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap ) tqt_init_internal( 0, 0, display, visual, colormap ); } +void tqt_init( int *argcptr, char **argv, Display *display, TQt::HANDLE visual, TQt::HANDLE colormap ) +{ + tqt_init_internal( argcptr, argv, display, visual, colormap ); +} + /***************************************************************************** tqt_cleanup() - cleans up when the application is finished -- cgit v1.2.3