diff options
author | Richard Dale <richard.dale@codethink.co.uk> | 2014-11-26 09:54:08 +0000 |
---|---|---|
committer | Richard Dale <richard.dale@codethink.co.uk> | 2014-11-26 09:54:08 +0000 |
commit | c0aabc1a431f53496046fe8268a4d164f749e3ab (patch) | |
tree | 0f66ea4dca71c1f1bb421f3ad191c16bff5a1a5f /systems/qt5-devel-system-x86_64-generic.morph | |
parent | dc132d3d9880c65d4630ca298f5ea0d405639b75 (diff) | |
parent | 604ce30fd8f0a40164ede05c5fb365fa382387d5 (diff) | |
download | definitions-c0aabc1a431f53496046fe8268a4d164f749e3ab.tar.gz |
Merge branch 'baserock/rdale/qt-tools-5.3.2'
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
Diffstat (limited to 'systems/qt5-devel-system-x86_64-generic.morph')
-rw-r--r-- | systems/qt5-devel-system-x86_64-generic.morph | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 6cb9377b..1a78ff4f 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,8 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia-gstreamer-0.10 - morph: strata/multimedia-gstreamer-0.10.morph +- name: multimedia + morph: strata/multimedia.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools @@ -24,6 +24,8 @@ strata: morph: strata/x-generic.morph - name: qt5-tools morph: strata/qt5-tools.morph +- name: qt5-tools-qtwebkit + morph: strata/qt5-tools-qtwebkit.morph - name: qt5-sdk morph: strata/qt5-sdk.morph - name: lua |