5 files changed, 38 insertions, 13 deletions
diff --git a/development/qbs/README b/development/qbs/README
index 98c9a2f74f17d..cfcbcff194b09 100644
--- a/development/qbs/README
+++ b/development/qbs/README
@@ -7,3 +7,9 @@ software project, whether it is written in Qt or not.
 Qbs is an all-in-one tool that generates a build graph from a high-level 
 project description (like qmake or cmake) and additionally undertakes 
 the task of executing the commands in the low-level build graph (like make).
+
+Note:
+qbs package conflicts with the qbs bundled within qt-creator3 package.
+Either install qbs package and build qt-creator3 package without the bundled
+qbs OR build qt-creator3 package with the bundled qbs and do not install
+the standalone (this) qbs package. In either case, qbs will be available.
diff --git a/development/qbs/qbs-config-ui.desktop b/development/qbs/qbs-config-ui.desktop
new file mode 100644
index 0000000000000..d537d62bdf81a
--- /dev/null
+++ b/development/qbs/qbs-config-ui.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qbs Settings
+Comment=Qbs Configuration UI
+Exec=qbs-config-ui
+Icon=qt-logo
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/development/qbs/qbs.SlackBuild b/development/qbs/qbs.SlackBuild
index 41cb30e380b59..38a44ef913ce7 100644
--- a/development/qbs/qbs.SlackBuild
+++ b/development/qbs/qbs.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qbs
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-src-$VERSION
+tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz
+cd $PRGNAM-src-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,11 +69,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Build qbs
-qmake -r qbs.pro QBS_LIBRARY_DIRNAME=lib$LIBDIRSUFFIX
+# Adjust docs location.
+sed -i "s|share/doc/qbs|doc/qbs-$VERSION|g" doc/doc.pri
+
+qmake-qt5 qbs.pro \
+  QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  QBS_INSTALL_PREFIX=/usr \
+  QBS_LIBRARY_DIRNAME=lib$LIBDIRSUFFIX \
+  CONFIG+=qbs_enable_project_file_updates
+
 make
+make install INSTALL_ROOT=$PKG
 make docs
-make install INSTALL_ROOT=$PKG/usr
+make install_docs INSTALL_ROOT=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -82,6 +90,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/html doc/qbs.qch $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mkdir -p $PKG/usr/share/applications
+cat $CWD/qbs-config-ui.desktop > $PKG/usr/share/applications/qbs-config-ui.desktop
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/development/qbs/qbs.info b/development/qbs/qbs.info
index 82ca8aa7319a7..3461da66fff52 100644
--- a/development/qbs/qbs.info
+++ b/development/qbs/qbs.info
@@ -1,10 +1,10 @@
 PRGNAM="qbs"
-VERSION="1.3.2"
+VERSION="1.5.1"
 HOMEPAGE="http://qt-project.org/wiki/qbs"
-DOWNLOAD="http://download.qt-project.org/official_releases/qbs/1.3.2/qbs-1.3.2.src.tar.gz"
-MD5SUM="bd4c6e8e7a18540c0c7eec5a579d5c35"
+DOWNLOAD="http://download.qt.io/official_releases/qbs/1.5.1/qbs-src-1.5.1.tar.gz"
+MD5SUM="48777331815254651430d6d9acd7d413"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5"
 MAINTAINER="Nikos Giotis"
-EMAIL="nikos.giotis@gmail.com"
-\ No newline at end of file
+EMAIL="nikos.giotis@gmail.com"
diff --git a/development/qbs/slack-desc b/development/qbs/slack-desc
index 626daf6d8cf56..84f8c72cfed0b 100644
--- a/development/qbs/slack-desc
+++ b/development/qbs/slack-desc
@@ -13,7 +13,7 @@ qbs: for developing projects across multiple platforms. Qbs can be used for
 qbs: any software project, whether it is written in Qt or not.
 qbs:
 qbs:
-qbs:
+qbs: Homepage: http://wiki.qt.io/Qt_Build_Suite
 qbs:
 qbs:
 qbs: