diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 06:57:48 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-08 06:57:48 +0200 |
| commit | 78e20c5173ae722ddac1499df25e40a3ab6d0f3e (patch) | |
| tree | 6640b38855e081824e8fc04bc8a723fa560d28fc /ftnoir_tracker_aruco/ar_video_widget.h | |
| parent | 527eef2a2f0e68b286e1b782ba148ecdfafbb89c (diff) | |
| parent | 027fd0f8b4efcf005a0bba850109089737f40a3f (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_aruco/ar_video_widget.h')
| -rw-r--r-- | ftnoir_tracker_aruco/ar_video_widget.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ftnoir_tracker_aruco/ar_video_widget.h b/ftnoir_tracker_aruco/ar_video_widget.h index 8c51382b..638b0ab4 100644 --- a/ftnoir_tracker_aruco/ar_video_widget.h +++ b/ftnoir_tracker_aruco/ar_video_widget.h @@ -21,8 +21,7 @@ // ---------------------------------------------------------------------------- class ArucoVideoWidget : public QWidget { - Q_OBJECT - + Q_OBJECT private: QMutex mtx; QImage texture; |