--- configure.orig	2014-08-22 08:43:05 UTC
+++ configure
@@ -363,25 +363,25 @@
     echo "  QTDIR environment variable not set!"
     printf "  Checking for Qt..."
     for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
-      if test -x "$d/bin/qmake"; then
+      if test -x "$d/bin/qmake-qt4"; then
         QTDIR=$d
         break 2
       fi
     done
   else
-    if test -e "$QTDIR/bin/qmake"; then
+    if test -e "$QTDIR/bin/qmake-qt4"; then
       printf "  Detected Qt via the QTDIR environment variable..."
     else
       printf "ERROR Detected Qt via the QTDIR environment variable..."
-      echo ", but $QTDIR/bin/qmake does not exist."
-      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
+      echo ", but $QTDIR/bin/qmake-qt4 does not exist."
+      echo "      Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
       exit 2
     fi
   fi
   if test -z "$QTDIR"; then
     echo "QTDIR not set and Qt not found at standard locations!"
     echo
-    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
+    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
     echo "check the Qt installation instructions!"
     exit 2
   fi
@@ -857,7 +857,7 @@
 fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF
-TMAKE_MOC = $QTDIR/bin/moc
+TMAKE_MOC = $QTDIR/bin/moc-qt4
 EOF
 fi
 
@@ -868,7 +868,7 @@
 EOF
 fi
 
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
 
 for i in $f_inmakefiles ; do
      SRC=$i
@@ -892,7 +892,6 @@
 #       fi
        echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
        echo "	\$(MAKE) -C qtools" >> $DST
-       echo "	\$(MAKE) -C libmd5" >> $DST
        echo "	\$(MAKE) -C vhdlparser" >> $DST
        echo "	\$(MAKE) -C src" >> $DST
 
@@ -932,7 +931,7 @@
 cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
 cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t
 
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
 
 for i in $f_inprofiles ; do
      SRC=$i
