Merge remote-tracking branch 'origin/2.5'

Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d

dist/gdb/Makefile.linux

@@ -21,34 +21,44 @@ clean:
 	rm -rf  ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir
-	cd ${source}; wget http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	wget -q http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
-	cd ${source}; wget http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
+	cd ${source} && \
+	echo "Downloading python..." && \
+	wget -q http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
 	touch ${source}/Python-${pyversion}.tgz
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir
-	cd ${source} &&\
-	wget http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	wget -O gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	cd ${source} && \
+	echo "Downloading gdb..." && \
+	wget -q http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	wget -Oq gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-*.tar.bz2
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
-	cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	cd ${staging} && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
-	unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
+	unset PYTHONHOME && cd ${staging} && \
+	echo "Extracting python..." && \
+	tar xf ${source}/Python-${pyversion}.tgz && \
+	cd Python-${pyversion} && \
 	export LDFLAGS="-pthread -lm" && \
 	./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
 
@@ -58,7 +68,8 @@ ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpyt
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
         patch -p2 < ${broot}/patches/pythonhome-7.4.patch && \
@@ -75,8 +86,7 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	${staging}/gdb-${version}/configure --disable-nls --target=$* --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	sleep 3 && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	cp -T gdb/gdb ${targetdir}/gdb-$*
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
 	test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
@@ -86,10 +96,10 @@ ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${
 	cd ${staging}/gdb-${version}-${arch} && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	cp -T gdb/gdb ${targetdir}/gdb
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
 	mv ${targetdir} ${targetdir}-${arch}
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
+	echo "Packing..."
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch}
 	mv ${targetdir}-${arch} ${targetdir}

dist/gdb/Makefile.mingw

@@ -27,48 +27,55 @@ distclean:
 	rm -rf ${staging} ${source} ${broot}/qtcreator-gdb-*
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 checkunzip:
 	unzip -v &> /dev/null || mingw-get install msys-unzip
 
 ${source}/python.zip: | makesourcedir checkwget
 	cd ${source} && \
-	wget http://download.qt.nokia.com/misc/gdb/7.4/build-prerequisits/python.zip && \
+	echo "Downloading python..." && \
+	wget -q http://download.qt.nokia.com/misc/gdb/7.4/build-prerequisits/python.zip && \
 	touch python.zip
 
 ${broot}/python/python.exe: ${source}/python.zip | checkunzip
 	cd ${broot} && \
-	unzip ${source}/python.zip
+	echo "Extracting python..." && \
+	unzip -oq ${source}/python.zip && \
+	touch python/python.exe
 
 checkwget:
 	wget -V &> /dev/null || mingw-get install msys-wget-bin
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir checkwget
 	cd ${source} && \
-	wget http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	wget -O gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	echo "Downloading gdb..." && \
+	wget -q http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	wget -Oq gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-${version}.tar.bz2
 
 ${source}/libiconv-${iconvversion}.tar.gz: | makesourcedir checkwget
 	cd ${source} && \
-	wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconvversion}.tar.gz  && \
+	echo "Downloading iconv..." && \
+	wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconvversion}.tar.gz  && \
 	touch ${source}/libiconv-${iconvversion}.tar.gz
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir checkwget
-	cd ${source} &&\
-	wget http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz/download && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	wget -q http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz/download && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
 	patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
@@ -76,14 +83,16 @@ ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestag
 
 ${staging}/lib/libiconv.a: ${source}/libiconv-${iconvversion}.tar.gz | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/libiconv-${iconvversion}.tar.gz && \
+	echo "Extracting iconv..." && \
+	tar xf ${source}/libiconv-${iconvversion}.tar.gz && \
 	cd libiconv-${iconvversion} && \
 	./configure -prefix=${staging} --enable-static && \
 	${MAKE} && ${MAKE} install
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/expat-${expatversion}.tar.gz && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && \
 	cd expat-${expatversion} && \
 	./configure -prefix=${staging} --enable-static && \
 	${MAKE} && ${MAKE} install
@@ -97,10 +106,9 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/lib/libexpat.a ${staging}/lib/libi
 	${staging}/gdb-${version}/configure --target=$* --disable-nls --disable-werror \
 	--with-libiconv-prefix=${staging} \
 	--with-expat --with-libexpat-prefix=${staging} \
-	--with-python=${pydir} &&\
-	${MAKE} MAKEFLAGS+= -j1 &&\
-	strip gdb/gdb.exe && \
-	cp -T gdb/gdb.exe ${targetdir}/gdb-$*.exe
+	--with-python=${pydir} && \
+	${MAKE} MAKEFLAGS+= -j1 && \
+	strip -o ${targetdir}/gdb-$*.exe gdb/gdb.exe
 
 package: ${gdbtargets} ${broot}/python/python.exe
 	cp ${staging}/bin/libiconv* ${targetdir} && \
