3 files changed, 40 insertions, 13 deletions
diff --git a/libraries/qt5/README b/libraries/qt5/README
index ce753e2d88..e69f943e5a 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -6,3 +6,7 @@ OpenAL, libwebp and postgresql
 
 Optional dependencies: wayland, openvg and firebird (not available at
 slackbuilds.org)
+
+Note: To build Qt5 with Pulseadio then pass USEPULSE=yes to the slackbuild.
+
+  USEPULSE=yes ./qt5.SlackBuild
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 80bf7e49f5..971dae5c2f 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -46,7 +46,7 @@
 # tailored to Qt 5. Modified by Larry Hajali.
 
 PRGNAM=qt5
-VERSION=${VERSION:-5.3.2}
+VERSION=${VERSION:-5.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -117,6 +117,16 @@ if echo "$ARCH" | grep -q "i.86" 2>/dev/null; then
   sed -i "/^QMAKE_CFLAGS_RELEASE/ s|+=.*|+= $SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
 fi
 
+# Use Pulseaudio. Default is not to use Pulseaudio. Pulseaudio is a
+# required dependency for the new qtwebengine.
+# http://qt-project.org/wiki/QtWebEngineHowToTry
+if [ "${USEPULSE:-no}" == "yes" ]; then
+  PULSE="-pulseaudio"
+else
+  PULSE="-no-pulseaudio"
+  sed -i '/qtwebengine/d' qt.pro
+fi
+
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
@@ -143,14 +153,14 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
   -xcb \
   -glib \
   -accessibility \
-  -system-harfbuzz \
   -nomake examples \
   -no-separate-debug-info \
   -no-pch \
   -no-rpath \
   -no-strip \
   -release \
-  $RELOCATIONS
+  $RELOCATIONS \
+  $PULSE
 
 make
 make install INSTALL_ROOT=$PKG
@@ -229,13 +239,26 @@ for i in $CWD/desktop/*.desktop; do
 done
 sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
 
-for i in $(find . -name "assistant.ico" -o -name "designer.ico" \
-  -o -name "linguist.ico" -o -name "qdbusviewer.ico"); do
-  for j in 16 24 32 48 64 96 128; do
-    convert $i -resize ${j}x${j}! $(basename $i)-$j.png
-    install -D -m 0644 $(basename $i)-$j-0.png \
-      $PKG/usr/share/icons/hicolor/${j}x${j}/apps/$(basename $i | sed 's|.ico||')-$PRGNAM.png
-  done
+# Currently not working for qt version 5.4.0.  Extra layer added to *.ico file
+# freaks out ImageMagick and fails image conversion.
+#for i in $(find . -name "assistant.ico" -o -name "designer.ico" \
+#  -o -name "linguist.ico" -o -name "qdbusviewer.ico"); do
+#  for j in 16 24 32 48 64 96 128; do
+#    convert $i -resize ${j}x${j}! $(basename $i)-$j.png
+#    install -D -m 0644 $(basename $i)-$j-0.png \
+#      $PKG/usr/share/icons/hicolor/${j}x${j}/apps/$(basename $i | sed 's|.ico||')-$PRGNAM.png
+#  done
+#done
+
+install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \
+  $PKG/usr/share/icons/hicolor/128x128/apps/assistant.png
+install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \
+  $PKG/usr/share/icons/hicolor/128x128/apps/designer.png
+install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+  $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png
+for i in 16 32 48 64 128; do
+  install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-${i}-32.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/linguist.png
 done
 
 # Remove executable bits from files.
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 4d2e812810..0dcca5c8ba 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5"
-VERSION="5.3.2"
+VERSION="5.4.0"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.xz"
-MD5SUM="c4e893678e3d8388ab04d059523d1d78"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.tar.xz"
+MD5SUM="21843b00ecde8956217faab391bc007b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""