development/qt-creator: Updated for version 2.6.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

6 files changed, 46 insertions, 8 deletions

diff --git a/development/qt-creator/README b/development/qt-creator/README
index d3f5b5d8ce..c98e033c70 100644
--- a/development/qt-creator/README
+++ b/development/qt-creator/README
@@ -1,4 +1,19 @@
-qt-creator is a Cross-Platform Qt IDE.
+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.
+
+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.
+
+Follow these steps to prepare source tree:
+1 - Copy Qt SlackBuild from Slackware tree to /usr/src/;
+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
+
+QTSOURCEDIR is set to /usr/src/qt-everywhere-opensource-src-x.x.x 
+(Qt version from Slackware tree).
diff --git a/development/qt-creator/doinst.sh b/development/qt-creator/doinst.sh
index 1f8ff67ded..9830478e8c 100644
--- a/development/qt-creator/doinst.sh
+++ b/development/qt-creator/doinst.sh
@@ -2,6 +2,10 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
diff --git a/development/qt-creator/qt-creator.SlackBuild b/development/qt-creator/qt-creator.SlackBuild
index ef740e129d..9f5409222b 100644
--- a/development/qt-creator/qt-creator.SlackBuild
+++ b/development/qt-creator/qt-creator.SlackBuild
@@ -27,10 +27,14 @@
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 
 PRGNAM=qt-creator
-VERSION=${VERSION:-2.5.2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.6.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 ;;
@@ -78,6 +82,7 @@ find . \
 qmake \
   IDE_LIBRARY_BASENAME="lib$LIBDIRSUFFIX" \
   QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  QT_PRIVATE_HEADERS="${QTSOURCEDIR}/include" \
   qtcreator.pro
 make
 make install INSTALL_ROOT=$PKG/usr
@@ -88,6 +93,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 mkdir -p $PKG/usr/share/applications
 cat $CWD/qt-creator.desktop > $PKG/usr/share/applications/qt-creator.desktop
 
+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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/qt-creator/qt-creator.desktop b/development/qt-creator/qt-creator.desktop
index e5f6a2b951..acd11fb228 100644
--- a/development/qt-creator/qt-creator.desktop
+++ b/development/qt-creator/qt-creator.desktop
@@ -1,9 +1,12 @@
 [Desktop Entry]
 Name=Qt Creator IDE
+GenericName=IDE for Qt Developers
+Comment=Qt-Creator is a cross-platform IDE tailored to the needs of Qt developers.
 Exec=qtcreator
-Icon=qtcreator_logo_48
-Categories=Development;IDE;
+Icon=QtProject-qtcreator
+Categories=Development;IDE;GUIDesigner;Qt;Qt-Creator;
 Version=1.0
 StartupNotify=true
 Type=Application
 Terminal=false
+MimeType=application/x-qt-creator;
diff --git a/development/qt-creator/qt-creator.info b/development/qt-creator/qt-creator.info
index 9c2f7b6093..9e814b083f 100644
--- a/development/qt-creator/qt-creator.info
+++ b/development/qt-creator/qt-creator.info
@@ -1,8 +1,8 @@
 PRGNAM="qt-creator"
-VERSION="2.5.2"
+VERSION="2.6.1"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://get.qt.nokia.com/qtcreator/qt-creator-2.5.2-src.tar.gz"
-MD5SUM="4a9c09cdf4609753283c31451c84ceb8"
+DOWNLOAD="http://origin.releases.qt-project.org/qtcreator/2.6.1/qt-creator-2.6.1-src.tar.gz"
+MD5SUM="e4d6373335a80ddf7ffcacf92442e43c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/qt-creator/x-qt-creator.xml b/development/qt-creator/x-qt-creator.xml
new file mode 100644
index 0000000000..000cf46d08
--- /dev/null
+++ b/development/qt-creator/x-qt-creator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	<mime-type type="application/x-qt-creator">
+		<sub-class-of type="text/plain"/>
+		<comment>Qt Creator Project</comment>
+		<glob pattern="*.pro"/>
+     	</mime-type>
+</mime-info>