Merge pull request #880 from apavlenko:qt-5.0

2013-05-13 21:18:47 +04:00
parent 0fec2eb6e5 f856f78ac0
commit d94ecf40e6
4 changed files with 53 additions and 12 deletions
--- a/modules/highgui/src/window_QT.h
+++ b/modules/highgui/src/window_QT.h
@@ -48,13 +48,13 @@
 #endif

 #include <QAbstractEventDispatcher>
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QFile>
 #include <QPushButton>
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>
 #include <QSizePolicy>
 #include <QInputDialog>
-#include <QtGui/QBoxLayout>
+#include <QBoxLayout>
 #include <QSettings>
 #include <qtimer.h>
 #include <QtConcurrentRun>
@@ -78,7 +78,7 @@
 #include <QRadioButton>
 #include <QButtonGroup>
 #include <QMenu>
-#include <QtTest/QTest>
+#include <QTest>

 //start private enum
 enum { CV_MODE_NORMAL = 0, CV_MODE_OPENGL = 1 };