Commit 962ad74f authored by Petr Prikryl's avatar Petr Prikryl

Merge branch 'master' into devel

parents 39bdafef 8cac977d
...@@ -167,7 +167,7 @@ void InputString::setEnabled(bool state) ...@@ -167,7 +167,7 @@ void InputString::setEnabled(bool state)
{ {
m_lab->setEnabled(state); m_lab->setEnabled(state);
if (m_le) m_le->setEnabled(state); if (m_le) m_le->setEnabled(state);
if (m_im) m_le->setEnabled(state); if (m_im) m_im->setEnabled(state);
if (m_br) m_br->setEnabled(state); if (m_br) m_br->setEnabled(state);
if (m_com) m_com->setEnabled(state); if (m_com) m_com->setEnabled(state);
updateDefault(); updateDefault();
......
...@@ -594,9 +594,10 @@ fi ...@@ -594,9 +594,10 @@ fi
# - check for python ---------------------------------------------------------- # - check for python ----------------------------------------------------------
python_version=0
printf " Checking for python... " printf " Checking for python... "
if test "$f_python" = NO; then if test "$f_python" = NO; then
python_names="python2 python" python_names="python3 python2 python"
python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
python_prog=NO python_prog=NO
python_found=NO python_found=NO
...@@ -604,26 +605,33 @@ if test "$f_python" = NO; then ...@@ -604,26 +605,33 @@ if test "$f_python" = NO; then
for j in $python_dirs; do for j in $python_dirs; do
if test -x "$j/$i"; then if test -x "$j/$i"; then
python_found=YES python_found=YES
if test `$j/$i -c "import sys; print sys.version_info[0]"` = 2; then if test `$j/$i -c "import sys; print(sys.version_info[0])"` = 3; then
python_prog="$j/$i" python_prog="$j/$i";
python_version=`$j/$i -c "import platform; print(platform.python_version())"`;
break 2 break 2
elif test `$j/$i -c "import sys; print(sys.version_info[0])"` = 2; then
if test `$j/$i -c "import sys; print(sys.version_info[1])"` -ge 6; then
python_prog="$j/$i";
python_version=`$j/$i -c "import platform; print(platform.python_version())"`;
break 2
fi
fi fi
fi fi
done done
done done
f_python="$python_prog" f_python="$python_prog"
fi fi
if test "$f_python" = NO; then if test "$f_python" = NO; then
if test "$python_found" = YES; then if test "$python_found" = YES; then
echo "version should be python 2." echo "version should be python 2.6 or higher."
else else
echo "not found!"; echo "not found!";
fi fi
echo echo
exit 2 exit 2
fi fi
echo "using $f_python"; echo "using $f_python (version $python_version)";
# - check for perl ------------------------------------------------------------ # - check for perl ------------------------------------------------------------
......
...@@ -556,6 +556,7 @@ open-source tools: ...@@ -556,6 +556,7 @@ open-source tools:
<li>GNU bison version 2.5 (Linux) and 2.3 (MacOSX) <li>GNU bison version 2.5 (Linux) and 2.3 (MacOSX)
<li>GNU make version 3.81 <li>GNU make version 3.81
<li>Perl version 5.12 <li>Perl version 5.12
<li>Python verion 2.7 and 3.4
<li>TeX Live 2009 (or later) <li>TeX Live 2009 (or later)
</ul> </ul>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -11601,7 +11601,9 @@ static inline bool is_arabic(unsigned short x) { ...@@ -11601,7 +11601,9 @@ static inline bool is_arabic(unsigned short x) {
((x >= 0xfb50) && (x <= 0xfdff)) || ((x >= 0xfb50) && (x <= 0xfdff)) ||
((x >= 0xfe70) && (x <= 0xfeff))); ((x >= 0xfe70) && (x <= 0xfeff)));
} }
#endif
#ifndef QT_NO_UNICODETABLES
static inline bool is_neutral(unsigned short dir) { static inline bool is_neutral(unsigned short dir) {
return ((dir == QChar::DirB) || return ((dir == QChar::DirB) ||
(dir == QChar::DirS) || (dir == QChar::DirS) ||
......
This diff is collapsed.
...@@ -3076,7 +3076,7 @@ to be found in the default search path. ...@@ -3076,7 +3076,7 @@ to be found in the default search path.
<option type='string' id='DOT_FONTNAME' format='string' defval='Helvetica' depends='HAVE_DOT'> <option type='string' id='DOT_FONTNAME' format='string' defval='Helvetica' depends='HAVE_DOT'>
<docs> <docs>
<![CDATA[ <![CDATA[
When you want a differently looking font n the dot files that doxygen generates When you want a differently looking font in the dot files that doxygen generates
you can specify the font name you can specify the font name
using \c DOT_FONTNAME. You need to make sure dot is able to find the font, using \c DOT_FONTNAME. You need to make sure dot is able to find the font,
which can be done by putting it in a standard location or by setting the which can be done by putting it in a standard location or by setting the
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ import sys ...@@ -2,7 +2,7 @@ import sys
if (len(sys.argv) > 1): if (len(sys.argv) > 1):
if (sys.argv[1] == "ENONLY"): if (sys.argv[1] == "ENONLY"):
print "#define ENGLISH_ONLY" print("#define ENGLISH_ONLY")
else: else:
for x in xrange(1, len(sys.argv)): for x in range(1, len(sys.argv)):
print "#define LANG_%s"%(sys.argv[x]) print("#define LANG_%s"%(sys.argv[x]))
...@@ -15,7 +15,7 @@ for f in files: ...@@ -15,7 +15,7 @@ for f in files:
# generating file is lang_cfg.py # generating file is lang_cfg.py
# the rules file has to output lang_cfg.h # the rules file has to output lang_cfg.h
# #
print """\ print("""\
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<VisualStudioToolFile <VisualStudioToolFile
Name="languages" Name="languages"
...@@ -52,7 +52,7 @@ print """\ ...@@ -52,7 +52,7 @@ print """\
/> />
</Values> </Values>
</EnumProperty> </EnumProperty>
""" """)
# #
# generate loop, English is mandatory (so cannot be chosen) # generate loop, English is mandatory (so cannot be chosen)
# #
...@@ -76,7 +76,7 @@ for f in new_list: ...@@ -76,7 +76,7 @@ for f in new_list:
l1 = l.replace("-","") l1 = l.replace("-","")
# capatalize first letter # capatalize first letter
l = l.title() l = l.title()
print """\ print("""\
<EnumProperty <EnumProperty
Name="%s" Name="%s"
DisplayName="Use %s" DisplayName="Use %s"
...@@ -96,11 +96,11 @@ for f in new_list: ...@@ -96,11 +96,11 @@ for f in new_list:
/> />
</Values> </Values>
</EnumProperty> </EnumProperty>
""" % (l1, l, l, l, f[1], l) """ % (l1, l, l, l, f[1], l))
print """\ print("""\
</Properties> </Properties>
</CustomBuildRule> </CustomBuildRule>
</Rules> </Rules>
</VisualStudioToolFile> </VisualStudioToolFile>
""" """)
...@@ -290,6 +290,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) ...@@ -290,6 +290,7 @@ static void writeDefaultHeaderPart1(FTextStream &t)
// Load required packages // Load required packages
t << "% Packages required by doxygen\n" t << "% Packages required by doxygen\n"
"\\usepackage{fixltx2e}\n" // for \textsubscript
"\\usepackage{calc}\n" "\\usepackage{calc}\n"
"\\usepackage{doxygen}\n" "\\usepackage{doxygen}\n"
"\\usepackage{graphicx}\n" "\\usepackage{graphicx}\n"
...@@ -297,7 +298,6 @@ static void writeDefaultHeaderPart1(FTextStream &t) ...@@ -297,7 +298,6 @@ static void writeDefaultHeaderPart1(FTextStream &t)
"\\usepackage{makeidx}\n" "\\usepackage{makeidx}\n"
"\\usepackage{multicol}\n" "\\usepackage{multicol}\n"
"\\usepackage{multirow}\n" "\\usepackage{multirow}\n"
"\\usepackage{fixltx2e}\n" // for \textsubscript
"\\PassOptionsToPackage{warn}{textcomp}\n" "\\PassOptionsToPackage{warn}{textcomp}\n"
"\\usepackage{textcomp}\n" "\\usepackage{textcomp}\n"
"\\usepackage[nointegrals]{wasysym}\n" "\\usepackage[nointegrals]{wasysym}\n"
......
#if defined(__APPLE__) || defined(macintosh)
// define this before including iconv.h to avoid a mapping of
// iconv_open and friends to libicon_open (done by mac ports),
// while the symbols without 'lib' are linked from /usr/lib/libiconv
#define LIBICONV_PLUG
#endif
#include <iconv.h> #include <iconv.h>
// These functions are implemented in a C file, because there are different // These functions are implemented in a C file, because there are different
......
...@@ -6675,6 +6675,18 @@ static void parseCompounds(Entry *rt) ...@@ -6675,6 +6675,18 @@ static void parseCompounds(Entry *rt)
current = new Entry; current = new Entry;
gstat = FALSE; gstat = FALSE;
initEntry(); initEntry();
// deep copy group list from parent (see bug 727732)
if (rt->groups)
{
QListIterator<Grouping> gli(*rt->groups);
Grouping *g;
for (;(g=gli.current());++gli)
{
ce->groups->append(new Grouping(*g));
}
}
int ni=ce->name.findRev("::"); if (ni==-1) ni=0; else ni+=2; int ni=ce->name.findRev("::"); if (ni==-1) ni=0; else ni+=2;
// set default protection based on the compound type // set default protection based on the compound type
if( ce->section==Entry::CLASS_SEC ) // class if( ce->section==Entry::CLASS_SEC ) // class
......
...@@ -1798,8 +1798,9 @@ nextChar: ...@@ -1798,8 +1798,9 @@ nextChar:
) )
) )
{ {
if (c=='\t') c=' ';
if (c=='*' || c=='&' || c=='@' || c=='$') if (c=='*' || c=='&' || c=='@' || c=='$')
{ {
//uint rl=result.length(); //uint rl=result.length();
uint rl=growBuf.getPos(); uint rl=growBuf.getPos();
if ((rl>0 && (isId(growBuf.at(rl-1)) || growBuf.at(rl-1)=='>')) && if ((rl>0 && (isId(growBuf.at(rl-1)) || growBuf.at(rl-1)=='>')) &&
...@@ -1827,8 +1828,8 @@ nextChar: ...@@ -1827,8 +1828,8 @@ nextChar:
} }
} }
} }
//printf("removeRedundantWhiteSpace(`%s')=`%s'\n",s.data(),result.data());
growBuf.addChar(0); growBuf.addChar(0);
//printf("removeRedundantWhiteSpace(`%s')=`%s'\n",s.data(),growBuf.get());
//result.resize(resultPos); //result.resize(resultPos);
return growBuf.get(); return growBuf.get();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment