diff -Nurd -X.diff_ignore freeciv/INSTALL freeciv/INSTALL
--- freeciv/INSTALL	2012-07-08 01:23:21.000000000 +0300
+++ freeciv/INSTALL	2012-07-15 01:10:09.000000000 +0300
@@ -349,7 +349,7 @@
    Qt-client is written in C++, so you need appropriate compiler.
    In Freeciv development, g++ has been used.
 
- - QtCore & QtGui libraries and headers
+ - At least Qt 4.7 QtCore & QtGui libraries and headers
 
 
 2. Generating Makefiles
diff -Nurd -X.diff_ignore freeciv/m4/qt.m4 freeciv/m4/qt.m4
--- freeciv/m4/qt.m4	2012-02-26 21:58:13.000000000 +0200
+++ freeciv/m4/qt.m4	2012-07-15 01:15:40.000000000 +0300
@@ -60,8 +60,11 @@
 
   CPPFLAGS_SAVE="$CPPFLAGS"
   CPPFLAGS="${CPPFLAGS}${CPPFADD}"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <QApplication>]],
-[[QApplication app(0, 0);]])],
+
+  dnl QLineEdit::setPlaceHolderText() is new in Qt 4.7
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <QLineEdit>]],
+[[QLineEdit qle;
+qle.setPlaceholderText("conftest");]])],
     [qt_headers=yes
      FC_QT_CPPFLAGS="${FC_QT_CPPFLAGS}${CPPFADD}"])
   CPPFLAGS="$CPPFLAGS_SAVE"
@@ -80,8 +83,9 @@
   CPPFLAGS="$CPPFLAGS $FC_QT_CPPFLAGS"
   LIBS_SAVE="$LIBS"
   LIBS="${LIBS}${LIBSADD}"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QApplication>]],
-[[QApplication app(0, 0);]])],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QLineEdit>]],
+[[QLineEdit qle;
+qle.setPlaceholderText("conftest");]])],
 [qt_libs=yes
  FC_QT_LIBS="${FC_QT_LIBS}${LIBSADD}"])
  LIBS="$LIBS_SAVE"