Skip to content

Fixing Qt5 build #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdkcore0 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing Qt5 build #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09a8c01
Adjusting plugin macro on Qt5
mdkcore0 Sep 20, 2012
4abb3c9
Removing QQuickCanvas references
mdkcore0 Oct 30, 2012
7082e59
Adjusting Qt5 scripting system changes
mdkcore0 Sep 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/box2dmousejoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "game.h"

#if QT_VERSION >= 0x050000
#include <QtQuick/QQuickCanvas>
#include <QtQuick/QQuickWindow>
#else
#include <QtGui/QApplication>
#endif
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "scene.h"

#if QT_VERSION >= 0x050000
#include <QtQuick/QQuickCanvas>
#include <QtQuick/QQuickWindow>
#else
#include <QtGui/QApplication>
#endif
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/plugins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,6 @@ void Plugins::registerTypes(const char *uri)
qmlRegisterType<Fixture>("QuasiGame", 1, 0, "QuasiFixture");
}

#if QT_VERSION <= 0x048000
Q_EXPORT_PLUGIN2(QuasiGame, Plugins);
#endif
3 changes: 3 additions & 0 deletions src/plugins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ class Plugins : public QDeclarativeExtensionPlugin
#endif
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "QuasiGame" FILE "plugins.json")
#endif

public:
void registerTypes(const char *uri);
Expand Down
3 changes: 3 additions & 0 deletions src/plugins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Keys": ["QuasiGame"]
}
14 changes: 11 additions & 3 deletions src/scriptbehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#if QT_VERSION >= 0x050000
#include <QtQml/QQmlExpression>
#include <QtQml/QQmlComponent>
#include <QtQml/QQmlEngine>
#else
#include <QtDeclarative/QDeclarativeExpression>
#endif
Expand Down Expand Up @@ -56,15 +58,21 @@ void ScriptBehavior::setScript(const QQmlScriptString &script)
void ScriptBehavior::setScript(const QDeclarativeScriptString &script)
#endif
{
if (m_script.script() != script.script()) {
#if QT_VERSION >= 0x050000
if (m_script.stringLiteral() != script.stringLiteral()){ // XXX scripts are not working on Qt5 D:
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
if (m_script.script() != script.script()) {
m_script = script;

if (m_expression)
delete m_expression;

m_expression = new QDeclarativeExpression(m_script.context(), m_script.scopeObject(), m_script.script());
#endif

Expand Down
2 changes: 2 additions & 0 deletions src/src.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ SOURCES += entity.cpp \
fixture.cpp \
material.cpp

OTHER_FILES += plugins.json

QMAKE_POST_LINK = $$QMAKE_COPY $$PWD/qmldir $$OUT_PWD/imports/QuasiGame

!isEmpty(QTPATH): target.path = $$QTPATH/imports/$$TARGETPATH
Expand Down