Merge pull request #990 from groni/master

qt5-declarative QtQuick.XmlListModel works now
2015-12-20 19:29:02 +02:00
parent ba1f5ad3a3 608d34a39e
commit 1e7973fe5d
6 changed files with 102635 additions and 102603 deletions
@@ -4,6 +4,8 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt

+NoStrip = "/"
+
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
@@ -17,6 +19,11 @@ def build():
     qt5.make()

 def install():
+    pisitools.insinto("/usr/lib/qt5/qml", "qml/QtQml")
+    pisitools.insinto("/usr/lib/qt5/qml", "qml/Qt")
+    pisitools.insinto("/usr/lib/qt5/qml", "qml/QtQuick")
+    pisitools.insinto("/usr/lib/qt5/qml", "qml/QtQuick.2")
+    pisitools.insinto("usr/lib/qt5/qml", "qml/QtTest")        
    qt5.install("INSTALL_ROOT=%s" % get.installDIR())

    #I hope qtchooser will manage this issue
@@ -30,9 +30,9 @@
        </RuntimeDependencies>
        <Files>
            <Path fileType="library">/usr/lib</Path>
-            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>                                    
            <Path fileType="data">/usr/share/licenses</Path>
-            <Path fileType="executable">/usr/lib/qt5/bin/</Path>
+            <Path fileType="executable">/usr/lib/qt5/bin</Path>
            <Path fileType="executable">/usr/bin/</Path>
        </Files>

@@ -1 +1 @@
-a319e7dec4c73dcc9d5d330159c29de352711e6c
+a9172e96f426aae55d5de9923157aeefc4d41b3b
@@ -1 +1 @@
-426210778c3a3033c91d4ec334c0bf4a984fecfb
+196198f30ceb73263a165eed7d0f568bcfbbeeb6