development/qt-creator: Updated for version 4.0.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 55 insertions, 49 deletions

diff --git a/development/qt-creator/README b/development/qt-creator/README
index f75ab4575421a..4fc00e10de954 100644
--- a/development/qt-creator/README
+++ b/development/qt-creator/README
@@ -1,19 +1,26 @@
 Qt Creator is a Cross-Platform Qt IDE.
 
-The goal of Qt Creator is to provide a cross-platform, complete Integrated
-Development Environment (IDE) to develop Qt projects.
+The goal of Qt Creator is to provide a cross-platform, complete
+Integrated Development Environment (IDE) to develop Qt projects.
 
-NOTE: QmlDesigner needs Qt Private Headers. If you have intent to build the 
-QmlDesigner you need to specify the Qt source location. Besides, It is 
-required to apply all patches from Slackware tree and run configure.
-Note that configure process takes some time to finish due qmake compile 
-process.
+NOTES:
+1 - This package conflicts with qt-creator2: install
+    only one of the two.
 
-Follow these steps to prepare source tree:
-1 - Copy Qt source directory from Slackware tree to /tmp;
-2 - Edit qt.SlackBuild and place a EXIT command AFTER configure command;
-3 - Execute qt.SlackBuild;
-4 - move /tmp/qt-everywhere-opensource-src-x.x.x to /usr/src
+2 - This version of Qt Creator is advised for Qt5.
 
-QTSOURCEDIR is set to /usr/src/qt-everywhere-opensource-src-x.x.x 
-(Qt version from Slackware tree).
+3 - Before start building/editing your application, you should
+    configure the Qt kits (both Qt4 and Qt5).
+
+4 - QmlDesigner will work properly only if you configure the Qt5
+    Kit properly (Tools->Options->Build & Run->Kits) and make
+    it the Default Kit.
+
+5 - An old IDE configuration in user home directory
+    (.config/QtProject*) also can lead to strange behavior.
+
+6 - Examples, Qt5 docs and tutorials are not part of this
+    package (except for Qt Creator Docs itself).
+    To build Qt5 with documentations and examples do as
+    follow:
+    EXAMPLES=yes DOCS=yes ./qt5.SlackBuild
diff --git a/development/qt-creator/doinst.sh b/development/qt-creator/doinst.sh
index 9830478e8cc75..9424ce43ff572 100644
--- a/development/qt-creator/doinst.sh
+++ b/development/qt-creator/doinst.sh
@@ -11,4 +11,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/development/qt-creator/qt-creator.SlackBuild b/development/qt-creator/qt-creator.SlackBuild
index 98bac8f31b0b7..b0a61be9af409 100644
--- a/development/qt-creator/qt-creator.SlackBuild
+++ b/development/qt-creator/qt-creator.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qt-creator
 
-# Copyright 2009 Andre Barboza
+# Copyright 2016 Andre Barboza
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,19 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Written by Andre Barboza <bmg.andre@gmail.com>
-# Modified by the SlackBuilds.org project.
-# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
-
 PRGNAM=qt-creator
-VERSION=${VERSION:-2.8.0}
+VERSION=${VERSION:-4.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# QmlDesigner needs Qt Private Headers
-# Extract Qt source (from Slackware) into /usr/src and apply all the patches
-QTSOURCEDIR=${QTSOURCEDIR:-"/usr/src/qt-everywhere-opensource-src-4.8.2"}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -67,27 +59,34 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd $PRGNAM-$VERSION-src
+rm -rf $PRGNAM-opensource-src-$VERSION
+tar xvf $CWD/$PRGNAM-opensource-src-$VERSION.tar.gz
+cd $PRGNAM-opensource-src-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# We are intentionally using an in-source build here,
-# because the out-of-source build was causing errors
-qmake \
-  IDE_LIBRARY_BASENAME="lib$LIBDIRSUFFIX" \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Adjust docs location.
+sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" qtcreator.pri
+sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" doc/api/qtcreator-documentation.qdoc
+sed -i "s|share/doc/qtcreator|doc/$PRGNAM-$VERSION|g" src/plugins/coreplugin/icore.cpp
+
+qmake-qt5 qtcreator.pro \
   QMAKE_CXXFLAGS="$SLKCFLAGS" \
-  QT_PRIVATE_HEADERS="${QTSOURCEDIR}/include" \
-  qtcreator.pro
+  QTC_PREFIX=/usr \
+  IDE_LIBRARY_BASENAME=lib$LIBDIRSUFFIX \
+  LLVM_INSTALL_DIR=/usr \
+  QBS_INSTALL_DIR=/usr
+
 make
-make install INSTALL_ROOT=$PKG/usr
+make install INSTALL_ROOT=$PKG
+make docs
+make install_docs INSTALL_ROOT=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/share/applications
@@ -97,12 +96,13 @@ mkdir -p $PKG/usr/share/mime/packages
 cat $CWD/x-qt-creator.xml > $PKG/usr/share/mime/packages/x-qt-creator.xml
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a HACKING LICENSE.LGPL README LGPL_EXCEPTION.TXT $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a HACKING LICENSE.GPL3-EXCEPT README.md dist/changes-$VERSION.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/qt-creator/qt-creator.info b/development/qt-creator/qt-creator.info
index aedb417d7b1e2..0624d3be4bf40 100644
--- a/development/qt-creator/qt-creator.info
+++ b/development/qt-creator/qt-creator.info
@@ -1,10 +1,10 @@
 PRGNAM="qt-creator"
-VERSION="2.8.0"
-HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qtcreator/2.8/2.8.0/qt-creator-2.8.0-src.tar.gz"
-MD5SUM="5aacdad4491b7dda9758a81384d8da79"
+VERSION="4.0.1"
+HOMEPAGE="http://wiki.qt.io/Qt_Creator"
+DOWNLOAD="http://download.qt.io/official_releases/qtcreator/4.0/4.0.1/qt-creator-opensource-src-4.0.1.tar.gz"
+MD5SUM="a3db04324402b732eff43f97bbb7f210"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt5 qbs"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/development/qt-creator/slack-desc b/development/qt-creator/slack-desc
index bc4f74949df4b..379c550a14e4b 100644
--- a/development/qt-creator/slack-desc
+++ b/development/qt-creator/slack-desc
@@ -12,7 +12,7 @@ qt-creator: The goal of Qt Creator is to provide a cross-platform, complete
 qt-creator: Integrated Development Environment (IDE) to develop Qt projects.
 qt-creator: It is available for the Linux, Mac OS X and Windows platforms.
 qt-creator:
-qt-creator: Homepage: http://qt-project.org/
+qt-creator: Homepage: https://www.qt.io/ide/
 qt-creator:
 qt-creator:
 qt-creator: