diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
| commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
| tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /vcs/subversion/svn_mergewidget.h | |
| parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
| download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip | |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs/subversion/svn_mergewidget.h')
| -rw-r--r-- | vcs/subversion/svn_mergewidget.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index abaaea88..da2a46dc 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -32,8 +32,9 @@ class KURL; class SvnMergeDialog : public SvnMergeOptionDialogBase { Q_OBJECT + TQ_OBJECT public: - SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); + SvnMergeDialog( const KURL &wcTarget, TQWidget *tqparent = NULL ); virtual ~SvnMergeDialog(); KURL source1(); |