QT5 compatibility

ramsampath · Apr 1, 2014 · 827ab40 · 827ab40
1 parent 8da16bd
commit 827ab40
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/QGVCore/QGVCore.pro b/QGVCore/QGVCore.pro
@@ -6,6 +6,13 @@
 
 QT       += core
 
+greaterThan(QT_MAJOR_VERSION, 4){
+    QT += widgets
+}
+lessThan(QT_MAJOR_VERSION, 5) {
+    QT += gui
+}
+
 TARGET = QGVCore
 TEMPLATE = lib
 CONFIG += shared

diff --git a/QGVCore/QGVScene.cpp b/QGVCore/QGVScene.cpp
@@ -198,7 +198,7 @@ void QGVScene::clear()
 #include <QGraphicsSceneContextMenuEvent>
 void QGVScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent)
 {
-    QGraphicsItem *item = itemAt(contextMenuEvent->scenePos());
+    QGraphicsItem *item = itemAt(contextMenuEvent->scenePos(), QTransform());
     if(item)
     {
         item->setSelected(true);
@@ -216,7 +216,7 @@ void QGVScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent
 
 void QGVScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *mouseEvent)
 {
-    QGraphicsItem *item = itemAt(mouseEvent->scenePos());
+    QGraphicsItem *item = itemAt(mouseEvent->scenePos(), QTransform());
     if(item)
     {
         if(item->type() == QGVNode::Type)

diff --git a/QGVCore/qgv.h b/QGVCore/qgv.h
@@ -1,6 +1,8 @@
 #ifndef QGV_H
 #define QGV_H
 
+#include <QtGlobal>
+
 #ifdef QGVCORE_LIB
 	#define QGVCORE_EXPORT Q_DECL_EXPORT
 #else