diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 02:23:58 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 02:23:58 +0000 |
| commit | 880d042b2902fae8007f202dd35ad9330499867b (patch) | |
| tree | 147e998bedff702929218761fb662344672da053 | |
| parent | c625fb33d2ad82ecfe512326b53bb9abf10e9036 (diff) | |
| download | koffice-880d042b2902fae8007f202dd35ad9330499867b.tar.gz koffice-880d042b2902fae8007f202dd35ad9330499867b.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.in | 2 | ||||
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp | 2 |
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(); } |