diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kresources/scalix/kcal | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/scalix/kcal')
-rw-r--r-- | kresources/scalix/kcal/resourcescalix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index 8c84977a8..a67585ee0 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr } else if ( result == 0 ) { // take both localIncidence = local->clone(); localIncidence->recreate(); - localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) ); + localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) ); addedIncidence = inc; } bool silent = mSilent; |