feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.5'

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

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
This commit is contained in:
Eike Ziller
2012-04-27 17:02:39 +02:00
parent 6c5bec6e65 29062c64f7
commit 9092e70884
28 changed files with 735 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dist/gdb/Makefile.linux vendored
View File

@@ -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}

45
dist/gdb/Makefile.mingw vendored
View File

@@ -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}

40
dist/gdb/Makefile.osx vendored
View File

@@ -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}

2
doc/config/qt-html-default-styles.qdocconf
View File

@@ -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.

2
doc/config/qt-html-online-styles.qdocconf
View File

@@ -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 \

2
doc/config/qt-html-templates.qdocconf
View File

@@ -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

BIN
doc/images/analyzer-issues.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
doc/images/analyzer_issues.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 KiB

BIN
doc/images/qml-observer-buttons.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
doc/images/qtcreator-autotools-buildrun.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/images/qtcreator-autotools-buildsettings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/images/qtcreator-context-sensitive-help.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
doc/images/qtcreator-help-filters.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
doc/images/qtcreator-help-search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 49 KiB

BIN
doc/images/qtcreator-publish-maemo-extras.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

2
doc/src/analyze/creator-valgrind.qdoc
View File

@@ -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}

2
doc/src/howto/creator-help.qdoc
View File

@@ -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"

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

@@ -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

2
doc/src/overview/creator-getting-started.qdoc
View File

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

41
doc/src/projects/creator-projects-autotools.qdoc
View File

@@ -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
*/

2
doc/src/qtcreator.qdoc
View File

