diff --git a/kword/mailmerge/configure.in.in b/kword/mailmerge/configure.in.in index 9353bafd9..993c89d22 100644 --- a/kword/mailmerge/configure.in.in +++ b/kword/mailmerge/configure.in.in @@ -14,7 +14,7 @@ LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" CXXFLAGS="$CXXFLAGS -I$qt_includes $all_includes" AC_TRY_COMPILE([ -#include +#include ], [ #ifdef QT_NO_SQL diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 4476b4d33..4083c1e1a 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -206,7 +206,7 @@ void KWQtSqlDataSourceEditor::slotSetQuery() void KWQtSqlDataSourceEditor::editFilter() { - KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(static_cast(tqparent())); + KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(tqparent())); f->exec(); }