Ver Fonte

Statically link qml-box2d

Fix outstanding qml import paths "../.."
Donald Carr há 8 anos atrás
pai
commit
0d98bbc9f9

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "3rdparty/qml-box2d"]
+	path = 3rdparty/qml-box2d
+	url = git@github.com:qml-box2d/qml-box2d.git

+ 1 - 0
3rdparty/qml-box2d

@@ -0,0 +1 @@
+Subproject commit 1b37be7d9dfb44ec6d520595a4e4f45f63717822

+ 1 - 1
qml/views/cascade/CascadeDelegate.qml

@@ -2,7 +2,7 @@ import QtQuick 2.5
 import Box2D 2.0
 import Qt.labs.settings 1.0
 
-import ".."
+import "../.."
 
 ArtBoxBody {
     signal beyondThePale(var item)

+ 1 - 1
qml/views/procession/ProcessionImage.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.6
 
-import ".."
+import "../.."
 
 ArtImage {
     property bool primed: false

+ 1 - 1
qml/views/well/WellDelegate.qml

@@ -2,7 +2,7 @@ import QtQuick 2.5
 import Box2D 2.0
 import Qt.labs.settings 1.0
 
-import ".."
+import "../.."
 
 ArtBoxBody {
     id: picture

+ 2 - 0
src/src.pro

@@ -7,6 +7,8 @@ CONFIG += c++11
 
 DEFINES *= QT_USE_QSTRINGBUILDER
 
+include(../3rdparty/qml-box2d/box2d-static.pri)
+
 HEADERS += \
     picturemodel.h