diff --git a/desktop/toolkit/qt5/qt5-declarative/actions.py b/desktop/toolkit/qt5/qt5-declarative/actions.py index e8ee7fe839..5c5f5c809b 100644 --- a/desktop/toolkit/qt5/qt5-declarative/actions.py +++ b/desktop/toolkit/qt5/qt5-declarative/actions.py @@ -13,18 +13,20 @@ from pisi.actionsapi import qt5 from pisi.actionsapi import get def setup(): + shelltools.export("CFLAGS", "CXXFLAGS") qt5.configure() def build(): - qt5.make() + qt5.make() + qt5.make("docs") 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()) + #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 install_docs" % get.installDIR()) #I hope qtchooser will manage this issue for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()): diff --git a/desktop/toolkit/qt5/qt5-declarative/pspec.xml b/desktop/toolkit/qt5/qt5-declarative/pspec.xml index 6df0c797c2..299f5af55a 100644 --- a/desktop/toolkit/qt5/qt5-declarative/pspec.xml +++ b/desktop/toolkit/qt5/qt5-declarative/pspec.xml @@ -1,4 +1,3 @@ - @@ -18,6 +17,7 @@ libxkbcommon-devel mesa-devel qt5-xmlpatterns-devel + qt5-assistant-devel @@ -50,6 +50,16 @@ qt5-declarative + + + qt5-declarative-docs + + qt5-base + + + /usr/share/doc/qt5 + +