Merge branch 'master' into devel

addon/doxywizard/inputstring.cpp

@@ -167,7 +167,7 @@ void InputString::setEnabled(bool state)
 {
   m_lab->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_com) m_com->setEnabled(state);
   updateDefault();

configure

@@ -594,9 +594,10 @@ fi
 
 # - check for python ----------------------------------------------------------
 
+python_version=0
 printf "  Checking for python... "
 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_prog=NO
   python_found=NO
@@ -604,26 +605,33 @@ if test "$f_python" = NO; then
     for j in $python_dirs; do
       if test -x "$j/$i"; then
         python_found=YES
-        if test `$j/$i -c "import sys; print sys.version_info[0]"` = 2; then
-          python_prog="$j/$i"
+        if test `$j/$i -c "import sys; print(sys.version_info[0])"` = 3; then
+          python_prog="$j/$i";
+          python_version=`$j/$i -c "import platform; print(platform.python_version())"`;
           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
     done
   done
-  f_python="$python_prog" 
+  f_python="$python_prog"
 fi
 
 if test "$f_python" = NO; then
   if test "$python_found" = YES; then
-    echo "version should be python 2."
+    echo "version should be python 2.6 or higher."
   else
     echo "not found!";
   fi
   echo
   exit 2
 fi
-echo "using $f_python";
+echo "using $f_python (version $python_version)";
 
 # - check for perl ------------------------------------------------------------
 

doc/install.doc

@@ -556,6 +556,7 @@ open-source tools:
 <li>GNU bison version 2.5 (Linux) and 2.3 (MacOSX)
 <li>GNU make version 3.81
 <li>Perl version 5.12
+<li>Python verion 2.7 and 3.4
 <li>TeX Live 2009 (or later)
 </ul>
 

qtools/qstring.cpp

@@ -11601,7 +11601,9 @@ static inline bool is_arabic(unsigned short x) {
 	    ((x >= 0xfb50) && (x <= 0xfdff)) ||
 	    ((x >= 0xfe70) && (x <= 0xfeff)));
 }
+#endif
 
+#ifndef QT_NO_UNICODETABLES
 static inline bool is_neutral(unsigned short dir) {
   return ((dir == QChar::DirB) ||
 		  (dir == QChar::DirS) ||

src/config.xml

@@ -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'>
       <docs>
 <![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 
  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 

src/lang_cfg.py

@@ -2,7 +2,7 @@ import sys
 
 if (len(sys.argv) > 1):
     if (sys.argv[1] == "ENONLY"):
-        print "#define ENGLISH_ONLY"
+        print("#define ENGLISH_ONLY")
     else:
-        for x in xrange(1, len(sys.argv)):
-            print "#define LANG_%s"%(sys.argv[x])
+        for x in range(1, len(sys.argv)):
+            print("#define LANG_%s"%(sys.argv[x]))

src/languages.py

@@ -15,7 +15,7 @@ for f in files:
 # generating file is lang_cfg.py
 # the rules file has to output lang_cfg.h
 #
-print """\
+print("""\
 <?xml version="1.0" encoding="utf-8"?>
 <VisualStudioToolFile
         Name="languages"
@@ -52,7 +52,7 @@ print """\
                                                />
                                        </Values>
                                </EnumProperty>
-"""
+""")
 #
 # generate loop, English is mandatory (so cannot be chosen)
 #
@@ -76,7 +76,7 @@ for f in new_list:
         l1 = l.replace("-","")
         # capatalize first letter
         l = l.title()
-        print """\
+        print("""\
                                    <EnumProperty
                                            Name="%s"
                                            DisplayName="Use %s"
@@ -96,11 +96,11 @@ for f in new_list:
                                                    />
                                            </Values>
                                    </EnumProperty>
-        """ % (l1, l, l, l, f[1], l)
+        """ % (l1, l, l, l, f[1], l))
 
-print """\
+print("""\
                         </Properties>
                 </CustomBuildRule>
         </Rules>
 </VisualStudioToolFile>
-"""
+""")

src/latexgen.cpp

@@ -290,6 +290,7 @@ static void writeDefaultHeaderPart1(FTextStream &t)
 
   // Load required packages
   t << "% Packages required by doxygen\n"
+       "\\usepackage{fixltx2e}\n" // for \textsubscript
        "\\usepackage{calc}\n"
        "\\usepackage{doxygen}\n"
        "\\usepackage{graphicx}\n"
@@ -297,7 +298,6 @@ static void writeDefaultHeaderPart1(FTextStream &t)
        "\\usepackage{makeidx}\n"
        "\\usepackage{multicol}\n"
        "\\usepackage{multirow}\n"
-       "\\usepackage{fixltx2e}\n" // for \textsubscript
        "\\PassOptionsToPackage{warn}{textcomp}\n"
        "\\usepackage{textcomp}\n"
        "\\usepackage[nointegrals]{wasysym}\n"

src/portable_c.c

+#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>
 
 // These functions are implemented in a C file, because there are different

src/scanner.l

@@ -6675,6 +6675,18 @@ static void parseCompounds(Entry *rt)
       current = new Entry;
       gstat = FALSE;
       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;
       // set default protection based on the compound type
       if( ce->section==Entry::CLASS_SEC ) // class

src/util.cpp

@@ -1798,8 +1798,9 @@ nextChar:
           ) 
         )
     {
+      if (c=='\t') c=' ';
       if (c=='*' || c=='&' || c=='@' || c=='$')
-      {  
+      {
         //uint rl=result.length();
         uint rl=growBuf.getPos();
         if ((rl>0 && (isId(growBuf.at(rl-1)) || growBuf.at(rl-1)=='>')) &&
@@ -1827,8 +1828,8 @@ nextChar:
       }
     }
   }
-  //printf("removeRedundantWhiteSpace(`%s')=`%s'\n",s.data(),result.data());
   growBuf.addChar(0);
+  //printf("removeRedundantWhiteSpace(`%s')=`%s'\n",s.data(),growBuf.get());
   //result.resize(resultPos);
   return growBuf.get();
 }