From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: 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
---
 vcs/subversion/svn_mergewidget.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'vcs/subversion/svn_mergewidget.h')

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();
-- 
cgit v1.2.3