Fix Qt4 koffice/kword/mailmerge/sql detection

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
13 years ago · 880d042b29
parent c625fb33d2
commit 880d042b29
2 changed files with 2 additions and 2 deletions
--- 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
--- 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();
 }