projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e638b9e
)
make sure children are included in the moveToThread
author
Daniel Stonier
<d.stonier@gmail.com>
Sun, 7 Sep 2014 19:31:37 +0000
(
04:31
+0900)
committer
Daniel Stonier
<d.stonier@gmail.com>
Sun, 7 Sep 2014 19:31:37 +0000
(
04:31
+0900)
modules/highgui/src/window_QT.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/window_QT.cpp
b/modules/highgui/src/window_QT.cpp
index
5093934
..
bdf696e
100644
(file)
--- a/
modules/highgui/src/window_QT.cpp
+++ b/
modules/highgui/src/window_QT.cpp
@@
-740,14
+740,14
@@
double cvGetOpenGlProp_QT(const char* name)
GuiReceiver::GuiReceiver() : bTimeOut(false), nb_windows(0)
{
doesExternalQAppExist = (QApplication::instance() != 0);
- if ( doesExternalQAppExist ) {
- moveToThread(QApplication::instance()->thread());
- }
icvInitSystem(¶meterSystemC, parameterSystemV);
timer = new QTimer(this);
QObject::connect(timer, SIGNAL(timeout()), this, SLOT(timeOut()));
timer->setSingleShot(true);
+ if ( doesExternalQAppExist ) {
+ moveToThread(QApplication::instance()->thread());
+ }
}