Mercurial > ldforge / file diff

--- a/src/glRenderer.cc	Sat Sep 06 23:21:28 2014 +0300
+++ b/src/glRenderer.cc	Sun Sep 07 01:13:20 2014 +0300
@@ -827,8 +827,13 @@
 
 	// Update 2d position
 	m_mousePosition = ev->pos();
+	m_globalpos = ev->globalPos();
+
+#ifndef USE_QT5
 	m_mousePositionF = ev->posF();
-	m_globalpos = ev->globalPos();
+#else
+	m_mousePositionF = ev->localPos();
+#endif
 
 	// Calculate 3d position of the cursor
 	m_position3D = (camera() != EFreeCamera) ? coordconv2_3 (m_mousePosition, true) : Origin;
@@ -1199,7 +1204,7 @@
 
 	if (img->isNull())
 	{
-		CriticalError (tr ("Failed to load overlay image!"));
+		Critical (tr ("Failed to load overlay image!"));
 		currentDocumentData().overlays[cam].invalid = true;
 		delete img;
 		return false;