@@ -108,5 +116,6 @@ package: ${gdbtargets} ${broot}/python/python.exe
 	cp ${pydir}/python*.dll ${targetdir} && \
 	cp -r ${pydir}/lib ${targetdir} && \
 	mv ${targetdir} ${targetdir}-${arch} && \
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch} && \
+	echo "Packing..." && \
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch} && \
 	mv ${targetdir}-${arch} ${targetdir}

dist/gdb/Makefile.osx

@@ -21,34 +21,44 @@ clean:
 	rm -rf  ${broot}/qtcreator-gdb-* ${staging}/gdb-* qtcreator-gdb-*.tar.gz
 
 makesourcedir:
-	test -e ${source} || mkdir ${source}
+	@test -e ${source} || mkdir ${source}
 
 maketargetdir:
-	test -e ${targetdir} || mkdir ${targetdir}
+	@test -e ${targetdir} || mkdir ${targetdir}
 
 makestagingdir:
-	test -e ${staging} || mkdir ${staging}
+	@test -e ${staging} || mkdir ${staging}
 
 ${source}/expat-${expatversion}.tar.gz: | makesourcedir
-	cd ${source}; curl -LOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
+	cd ${source} && \
+	echo "Downloading expat..." && \
+	curl -LsOf http://sourceforge.net/projects/expat/files/expat/${expatversion}/expat-${expatversion}.tar.gz && \
 	touch ${source}/expat-${expatversion}.tar.gz
 
 ${source}/Python-${pyversion}.tgz: | makesourcedir
-	cd ${source}; curl -Of http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
+	cd ${source} && \
+	echo "Downloading python..." && \
+	curl -Osf http://www.python.org/ftp/python/${pyversion}/Python-${pyversion}.tgz && \
 	touch ${source}/Python-${pyversion}.tgz
 
 ${source}/gdb-${version}.tar.bz2: | makesourcedir
 	cd ${source} && \
-	curl -Of http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
-	curl -of gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
+	echo "Downloading gdb..." && \
+	curl -Osf http://ftp.gnu.org/gnu/gdb/gdb-${version}.tar.bz2 || \
+	curl -osf gdb-${version}.tar.bz2 http://ftp.gnu.org/gnu/gdb/gdb-${version}a.tar.bz2 && \
 	touch gdb-*.tar.bz2
 
 ${staging}/lib/libexpat.a: ${source}/expat-${expatversion}.tar.gz | makestagingdir
-	cd ${staging} && tar xvf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
+	cd ${staging} && \
+	echo "Extracting expat..." && \
+	tar xf ${source}/expat-${expatversion}.tar.gz && cd expat-${expatversion} && \
 	./configure --disable-shared -prefix=/ && ${MAKE} && ${MAKE} install
 
 ${staging}/lib/libpython${pyversion}.a: ${source}/Python-${pyversion}.tgz | makestagingdir
-	unset PYTHONHOME && cd ${staging} && tar xvf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
+	unset PYTHONHOME && \
+	cd ${staging} && \
+	echo "Extracting python..." && \
+	tar xf ${source}/Python-${pyversion}.tgz && cd Python-${pyversion} && \
 	./configure --prefix=${staging} && ${MAKE} && ${MAKE} install
 
 ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpython${pyversion}.a | maketargetdir
@@ -57,7 +67,8 @@ ${targetdir}/python/include/python${pyversion}/pyconfig.h: ${staging}/lib/libpyt
 
 ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestagingdir
 	cd ${staging} && \
-	tar xvf ${source}/gdb-${version}.tar.bz2 && \
+	echo "Extracting gdb..." && \
+	tar xf ${source}/gdb-${version}.tar.bz2 && \
 	cd gdb-${version} && \
 	touch configure && \
 	patch -p2 < ${broot}/patches/pythonhome-${version}.patch && \