@@ -29,7 +29,7 @@
/*!
\contentspage{index.html}{Qt Creator}
\page index.html
\nextpage creator-overview.html
\nextpage creator-getting-started.html
\title Qt Creator Manual

0
doc/templates/images/arrow.png → doc/templates/images/arrow_bc.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

21
doc/templates/style/offline.css vendored
View File

@@ -80,13 +80,6 @@ padding-left:20px;
text-align:left;
}
/*a[href*="http://qt.nokia.com/doc/"], a[href*="http://doc.qt.nokia.com/"]
{
background: none;
padding-left: 0px;
text-align:left;
}*/
.flags{
text-decoration:none;
text-height:24px;
@@ -168,7 +161,7 @@ margin:0px;
}
.naviNextPrevious > a:first-child{
.naviNextPrevious > a.prevPage {
background-image:url(../images/btn_prev.png);
background-repeat:no-repeat;
background-position:left;
@@ -177,7 +170,7 @@ height:20px;
padding-left:20px;
}
.naviNextPrevious > a:last-child{
.naviNextPrevious > a.nextPage {
background-image:url(../images/btn_next.png);
background-repeat:no-repeat;
background-position:right;
@@ -232,7 +225,7 @@ padding-left:20px;
color:#2C418D;
display:block;
text-decoration:none;
background:url(../images/arrow.png);
background:url(../images/arrow_bc.png);
background-repeat:no-repeat;
background-position:right;
padding-right:25px;
@@ -292,11 +285,13 @@ font: 500 16px/1.2 Arial;
font-weight:100;
background-color:#F2F3F4;
padding:4px;
padding-left: 14px;
margin-bottom:30px;
margin-top:30px;
margin-left: -10px;
margin-right: -5px;
border-top:#E0E0DE 1px solid;
border-bottom: #E0E0DE 1px solid;
max-width: 99%;
}
h3{
@@ -450,9 +445,6 @@ ul{
padding-bottom:2px;
}
li ul {
padding-top: 10px;
}
li {
margin-bottom: 10px;
padding-left: 8px;
@@ -596,7 +588,6 @@ padding-left:5px;
width:160px;
padding-left:10px;
padding-right:5px;
padding-bottom:10px;
padding-top:10px;
}

523
doc/templates/style/style.css vendored
View File

@@ -7,7 +7,7 @@
color: #000000;
background: #FFFFFF;
}
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, th, td
{
margin: 0;
padding: 0;
@@ -101,7 +101,7 @@
}
a
{
color: #00732f;
color: #00732F;
text-decoration: none;
}
hr
@@ -146,13 +146,13 @@
}
th
{
padding: 5px 15px 5px 15px;
padding: 5px 15px 5px 10px;
background-color: #E1E1E1;
border-left: 1px solid #E6E6E6;
}
td
{
padding: 3px 15px 3px 15px;
padding: 3px 15px 3px 10px;
}
tr.odd td:hover, tr.even td:hover {}
@@ -177,17 +177,206 @@
/* background-color: #E6E6E6;*/ /* disabled until further notice */
}
div.float-left
{
float: left; margin-right: 2em
}
div.float-right
{
float: right; margin-left: 2em
}
div.clear-both
{
clear: both
}
div.clear-left
{
clear: left
}
div.clear-right
{
clear: right
}
#color-white
{
background: #ffffff;
color: #000000;
}
#color-black
{
background: #000000;
color: #ffffff;
}
#color-red
{
background: #ff0000;
color: #000000;
}
#color-darkRed
{
background: #800000;
color: #ffffff;
}
#color-green
{
background: #00ff00;
color: #000000;
}
#color-darkGreen
{
background: #008000;
color: #ffffff;
}
#color-blue
{
background: #0000ff;
color: #ffffff;
}
#color-darkBlue
{
background: #000080;
color: #ffffff;
}
#color-cyan
{
background: #00ffff;
color: #000000;
}
#color-darkCyan
{
background: #008080;
color: #ffffff;
}
#color-magenta
{
background: #ff00ff;
color: #000000;
}
#color-darkMagenta
{
background: #800080;
color: #ffffff;
}
#color-yellow
{
background: #ffff00;
color: #000000;
}
#color-darkYellow
{
background: #808000;
color: #ffffff;
}
#color-gray
{
background: #a0a0a4;
color: #000000;
}
#color-darkGray
{
background: #808080;
color: #ffffff;
}
#color-lightGray
{
background: #c0c0c0;
color: #000000;
}
#QtGuiColor
{
background-color: #98fd00;
color: black;
}
#QtCoreColor
{
background-color: #9c9cff;
color: black;
}
#DefaultColor
{
background-color: #f6f6dc;
color: black;
}
#FreetypeColor
{
background-color: #e6e6fa;
color: black;
}
#GLColor
{
background-color: #ffc0cb;
color: black;
}
#PthreadColor
{
background-color: #bdb76b;
color: black;
}
#OptionalColor
{
background-color: #cae1ff;
color: black;
}
#SMColor
{
background-color: #c2fafa;
color: black;
}
#MiscColor
{
background-color: #f0f9ff;
color: black;
}
#GlibColor
{
background-color: #b3b3b3;
color: black;
}
.figCaption
{
color:#363534;
font:italic 11px/1.2 Verdana;
text-align: center;
padding-top:0;
}
span.comment
{
color: #8B0000;
font-style: italic;
color: #008B00;
font-style: italic
}
span.string, span.char
{
color: #254117;
color: #000084;
}
span.number
{
color: #a46200;
}
span.operator
{
color: #202020;
}
span.keyword
{
color: #840000;
}
span.name
{
color: black
}
span.type
{
font-weight: bold
}
span.type a:visited
{
color: #0F5300;
}
span.preprocessor
{
color: #404040
}
/* end basic elements */
/* font style elements */
@@ -204,6 +393,15 @@
{
font-size: 13px;
}
.red
{
color:red;
}
.figCaption{
color:#363534;
font:italic 11px/1.2 Verdana;
padding-top:0;
}
/* end font style elements */
/* global settings*/
@@ -227,8 +425,8 @@
clear: both;
visibility: hidden;
}
/* end global settings*/
/* header elements */
.header
{
@@ -313,7 +511,6 @@
background-position: -2px -117px;
}
#nav-topright li.nav-topright-dev a
{
width: 30px;
@@ -388,7 +585,6 @@
overflow: hidden;
}
.shortCut-topleft-inactive
{
padding-left: 3px;
@@ -432,10 +628,8 @@
{
color: #44a51c;
}
/* end header elements */
/* content and sidebar elements */
.wrapper
{
@@ -449,9 +643,6 @@
overflow: hidden;
}
.wrapper .hd span
{
height: 15px;
@@ -465,9 +656,6 @@
position: relative;
}
.wrapper .ft
{
padding-left: 216px;
@@ -476,9 +664,6 @@
overflow: hidden;
}
.wrapper .ft span
{
height: 15px;
@@ -490,13 +675,9 @@
float:right;
display:block;
padding-right:15px;
}
/* end content and sidebar elements */
/* sidebar elements */
.sidebar
{
@@ -506,11 +687,6 @@
font-size: 11px;
}
.sidebar .searchlabel
{
padding: 0 0 2px 17px;
@@ -627,7 +803,103 @@
background:url("../images/spinner.gif") no-repeat scroll right center transparent;
}
.floatingResult{
.sidebar .search form {
_height: 23px;
_width: 169px;
}
#resultdialog {
display: none;
position: absolute;
*left: 30px;
_left: 0;
*top: 35px;
_top: 30px;
_zoom: 1;
background-color: #fff;
border: 1px solid #666;
z-index: 4;
margin-top: 5px;
_margin: 0 0 0 -20px;
padding: 10px;
width: 30%;
_width: 196px;
height: 250px;
overflow: auto;
-webkit-border-radius: .5em;
-moz-border-radius: .5em;
border-radius: .5em;
-webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
-moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
font-size: 11px;
}
#resultdialog a
{
color: #00732f;
}
#resultdialog.active {
display: block;
}
.narrow #resultdialog {
width: 60%;
_width: 360px;
}
.narrow #resultdialog.active {
right: 10px;
*left: auto;
_left: auto;
_right: -20px;
}
#resultdialog #resultclose {
float: right;
}
#resultdialog p,
#resultdialog ul {
clear: both;
margin: 3px 0;
}
p#searchcount span {
display: none;
}
p#searchcount.all span#resultcount,
p#searchcount.api span#apicount,
p#searchcount.article span#articlecount,
p#searchcount.example span#examplecount {
display: inline;
}
#resultlist li {
display: none;
}
#resultlist.api li.api,
#resultlist.article li.article,
#resultlist.example li.example,
#resultlist.all li {
display: block;
}
#resultlinks.api a#showapiresults,
#resultlinks.api a#showapiresults:hover,
#resultlinks.article a#showarticleresults,
#resultlinks.article a#showarticleresults:hover,
#resultlinks.example a#showexampleresults,
#resultlinks.example a#showexampleresults:hover,
#resultlinks.all a#showallresults,
#resultlinks.all a#showallresults:hover {
color: #B0ADAB;
}
.floatingResult{
z-index:1;
position:relative;
padding-top:0px;
@@ -637,15 +909,15 @@
width:600px;
overflow-x:hidden;
overflow-y:auto;
}
}
.floatingResult:hover{
display:block;
}
.floatingResult:hover{
}
/* end sidebar elements */
/* content elements */
.wrap
{
@@ -653,9 +925,6 @@
overflow: visible;
}
.wrap .toolbar
{
background-color: #fafafa;
@@ -697,6 +966,7 @@
margin-right: 15px;
font-weight: bold;
color: #B0ADAB;
font: bold 10px/1.2 Verdana;
}
.toolbuttons #print
@@ -741,7 +1011,6 @@
color: #00732F;
}
.wrap .content
{
padding: 30px;
@@ -774,9 +1043,6 @@
margin-left: 0;
}
.wrap .content ol li {
background:none;
font:normal 10pt/1.2 Verdana;
@@ -810,7 +1076,6 @@
}
.wrap .content h2
{
border-bottom:1px solid #DDDDDD;
font:600 16px/1.2 Arial;
margin-top:15px;
width:100%;
@@ -830,7 +1095,6 @@
.wrap .content table p
{
line-height: 20px;
/* padding: 0px;*/
}
.wrap .content ul
{
@@ -845,6 +1109,15 @@
color: #4c0033;
text-decoration: underline;
}
descr p a
{
text-decoration: underline;
}
.descr p a:visited
{
text-decoration: underline;
}
.feedback
{
float: none;
@@ -900,9 +1173,9 @@
/*display:inline-block;*/
margin-left:10px;
min-width:250px;
line-height: 1.2;
line-height: 1.5;
min-width:100%;
min-height:15px;
}
.flowList dd a{
@@ -917,24 +1190,47 @@
margin: 15px;
}
.naviNextPrevious > a:first-child
.details
{
text-align: left;
font-size: 80%;
color: blue
}
.variableName
{
font-family: courier;
color: blue
}
.newStuff
{
text-align: left;
font-size: 80%;
color: red;
}
.naviNextPrevious > a.prevPage
{
background-image:url(../images/btn_prev_green.png);
background-repeat:no-repeat;
background-position:left;
padding-left:20px;
height:20px;
padding-left:20px;
}
.naviNextPrevious > a:last-child
.naviNextPrevious > a.nextPage
{
background-image:url(../images/btn_next_green.png);
background-repeat:no-repeat;
background-position:right;
padding-right:20px;
height:20px;
margin-left:30px;
float:right;
}
.naviNextPrevious + p
{
display:inline-block;
clear:both;
}
.qmltype
@@ -985,7 +1281,7 @@
padding: 5px 5px 0 0;
margin-bottom: 3px;
color: #363534;
font-weight: bold;
font-weight:bold;
float: right;
text-decoration: none;
}
@@ -1181,7 +1477,6 @@
text-align:right;
}
.leftAlign
{
text-align:left;
@@ -1194,10 +1489,9 @@
.functionIndex a{
display:inline-block;
}
/* end content elements */
/* footer elements */
/* footer elements */
.footer
{
min-height: 100px;
@@ -1208,11 +1502,12 @@
background-color: #E6E7E8;
margin: 0;
}
.small
{
font: normal 9px/1 Verdana;
}
/* end footer elements */
/* start index box */
.indexbox
{
@@ -1242,8 +1537,7 @@
_width:42%;
padding:0 2% 0 1%;
vertical-align:top;
}
}
.indexboxcont .indexIcon
{
@@ -1251,12 +1545,11 @@
*width:18%;
_width:18%;
overflow:hidden;
}
}
.indexboxcont .section {
.indexboxcont .section {
float: left;
}
}
.indexboxcont .section p
{
@@ -1285,6 +1578,10 @@
font: normal bold 13px/1 Verdana;
}
.content .normallist li
{
font: normal 13px/1 Verdana;
}
.indexbox a:hover, .indexbox a:visited:hover
{
color: #4c0033;
@@ -1301,7 +1598,6 @@
width: 11%;
}
.indexbox .indexIcon span
{
display: block;
@@ -1322,6 +1618,13 @@
background: url(../images/sprites-combined.png) no-repeat -111px -376px;
padding: 0;
}
.indexbox.tools .indexIcon2
{
width: 115px;
height: 137px;
background: url(../images/sprites-combined.png) no-repeat -111px -376px;
padding: 0;
}
.indexboxcont:after
{
content: ".";
@@ -1343,7 +1646,6 @@
}
.creator .wrap .content ol li {
list-style-type:decimal;
}
.creator .header .icon,
.creator .feedback,
@@ -1352,9 +1654,9 @@
.creator #feedbackBox,
.creator #feedback,
.creator #blurpage,
/*.creator .indexbox .indexIcon span,*/
/* .creator .indexbox .indexIcon span,*/
.creator .wrapper .hd,
/* .creator .indexbox .indexIcon,*/
/* .creator .indexbox .indexIcon,*/
.creator .header #nav-logo,
.creator #offlinemenu,
.creator #offlinesearch,
@@ -1382,7 +1684,7 @@
}
.creator .header, .footer, .wrapper
.creator .header, .creator .footer, .creator .wrapper
{
max-width: 1500px;
margin: 0px;
@@ -1395,7 +1697,6 @@
}
.creator .wrapper .bd
{
background:#FFFFFF;
}
@@ -1418,8 +1719,6 @@
background:none;
}
.creator .footer
{
border-top:1px solid #E5E5E5;
@@ -1436,14 +1735,11 @@
.creator .wrap
{
padding:0 5px 0 5px;
margin: 0px;
}
.creator .wrap .toolbar
{
border-bottom:1px solid #E5E5E5;
/*width:100%;*/
margin-left:-5px;
@@ -1469,8 +1765,8 @@
.creator .wrap .content .descr ol li {
margin-left: 45px;
}
.creator .content .alignedsummary
{
margin: 5px;
@@ -1480,7 +1776,7 @@
max-width:75%;
}
.creator .generic td{
/* padding:0;*/
/*padding:0;*/
}
.creator .indexboxbar
{
@@ -1489,8 +1785,6 @@
background: none;
}
.creator .header
{
width: 100%;
@@ -1501,18 +1795,9 @@
overflow: visible;
border-bottom: solid #E5E5E5 1px;
z-index:1;
/* position:fixed;*/
}
.creator .header .content
{
}
@@ -1541,19 +1826,12 @@
text-decoration:none;
}
.creator .wrap .toolbar
{
display:block;
padding-top:0px;
}
.creator .wrap .breadcrumb ul li {
font-weight: normal;
}
@@ -1577,7 +1855,6 @@
margin-top:-15px;
}
.creator .toc {
margin:10px 20px 10px 10px;
}
@@ -1587,6 +1864,57 @@
}
/* end of creator spec*/
.item {
float: left;
position: relative;
width: 100%;
overflow: hidden;
}
.item .primary {
margin-right: 220px;
position: relative;
}
.item hr {
margin-left: -220px;
}
.item .secondary {
float: right;
width: 200px;
position: relative;
}
.item .cols {
clear: both;
display: block;
}
.item .cols .col {
float: left;
margin-left: 1.5%;
}
.item .cols .col.first {
margin-left: 0;
}
.item .cols.two .col {
width: 45%;
}
.item .box {
margin: 0 0 10px 0;
}
.item .box h3 {
margin: 0 0 10px 0;
}
.cols.unclear {
clear:none;
}
}
/* end of screen media */
@@ -1605,7 +1933,6 @@
background: none;
display: block;
width: 100%; margin: 0; float: none;
}
}
/* end of print media */

