summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kword/mailmerge/configure.in.in2
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kword/mailmerge/configure.in.in b/kword/mailmerge/configure.in.in
index 9353bafd..993c89d2 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 <qglobal.h>
+#include <tqglobal.h>
],
[
#ifdef QT_NO_SQL
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 4476b4d3..4083c1e1 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<TQWidget*>(tqparent()));
+ KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(tqparent()));
f->exec();
}