diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-11 18:07:53 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-11 18:07:53 -0500 |
| commit | 7e8d6ff0bc1e5ac3742e3e5be42ff7d3ac7c98d4 (patch) | |
| tree | ec8aef465aea4d25e62657888cb665af55593fb9 /src/kernel/qapplication_x11.cpp | |
| parent | f5b03149e8e68e510efe9842d85a058b42a51264 (diff) | |
| download | tqt3-7e8d6ff0bc1e5ac3742e3e5be42ff7d3ac7c98d4.tar.gz tqt3-7e8d6ff0bc1e5ac3742e3e5be42ff7d3ac7c98d4.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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 |