Skip to content

Commit f6e2eea

Browse files
skvarkskvark
committed
test OpenCV GUI patches
1 parent 449366d commit f6e2eea

File tree

3 files changed

+142
-0
lines changed

3 files changed

+142
-0
lines changed

‎patches/patch1.patch

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
--- opencv/modules/highgui/src/window_QT.h 2018-06-28 13:13:55.119434000 +0300
2+
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-28 13:21:30.934272400 +0300
3+
@@ -46,43 +46,47 @@
4+
#define QT_NO_DEBUG_OUTPUT
5+
#endif
6+
7+
+QT_BEGIN_NAMESPACE
8+
+
9+
#if defined( HAVE_QT_OPENGL )
10+
-#include <QtOpenGL>
11+
-#include <QGLWidget>
12+
+class QtOpenGL;
13+
+class QGLWidget;
14+
#endif
15+
16+
-#include <QAbstractEventDispatcher>
17+
-#include <QApplication>
18+
-#include <QFile>
19+
-#include <QPushButton>
20+
-#include <QGraphicsView>
21+
-#include <QSizePolicy>
22+
-#include <QInputDialog>
23+
-#include <QBoxLayout>
24+
-#include <QSettings>
25+
-#include <qtimer.h>
26+
-#include <QtConcurrentRun>
27+
-#include <QWaitCondition>
28+
-#include <QKeyEvent>
29+
-#include <QMetaObject>
30+
-#include <QPointer>
31+
-#include <QSlider>
32+
-#include <QLabel>
33+
-#include <QIODevice>
34+
-#include <QShortcut>
35+
-#include <QStatusBar>
36+
-#include <QVarLengthArray>
37+
-#include <QFileInfo>
38+
-#include <QDate>
39+
-#include <QFileDialog>
40+
-#include <QToolBar>
41+
-
42+
-#include <QAction>
43+
-#include <QCheckBox>
44+
-#include <QRadioButton>
45+
-#include <QButtonGroup>
46+
-#include <QMenu>
47+
-#include <QTest>
48+
+class QAbstractEventDispatcher;
49+
+class QApplication;
50+
+class QFile;
51+
+class QPushButton;
52+
+class QGraphicsView;
53+
+class QSizePolicy;
54+
+class QInputDialog;
55+
+class QBoxLayout;
56+
+class QSettings;
57+
+class QTimer;
58+
+class QtConcurrentRun;
59+
+class QWaitCondition;
60+
+class QKeyEvent;
61+
+class QMetaObject;
62+
+class QPointer;
63+
+class QSlider;
64+
+class QLabel;
65+
+class QIODevice;
66+
+class QShortcut;
67+
+class QStatusBar;
68+
+class QVarLengthArray;
69+
+class QFileInfo;
70+
+class QDate;
71+
+class QFileDialog;
72+
+class QToolBar;
73+
+
74+
+class QAction;
75+
+class QCheckBox;
76+
+class QRadioButton;
77+
+class QButtonGroup;
78+
+class QMenu;
79+
+class QTest;
80+
+
81+
+QT_END_NAMESPACE
82+
83+
//start private enum
84+
enum { CV_MODE_NORMAL = 0, CV_MODE_OPENGL = 1 };

‎patches/patch2.patch

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
--- opencv/modules/highgui/src/window_QT.cpp 2018-06-28 13:13:52.234096700 +0300
2+
+++ opencv/modules/highgui/src/window_QT_patched.cpp 2018-06-28 13:20:54.896046500 +0300
3+
@@ -46,6 +46,44 @@
4+
5+
#include <window_QT.h>
6+
7+
+#if defined( HAVE_QT_OPENGL )
8+
+#include <QtOpenGL>
9+
+#include <QGLWidget>
10+
+#endif
11+
+
12+
+#include <QAbstractEventDispatcher>
13+
+#include <QApplication>
14+
+#include <QFile>
15+
+#include <QPushButton>
16+
+#include <QGraphicsView>
17+
+#include <QSizePolicy>
18+
+#include <QInputDialog>
19+
+#include <QBoxLayout>
20+
+#include <QSettings>
21+
+#include <QTimer>
22+
+#include <QtConcurrentRun>
23+
+#include <QWaitCondition>
24+
+#include <QKeyEvent>
25+
+#include <QMetaObject>
26+
+#include <QPointer>
27+
+#include <QSlider>
28+
+#include <QLabel>
29+
+#include <QIODevice>
30+
+#include <QShortcut>
31+
+#include <QStatusBar>
32+
+#include <QVarLengthArray>
33+
+#include <QFileInfo>
34+
+#include <QDate>
35+
+#include <QFileDialog>
36+
+#include <QToolBar>
37+
+
38+
+#include <QAction>
39+
+#include <QCheckBox>
40+
+#include <QRadioButton>
41+
+#include <QButtonGroup>
42+
+#include <QMenu>
43+
+#include <QTest>
44+
+
45+
#include <math.h>
46+
47+
#ifdef _WIN32
48+
@@ -60,7 +98,6 @@
49+
#endif
50+
#endif
51+
52+
-
53+
//Static and global first
54+
static GuiReceiver *guiMainThread = NULL;
55+
static int parameterSystemC = 1;

‎setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ def main():
109109
# OS-specific components
110110
if (sys.platform == 'darwin' or sys.platform.startswith('linux')) and not build_headless:
111111
cmake_args.append("-DWITH_QT=4")
112+
# Apply Qt namespace patches to OpenCV GUI code
113+
subprocess.check_call(["patch", "-p0", "<", "patches/patch1.patch"])
114+
subprocess.check_call(["patch", "-p0", "<", "patches/patch2.patch"])
112115

113116
if build_headless:
114117
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless

0 commit comments

Comments
 (0)