Added Qt5 support ("cmake -DFINDOBJECT_QT_VERSION=5 ..")

src/utilite/UPlot.cpp

@@ -22,25 +22,25 @@
 #include "utilite/UPlot.h"
 //#include "utilite/ULogger.h"
 
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsItem>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QFormLayout>
-#include <QtGui/QResizeEvent>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QGraphicsItem>
+#include <QHBoxLayout>
+#include <QFormLayout>
+#include <QResizeEvent>
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 #include <QtCore/QFileInfo>
-#include <QtGui/QPushButton>
-#include <QtGui/QToolButton>
-#include <QtGui/QLabel>
-#include <QtGui/QMenu>
-#include <QtGui/QInputDialog>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
-#include <QtGui/QClipboard>
-#include <QtGui/QApplication>
-#include <QtGui/QPrinter>
+#include <QPushButton>
+#include <QToolButton>
+#include <QLabel>
+#include <QMenu>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QClipboard>
+#include <QApplication>
+#include <QPrinter>
 #ifdef QT_SVG_LIB
 #include <QtSvg/QSvgGenerator>
 #endif
@@ -58,7 +58,7 @@ UPlotItem::UPlotItem(qreal dataX, qreal dataY, qreal width) :
 	_data.setX(dataX);
 	_data.setY(dataY);
 	this->setZValue(1);
-	this->setAcceptsHoverEvents(true);
+	this->setAcceptHoverEvents(true);
 	_text = new QGraphicsTextItem(this);
 	_text->setPlainText(QString("(%1,%2)").arg(_data.x()).arg(_data.y()));
 	_text->setVisible(false);
@@ -72,7 +72,7 @@ UPlotItem::UPlotItem(const QPointF & data, qreal width) :
 	_nextItem(0)
 {
 	this->setZValue(1);
-	this->setAcceptsHoverEvents(true);
+	this->setAcceptHoverEvents(true);
 	_text = new QGraphicsTextItem(this);
 	_text->setPlainText(QString("(%1,%2)").arg(_data.x()).arg(_data.y()));
 	_text->setVisible(false);
@@ -1593,7 +1593,7 @@ void UPlot::setupUi()
 	_view->setScene(new QGraphicsScene(0,0,0,0,this));
 	_view->setStyleSheet( "QGraphicsView { border-style: none; }" );
 	_sceneRoot = _view->scene()->addText("");
-	_sceneRoot->translate(0,0);
+	_sceneRoot->setPos(0,0);
 	_graphicsViewHolder = new QWidget(this);
 	_graphicsViewHolder->setMinimumSize(100,100);
 	_verticalAxis = new UPlotAxis(Qt::Vertical, 0, 1, this);

src/utilite/UPlot.h

@@ -24,15 +24,15 @@
 
 //#include "utilite/UtiLiteExp.h" // DLL export/import defines
 
-#include <QtGui/QFrame>
+#include <QFrame>
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtGui/QPen>
 #include <QtGui/QBrush>
-#include <QtGui/QGraphicsEllipseItem>
+#include <QGraphicsEllipseItem>
 #include <QtCore/QMutex>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
+#include <QLabel>
+#include <QPushButton>
 #include <QtCore/QTime>
 
 class QGraphicsView;