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

Merge branch 'master' into devel

parents 39bdafef 8cac977d

addon/doxywizard/inputstring.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+14 −6
Original line number Diff line number Diff line
@@ -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,9 +605,16 @@ 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
@@ -616,14 +624,14 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -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>

doc/translator.py

+2002 −2029

File changed.

Preview size limit exceeded, changes collapsed.

qtools/qstring.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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) ||