I updated acinclude.m4.in for qt4 paths.
Started with src, but need to go now and just wanted to give you the work I
have done so far.
philipp
Index: src/adduserdlg.cpp
===================================================================
--- src/adduserdlg.cpp (revision 4733)
+++ src/adduserdlg.cpp (working copy)
@@ -21,14 +21,14 @@
#include "config.h"
#endif
-#include <qvalidator.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <q3frame.h>
-#include <qcombobox.h>
+#include <Qt/qvalidator.h>
+#include <Qt/qlabel.h>
+#include <Qt/qlineedit.h>
+#include <Qt/qcheckbox.h>
+#include <Qt/qpushbutton.h>
+#include <Qt/qlayout.h>
+#include <Qt/q3frame.h>
+#include <Qt/qcombobox.h>
#include "adduserdlg.h"
Index: src/adduserdlg.h
===================================================================
--- src/adduserdlg.h (revision 4733)
+++ src/adduserdlg.h (working copy)
@@ -22,7 +22,7 @@
#include "licqdialog.h"
//Added by qt3to4:
-#include <QLabel>
+#include <QtGui/QLabel>
class QPushButton;
class QLabel;
Index: src/licqdialog.h
===================================================================
--- src/licqdialog.h (revision 4733)
+++ src/licqdialog.h (working copy)
@@ -20,7 +20,7 @@
#ifndef LICQDIALOG_H
#define LICQDIALOG_H
-#include <qdialog.h>
+#include <Qt/qdialog.h>
// This is a wrapper for QDialog since Qt3 has broken XClassHints which are
// used by the WindowManager to decide how to decorate (or not) each window
Index: acinclude.m4.in
===================================================================
--- acinclude.m4.in (revision 4733)
+++ acinclude.m4.in (working copy)
@@ -28,8 +28,8 @@
dnl If you need to add extra directories to check, add them here.
if test -z "$ac_qt_libraries"; then
qt_library_dirs="\
- /usr/lib/qt3/lib64 \
- /usr/lib/qt3/lib \
+ /usr/lib/qt4/lib64 \
+ /usr/lib/qt4/lib \
/usr/lib64 \
/usr/lib \
/usr/local/lib64 \
@@ -128,10 +128,10 @@
dnl No they didn't, so lets look for them...
dnl If you need to add extra directories to check, add them here.
qt_include_dirs="\
- /usr/lib/qt3/include \
+ /usr/lib/qt4/include \
/usr/lib/qt/include \
/usr/include/qt \
- /usr/include/qt3 \
+ /usr/include/qt4 \
/usr/local/qt/include \
/usr/local/include/qt \
/usr/X11/include/qt \
@@ -142,7 +142,7 @@
/usr/X11/lib/qt/include"
if test -n "$QTDIR"; then
- qt_include_dirs="$QTDIR/include $QTDIR/include/qt $QTDIR/include/qt3
$qt_include_dirs"
+ qt_include_dirs="$QTDIR/include $QTDIR/include/qt $QTDIR/include/qt4
$qt_include_dirs"
fi
if test -n "$QTINC"; then
@@ -150,8 +150,8 @@
fi
for qt_dir in $qt_include_dirs; do
- if test -r "$qt_dir/qbig5codec.h"; then
- if test -r "$qt_dir/qtranslatordialog.h"; then
+ if test -r "$qt_dir/Qt/q3textedit.h"; then
+ if test -r "$qt_dir/Qt/qtranslatordialog.h"; then
AC_MSG_ERROR([
This is not Qt 3.x or later. Somebody cheated you.
@@ -202,7 +202,7 @@
MOC,
moc,
$QTDIR/bin/moc,
-
$QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH
+
$QTDIR/bin:/usr/lib/qt4/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt4/bin:$PATH
)
else
AC_MSG_CHECKING(for moc)
@@ -264,7 +264,7 @@
LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS"
AC_TRY_LINK([
- #include <qglobal.h>
+ #include <Qt/qglobal.h>
],
[
#if QT_VERSION < 0x030000
@@ -291,7 +291,7 @@
QT_LUPDATE,
lupdate,
echo,
-
$QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH)
+
$QTDIR/bin:/usr/lib/qt4/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt4/bin:$PATH)
if test "$QT_LUPDATE" = "echo"; then
echo "** lupdate could not be found. You will not be able to update the
translations."
@@ -306,7 +306,7 @@
QT_LRELEASE,
lrelease,
echo,
-
$QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH)
+
$QTDIR/bin:/usr/lib/qt4/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt4/bin:$PATH)
if test "$QT_LRELEASE" = "echo"; then
echo "** lrelease could not be found. You're losing the localisation."
