diff --git a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml index 38a3bd09b6..1e0d8d7d1f 100644 --- a/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml +++ b/desktop/toolkit/qt5/qt5-graphicaleffects/pspec.xml @@ -15,6 +15,8 @@ qt5-base-devel qt5-declarative-devel + qt5-tools + qt5-sql-sqlite diff --git a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml index 9c4addb975..12e6bd9e60 100644 --- a/desktop/toolkit/qt5/qt5-multimedia/pspec.xml +++ b/desktop/toolkit/qt5/qt5-multimedia/pspec.xml @@ -18,7 +18,7 @@ pulseaudio-libs-devel gstreamer-devel openal-devel - pulseaudio-libs-32bit + diff --git a/desktop/toolkit/qt5/qt5-quick1/pspec.xml b/desktop/toolkit/qt5/qt5-quick1/pspec.xml index fcdac8b481..6ceb0f4ee9 100644 --- a/desktop/toolkit/qt5/qt5-quick1/pspec.xml +++ b/desktop/toolkit/qt5/qt5-quick1/pspec.xml @@ -21,6 +21,13 @@ qt5-quick1 + + mesa + qt5-base + qt5-xmlpatterns + qt5-script + + /usr/lib /usr/lib/qt5 @@ -28,27 +35,20 @@ /usr/lib/qt5/bin/ /usr/bin - - mesa - qt5-base - qt5-xmlpatterns - qt5-script - qt5-webkit - qt5-quick1-devel + + qt5-base-devel + qt5-script-devel + Development file for qt5-quick1 Development file for qt5-quick1 /usr/lib/pkgconfig /usr/include/qt5 - - qt5-base-devel - qt5-script-devel - diff --git a/desktop/toolkit/qt5/qt5-tools/actions.py b/desktop/toolkit/qt5/qt5-tools/actions.py index fc4a145dae..42387401ea 100644 --- a/desktop/toolkit/qt5/qt5-tools/actions.py +++ b/desktop/toolkit/qt5/qt5-tools/actions.py @@ -15,11 +15,11 @@ def setup(): def build(): qt5.make() - qt5.make("docs") + #qt5.make("docs") def install(): qt5.install("INSTALL_ROOT=%s" % get.installDIR()) - qt5.install("install_docs") + #qt5.install("install_docs") #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-tools/pspec.xml b/desktop/toolkit/qt5/qt5-tools/pspec.xml index a2bb0d9d97..08b4d3a2b0 100644 --- a/desktop/toolkit/qt5/qt5-tools/pspec.xml +++ b/desktop/toolkit/qt5/qt5-tools/pspec.xml @@ -16,6 +16,7 @@ mesa-devel qt5-base-devel qt5-declarative-devel + @@ -24,7 +25,7 @@ qt5-base mesa - qt5-webkit + qt5-declarative