提交 bf89f012 编写于 作者: O Olli-Pekka Heinisuo

fix patch files

上级 80a5e50c
--- opencv/modules/highgui/src/window_QT.h 2018-06-28 13:13:55.119434000 +0300
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-28 13:21:30.934272400 +0300
@@ -46,43 +46,47 @@
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 01:10:16.135894200 +0300
@@ -46,43 +46,48 @@
#define QT_NO_DEBUG_OUTPUT
#endif
+QT_BEGIN_NAMESPACE
+#include <QApplication>
+
#if defined( HAVE_QT_OPENGL )
-#include <QtOpenGL>
-#include <QGLWidget>
+class QtOpenGL;
+class QGLWidget;
#include <QtOpenGL>
#include <QGLWidget>
#endif
-#include <QAbstractEventDispatcher>
......@@ -45,8 +43,9 @@
-#include <QButtonGroup>
-#include <QMenu>
-#include <QTest>
+QT_BEGIN_NAMESPACE
+
+class QAbstractEventDispatcher;
+class QApplication;
+class QFile;
+class QPushButton;
+class QGraphicsView;
......
--- opencv/modules/highgui/src/window_QT.cpp 2018-06-28 13:13:52.234096700 +0300
+++ opencv/modules/highgui/src/window_QT_patched.cpp 2018-06-28 13:20:54.896046500 +0300
@@ -46,6 +46,44 @@
--- opencv/modules/highgui/src/window_QT.cpp 2018-06-30 01:04:51.649121800 +0300
+++ opencv/modules/highgui/src/window_QT_patched.cpp 2018-06-30 01:10:09.448939500 +0300
@@ -46,6 +46,38 @@
#include <window_QT.h>
+#if defined( HAVE_QT_OPENGL )
+#include <QtOpenGL>
+#include <QGLWidget>
+#endif
+
+#include <QAbstractEventDispatcher>
+#include <QApplication>
+#include <QFile>
+#include <QPushButton>
+#include <QGraphicsView>
......@@ -45,7 +39,7 @@
#include <math.h>
#ifdef _WIN32
@@ -60,7 +98,6 @@
@@ -60,7 +92,6 @@
#endif
#endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册