1
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -197,6 +197,7 @@ static QSharedPointer<FunctionDeclDefLink> findLinkHelper(QSharedPointer<Functio
// the parens are necessary for finding good places for changes
if (!targetFuncDecl->lparen_token || !targetFuncDecl->rparen_token)
return noResult;
QTC_ASSERT(targetFuncDecl->symbol, return noResult);
// if the source and target argument counts differ, something is wrong
QTC_ASSERT(targetFuncDecl->symbol->argumentCount() == link->sourceFunction->argumentCount(), return noResult);

2
src/plugins/debugger/breakhandler.cpp
View File

@@ -1426,8 +1426,10 @@ bool BreakHandler::BreakpointItem::isLocatedAt
void BreakHandler::BreakpointItem::updateMarkerIcon()
{
if (marker) {
marker->setIcon(icon());
marker->updateMarker();
}
}
void BreakHandler::BreakpointItem::updateMarker(BreakpointModelId id)

16
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3126,20 +3126,22 @@ void GdbEngine::insertBreakpoint(BreakpointModelId id)
QVariant vid = QVariant::fromValue(id);
if (type == WatchpointAtAddress) {
postCommand("watch " + addressSpec(handler->address(id)),
NeedsStop | RebuildBreakpointModel,
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleWatchInsert), vid);
return;
}
if (type == WatchpointAtExpression) {
postCommand("watch " + handler->expression(id).toLocal8Bit(),
NeedsStop | RebuildBreakpointModel,
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleWatchInsert), vid);
return;
}
if (type == BreakpointAtFork) {
postCommand("catch fork", NeedsStop | RebuildBreakpointModel,
postCommand("catch fork",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
postCommand("catch vfork", NeedsStop | RebuildBreakpointModel,
postCommand("catch vfork",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
return;
}
@@ -3149,12 +3151,14 @@ void GdbEngine::insertBreakpoint(BreakpointModelId id)
// return;
//}
if (type == BreakpointAtExec) {
postCommand("catch exec", NeedsStop | RebuildBreakpointModel,
postCommand("catch exec",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
return;
}
if (type == BreakpointAtSysCall) {
postCommand("catch syscall", NeedsStop | RebuildBreakpointModel,
postCommand("catch syscall",
NeedsStop | RebuildBreakpointModel | ConsoleCommand,
CB(handleCatchInsert), vid);
return;
}

2
tests/manual/debugger/simple/simple_test_app.cpp
View File

@@ -2002,7 +2002,7 @@ namespace plugin {
BREAK_HERE;
// CheckType dir QString.
// Check lib "" QLibrary.
// Check name <not accessible> QString.
// CheckType name QString.
// CheckType res int.
// Continue.
// Step