summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-28 02:23:58 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-28 02:23:58 +0000
commit880d042b2902fae8007f202dd35ad9330499867b (patch)
tree147e998bedff702929218761fb662344672da053
parentc625fb33d2ad82ecfe512326b53bb9abf10e9036 (diff)
downloadkoffice-880d042b.tar.gz
koffice-880d042b.zip
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
-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 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 <qglobal.h>
+#include <tqglobal.h>
],
[
#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<TQWidget*>(tqparent()));
+ KWQtSqlEasyFilter *f=new KWQtSqlEasyFilter(TQT_TQWIDGET(tqparent()));
f->exec();
}