HomePhorge

SVN_MERGE
63f1629dc93fUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE

Merged revisions 1009577,1009582,1009610,1009620,1009682,1009755,1009799 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........

r1009577 | skelly | 2009-08-10 13:37:28 +0200 (Mon, 10 Aug 2009) | 3 lines

Fix entity tree listing when the root collection is shown.

Should fix KAddressBook

........

r1009582 | winterz | 2009-08-10 13:47:11 +0200 (Mon, 10 Aug 2009) | 2 lines

explict ctor

........

r1009610 | winterz | 2009-08-10 14:59:56 +0200 (Mon, 10 Aug 2009) | 2 lines

Small fixes to make Krazy happy.

........

r1009620 | vkrause | 2009-08-10 15:43:53 +0200 (Mon, 10 Aug 2009) | 2 lines

Client-side support for retrieving the ancestor chains of items.

........

r1009682 | cgiboudeaux | 2009-08-10 18:04:49 +0200 (Mon, 10 Aug 2009) | 1 line

Fix a source incompatible change introduced in r1009229.

........

r1009755 | pokrzywka | 2009-08-10 21:32:12 +0200 (Mon, 10 Aug 2009) | 3 lines

Fix the build with msvc, which compiles all templated functions for QList by default:
- const-correctness for the == operator
- provide a qHash function for toSet()

........

r1009799 | winterz | 2009-08-10 23:10:21 +0200 (Mon, 10 Aug 2009) | 6 lines

Put back HTMLExportSettings and include it in KOrganizer.
This is the correct thing to do.

However, for back compatibility provide the old HtmlExportSettings as well.
CCMAIL: montel@kde.org

........

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1009886

Event Timeline

Volker Krause <vkrause@kde.org> committed rKPL63f1629dc93f: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Aug 11 2009, 8:51 AM