@@ -70,8 +81,7 @@ ${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging
 	cd ${staging}/gdb-${version}-$* && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --target=$* --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	mv gdb/gdb ${targetdir}/gdb-$*
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
 	test -e ${staging}/gdb-${version}-${arch} || mkdir ${staging}/gdb-${version}-${arch}
@@ -80,10 +90,10 @@ ${targetdir}/gdb: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${
 	cd ${staging}/gdb-${version}-${arch} && \
 	${staging}/gdb-${version}/configure --disable-nls --disable-werror --with-python=${staging} --with-libexpat-prefix=${staging} && \
 	${MAKE} MAKEFLAGS+=-j1 && \
-	strip gdb/gdb && \
-	mv gdb/gdb ${targetdir}/gdb
+	strip -o ${targetdir}/gdb-$* gdb/gdb
 
 package: ${gdbtargets} ${targetdir}/gdb ${targetdir}/python/include/python${pyversion}/pyconfig.h
 	mv ${targetdir} ${targetdir}-${arch}
-	tar cvzf ${packagename} qtcreator-gdb-${version}-${arch}
+	echo "Packing..."
+	tar czf ${packagename} qtcreator-gdb-${version}-${arch}
 	mv ${targetdir}-${arch} ${targetdir}

doc/config/qt-html-default-styles.qdocconf

@@ -27,7 +27,7 @@ extraimages.HTML        = qt-logo.png \
                           ico_note.png \
                           ico_note_attention.png \
                           ico_out.png \
-                          arrow.png \
+                          arrow_bc.png \
                           home.png
 
 # Include the style sheets and scripts used.

doc/config/qt-html-online-styles.qdocconf

@@ -25,6 +25,8 @@ extraimages.HTML        = qt-logo.png \
                           bg_l_blank.png \
                           bg_ll_blank.png \
                           bg_ul_blank.png \
+                          btn_next_green.png \
+                          btn_prev_green.png \
                           header_bg.png \
                           bg_r.png \
                           box_bg.png \

doc/config/qt-html-templates.qdocconf

@@ -63,5 +63,5 @@ qhp.QtCreator.extraFiles = index.html \
                            images/ico_note_attention.png \
                            images/ico_out.png \
                            images/home.png \
-                           images/arrow.png \
+                           images/arrow_bc.png \
                            style/offline.css

doc/src/analyze/creator-valgrind.qdoc

@@ -74,7 +74,7 @@
 
     \image analyzer-issues.png "Analysis view"
 
-    Move the mouse on on a row to view more information about the function.
+    Move the mouse on a row to view more information about the function.
 
     For more information about using Memcheck, see
     \l{http://valgrind.org/docs/manual/quick-start.html#quick-start.mcrun}

doc/src/howto/creator-help.qdoc

@@ -161,7 +161,7 @@
 
     You can filter the documents displayed in the \gui Help mode to find
     relevant information faster. Select from a list of filters in the
-    \gui {Filtered by} field. The contents of the \gui Index and \gui Contents
+    \gui {Filtered by} field (1). The contents of the \gui Index and \gui Contents
     pane in the sidebar change accordingly.
 
     \image qtcreator-help-filters.png "Help filters"

doc/src/linux-mobile/creator-publish-maemo-extras-devel.qdoc

@@ -85,7 +85,11 @@
             You can also select \gui {Request upload rights} to use the Maemo
             Extras Assistant to validate your Garage account.
 
-        \o  Select \gui Commit to publish the application.
+        \o  Select \gui Commit to select the files to include in the source
+            package.
+
+        \o  Select \gui OK to build the source package, and optionally, publish
+            the application.
 
     \endlist
 

doc/src/overview/creator-getting-started.qdoc

@@ -27,7 +27,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-glossary.html
+    \previouspage index.html
     \page creator-getting-started.html
     \nextpage creator-overview.html
 

doc/src/projects/creator-projects-autotools.qdoc

@@ -43,37 +43,34 @@
     To enable the plugin, select \gui{Help > About Plugins > Build Systems > AutotoolsProjectManager}.
     To use the plugin, restart \QC.
 
-    \image qtcreator-autotools-buildrun.png
-
-    \image qtcreator-autotools-buildsettings.png
-
-    \section1 Opening and Using Autotools Projects
-
     To work with your Autotools project in \QC:
 
         \list 1
 
             \o Select \gui{File > Open File or Project}.
-            \o Select the Makefile.am from your project. This is the only way a
-               user can use the autotools plugin. Thus, a Makefile.am must
-               always exist before hand.
-            \o Select the build directory. Only in-source building is working
-               right now.
+            \o Select the Makefile.am file from your project. This is the only
+               way you can use the autotools plugin.
+            \o Select the build directory. Only in-source building is currently
+               supported.
             \o Select \gui Finish.
                \QC displays the project tree structure. The root node displays
                the project name. All project files are listed below it and you
                can open them from the list.
-            \o Select \gui Run to build and run the application. This will
-               execute autogen.sh or autoreconf, configure and make. The first
-               time, when running the application, a dialog will ask you to
-               choose the executable's location, then, \QC will remember it for
-               the following times. Ideally, this will be changed in the future,
-               to be done in a more automated way.
+
+               \image qtcreator-autotools-buildrun.png
+
+            \o Select \gui Run to build and run the application. The predefined
+               build steps (autogen.sh or autoreconf, configure, and make) are
+               executed.
+
+               The first time you run the application you must choose the
+               executable.
+
             \o To check and edit autotools build steps, select
-               \gui{Projects > Build Settings}. You can see the typical
-               autotools build steps: autogen.sh/autoreconf, configure and make.
-               You may configure some parameters such as adding new configure
-               parameters or changing the build directory (though, as mentiond
-               before, only in-source building is working at the moment).
+               \gui{Projects > Build Settings}.
+
+               You can add parameters to the predefined autotools build steps.
+
+              \image qtcreator-autotools-buildsettings.png
         \endlist
 */