Merge pull request #27 from kenvandine/qt5_only

Dropped Qt4 support

Author: Roger Zanoni

README

@@ -6,27 +6,20 @@ A simple Qt-based 2D game engine.
 
 1.1) Dependencies
 
-* Qt4.x or Qt5
-  	Qt4 download: http://qt.nokia.com/downloads/
+* Qt5
   	Qt5 source repository: https://qt.gitorious.org/qt/qt5
 
 * Box2D >= 2.2.1
 	http://box2d.org
 
-If you are using Qt5, we strongly recommend you to install Qt5 to a different prefix from Qt4.
-If you have Qt4 installed at /usr, we suggest one of the following prefixes:
-
-* /opt/Qt5
-* /usr/local/Qt5
-
 1.2) Building
 
 Available QMake parameters:
 
 * QTPATH (Optional)
 	Prefix where Qt has been installed. It is required to install
 	Quasi's QML import plugin and related files.
-	The default path is /usr/lib/qt
+	The default path is /usr/lib/qt5
 
 * BOX2DPATH (Optional)
 	Path to Box2D installation. If your Linux distro packaging system

demos/basketball/GameWindow.qml

@@ -48,7 +48,7 @@ QuasiGame {
         Image {
             id: backboardHandler
             anchors.bottom: parent.bottom
-            source: ":/images/backboardhandler.png"
+            source: "qrc:/images/backboardhandler.png"
         }
 
         QuasiMaterial {
@@ -100,7 +100,7 @@ QuasiGame {
             anchors.left: basketHandler.right
             anchors.top: basketHandler.top
             z: 10
-            source: ":/images/basket.png"
+            source: "qrc:/images/basket.png"
         }
 
         QuasiEntity {
@@ -183,7 +183,7 @@ QuasiGame {
             Image {
                 id: ballImage
                 anchors.fill: parent
-                source: ":/images/ball.png"
+                source: "qrc:/images/ball.png"
                 smooth: true
             }
 
@@ -206,9 +206,9 @@ QuasiGame {
                         score++;
                         console.log("score = " + score);
                     }
-                    basket.source = ":/images/scorebasket.png"
+                    basket.source = "qrc:/images/scorebasket.png"
                 } else {
-                    basket.source = ":/images/basket.png"
+                    basket.source = "qrc:/images/basket.png"
                 }
             }
         }
@@ -287,7 +287,7 @@ QuasiGame {
                 width: 50
                 height: 50
 
-                source: ":/images/" + type + "ball.png"
+                source: "qrc:/images/" + type + "ball.png"
             }
         }
     }

demos/paratrooper/GameWindow.qml

@@ -111,7 +111,7 @@ QuasiGame {
 
         Image {
             id: sun
-            source: ":/sun.png"
+            source: "qrc:/sun.png"
             anchors.top: parent.top
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.margins: -sun.height / 2
@@ -248,7 +248,7 @@ QuasiGame {
 
             Image {
                 id: target
-                source: ":/target.png"
+                source: "qrc:/target.png"
                 width: sourceSize.width / 2
                 height: sourceSize.height / 2
                 anchors.centerIn: parent

demos/paratrooper/Paratrooper.qml

@@ -1,4 +1,4 @@
-import QtQuick 1.1
+import QtQuick 2.0
 import QuasiGame 1.0
 
 QuasiEntity {
@@ -99,7 +99,7 @@ QuasiEntity {
         id: paratrooperImage
         width: sourceSize.width / 2
         height: sourceSize.height / 2
-        source: ":/paratrooper.png"
+        source: "qrc:/paratrooper.png"
         smooth: true
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom

examples/examples.pri

@@ -1,10 +1,6 @@
 CONFIG += qt
 
-contains(QT_VERSION, ^5.*) {
-    QT += quick
-} else {
-    QT += declarative
-}
+QT += quick
 
 contains(USE_OPENGL, 1) {
     QT += opengl

examples/launcher/launcher.h

@@ -4,11 +4,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QFile>
 
-#if QT_VERSION >= 0x050000
 #include <QtQml/QQmlContext>
-#else
-#include <QtDeclarative/QDeclarativeContext>
-#endif
 
 class Launcher : public QObject
 {
@@ -21,11 +17,7 @@ public slots:
     QString qmlData() const
     {
         QString import("import QuasiGame 1.0\n");
-#if QT_VERSION >= 0x050000
         import += "import QtQuick 2.0\n";
-#else
-        import += "import QtQuick 1.1\n";
-#endif
         QFile qmlFile(":/GameWindow.qml");
         if (!qmlFile.open(QIODevice::ReadOnly)) {
             qWarning("Error opening GameWindow.qml");

examples/launcher/launcher.qrc

@@ -1,7 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file>main-qt4.qml</file>
-    <file>main-qt5.qml</file>
+    <file>main.qml</file>
     <file>main.js</file>
 </qresource>
 </RCC>

examples/launcher/main-qt4.qml

@@ -23,17 +23,10 @@
 
 #include <QtCore/qglobal.h>
 
-#if QT_VERSION >= 0x050000
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickView>
-#else
-#include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeView>
-#include <QtDeclarative/QDeclarativeEngine>
-#endif
 
 #ifdef QT_OPENGL_LIB
 #include <QtOpenGL/QGLWidget>
@@ -44,24 +37,15 @@ int main(int argc, char *argv[])
     QByteArray data = "1";
     qputenv("QML_IMPORT_TRACE", data);
 
-#if QT_VERSION >= 0x050000
     QGuiApplication app(argc, argv);
     QQuickView view;
-#else
-    QApplication app(argc, argv);
-    QDeclarativeView view;
-#endif
 
     Launcher launcher;
 
     view.engine()->rootContext()->setContextProperty("launcher", &launcher);
     view.engine()->addImportPath("../../src/imports");
 
-#if QT_VERSION >= 0x050000
-    view.setSource(QUrl("qrc:/main-qt5.qml"));
-#else
-    view.setSource(QUrl("qrc:/main-qt4.qml"));
-#endif
+    view.setSource(QUrl("qrc:/main.qml"));
 
 #ifdef QT_OPENGL_LIB
     view.setViewport(new QGLWidget);