8000 fix patch files · yonip/opencv-python@bf89f01 · GitHub
[go: up one dir, main page]
Skip to content

Commit bf89f01

Browse files
skvarkskvark
committed
fix patch files
1 parent 80a5e50 commit bf89f01

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

‎patches/patch1.patch

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
--- 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 @@
2+
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 01:10:16.135894200 +0300
3+
@@ -46,43 +46,48 @@
44
#define QT_NO_DEBUG_OUTPUT
55
#endif
66

7-
+QT_BEGIN_NAMESPACE
7+
+#include <QApplication>
88
+
99
#if defined( HAVE_QT_OPENGL )
10-
-#include <QtOpenGL>
11-
-#include <QGLWidget>
12-
+class QtOpenGL;
13-
+class QGLWidget;
10+
#include <QtOpenGL>
11+
#include <QGLWidget>
1412
#endif
1513

1614
-#include <QAbstractEventDispatcher>
@@ -45,8 +43,9 @@
4543
-#include <QButtonGroup>
4644
-#include <QMenu>
4745
-#include <QTest>
46+
+QT_BEGIN_NAMESPACE
47+
+
4848
+class QAbstractEventDispatcher;
49-
+class QApplication;
5049
+class QFile;
5150
+class QPushButton;
5251
+class QGraphicsView;

‎patches/patch2.patch

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
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 @@
1+
--- opencv/modules/highgui/src/window_QT.cpp 2018-06-30 01:04:51.649121800 +0300
2+
+++ opencv/modules/highgui/src/window_QT_patched.cpp 2018-06-30 01:10:09.448939500 +0300
3+
@@ -46,6 +46,38 @@
44

55
#include <window_QT.h>
66

7-
+#if defined( HAVE_QT_OPENGL )
8-
+#include <QtOpenGL>
9-
+#include <QGLWidget>
10-
+#endif
11-
+
127
+#include <QAbstractEventDispatcher>
13-
+#include <QApplication>
148
+#include <QFile>
159
+#include <QPushButton>
1610
+#include <QGraphicsView>
@@ -45,7 +39,7 @@
4539
#include <math.h>
4640

4741
#ifdef _WIN32
48-
@@ -60,7 +98,6 @@
42+
@@ -60,7 +92,6 @@
4943
#endif
5044
#endif
5145

0 commit comments

Comments
 (0)
0