build fixes for Qt5 and Box2D 2.3

Author: kenvandine

src/box2dbase.cpp

@@ -55,8 +55,11 @@ void Box2DBase::synchronize()
     const QPointF newPoint = b2Util::qTopLeft(b2TransformOrigin(), boundingRect(), m_scaleRatio);
     const qreal newRotation = b2Util::qAngle(b2Angle());
 
-    if (!qFuzzyCompare(x(), newPoint.x()) || !qFuzzyCompare(y(), newPoint.y()))
-        setPos(newPoint);
+    if (!qFuzzyCompare(x(), newPoint.x()))
+        setX(newPoint.x());
+
+    if (!qFuzzyCompare(y(), newPoint.y()))
+        setY(newPoint.y());
 
     if (!qFuzzyCompare(rotation(), newRotation))
         setRotation(newRotation);

src/box2dmousejoint.cpp

@@ -25,7 +25,7 @@
 #include "game.h"
 
 #if QT_VERSION >= 0x050000
-#include <QtQuick/QQuickCanvas>
+#include <QtQuick/QQuickWindow>
 #else
 #include <QtGui/QApplication>
 #endif
@@ -150,7 +150,7 @@ void Box2DMouseJoint::synchronize()
     QPoint mousePos;
 
 #if QT_VERSION >= 0x050000
-    mousePos = canvas()->mapFromGlobal(QCursor::pos());
+    mousePos = window()->mapFromGlobal(QCursor::pos());
 #else
     m_mousePos = QCursor::pos();
     QWidget *widget = QApplication::widgetAt(m_mousePos);

src/entity.cpp

@@ -320,7 +320,7 @@ void Entity::applyTorque(const float &torque)
     if (!m_body)
         return;
 
-    m_body->ApplyTorque(torque);
+    m_body->ApplyTorque(torque, true);
 }
 
 void Entity::applyLinearImpulse(const QPointF &impulse, const QPointF &point)
@@ -331,7 +331,8 @@ void Entity::applyLinearImpulse(const QPointF &impulse, const QPointF &point)
     m_body->ApplyLinearImpulse(b2Vec2(impulse.x() / m_scaleRatio,
                                       -impulse.y() / m_scaleRatio),
                                b2Vec2(point.x() / m_scaleRatio,
-                                      -point.y() / m_scaleRatio));
+                                      -point.y() / m_scaleRatio),
+                               true);
 }
 
 void Entity::setLinearVelocity(const QPointF &velocity)

src/fixture.cpp

@@ -35,11 +35,11 @@ Fixture::Fixture(QuasiDeclarativeItem *parent)
     , m_entity(0)
     , m_sensor(false)
 {
-    connect(this, SIGNAL(parentChanged()),
-            this, SLOT(onParentChanged()));
+    connect(this, SIGNAL(parentChanged(QQuickItem*)),
+            this, SLOT(onParentChanged(QQuickItem*)));
 }
 
-void Fixture::onParentChanged()
+void Fixture::onParentChanged(QQuickItem*)
 {
     if (!m_shapeItem)
         return;

src/fixture.h

@@ -83,7 +83,7 @@ protected slots:
     void onDensityChanged(const float &density);
     void onFrictionChanged(const float &friction);
     void onRestitutionChanged(const float &restitution);
-    void onParentChanged();
+    void onParentChanged(QQuickItem*);
     void onShapeUpdated();
 
 protected:

src/game.cpp

@@ -24,7 +24,7 @@
 #include "scene.h"
 
 #if QT_VERSION >= 0x050000
-#include <QtQuick/QQuickCanvas>
+#include <QtQuick/QQuickWindow>
 #else
 #include <QtGui/QApplication>
 #endif
@@ -107,7 +107,7 @@ void Game::update()
 QPointF Game::mouse()
 {
 #if QT_VERSION >= 0x050000
-    return canvas()->mapFromGlobal(QCursor::pos());
+    return window()->mapFromGlobal(QCursor::pos());
 #else
     m_mousePos = QCursor::pos();
     QWidget *widget = QApplication::widgetAt(m_mousePos);

src/plugins.cpp

@@ -74,5 +74,3 @@ void Plugins::registerTypes(const char *uri)
     qmlRegisterType<Material>("QuasiGame", 1, 0, "QuasiMaterial");
     qmlRegisterType<Fixture>("QuasiGame", 1, 0, "QuasiFixture");
 }
-
-Q_EXPORT_PLUGIN2(QuasiGame, Plugins);

src/plugins.h

@@ -23,10 +23,9 @@
 #define _PLUGINS_H_
 
 #include <QtCore/QtGlobal>
-
 #if QT_VERSION >= 0x050000
 #include <QtQml/QQmlExtensionPlugin>
-
+ 
 class Plugins : public QQmlExtensionPlugin
 #else
 #include <QtDeclarative/QDeclarativeExtensionPlugin>
@@ -35,6 +34,7 @@ class Plugins : public QDeclarativeExtensionPlugin
 #endif
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
     void registerTypes(const char *uri);

src/qmldir

@@ -1 +1,2 @@
+module QuasiGame
 plugin quasigameplugin

src/scriptbehavior.cpp

@@ -56,14 +56,14 @@ void ScriptBehavior::setScript(const QQmlScriptString &script)
 void ScriptBehavior::setScript(const QDeclarativeScriptString &script)
 #endif
 {
-    if (m_script.script() != script.script()) {
+    if (m_script.stringLiteral() != script.stringLiteral()) {
         m_script = script;
 
         if (m_expression)
             delete m_expression;
 
 #if QT_VERSION >= 0x050000
-        m_expression = new QQmlExpression(m_script.context(), m_script.scopeObject(), m_script.script());
+        m_expression = new QQmlExpression(m_script);
 #else
         m_expression = new QDeclarativeExpression(m_script.context(), m_script.scopeObject(), m_script.script());
 #endif