Commit by Christophe Giboudeaux on cmake-2.8.7-port :: rv1.7.2-47-g0ff4ce2 akonadi/server/ (3 files in 2 dirs): (link)

Merge branch 'master' into cmake-2.8.7-port

Commit by Christian Mollekopf on master :: rv1.7.2-39-gdeec1f8 akonadi/server/ (7 files in 4 dirs): (link)

Make the query string column wide enough for Sparql queries.

Ideally we would be using BLOB, but that is a bit of a pain to add (would require to alter the whole mapping of Qt-Datatypes, or use some magic value), and 32000 should be big enough for sane queries.
As an extra there is now a safety check for oversized queries, so we don't get truncated queries executed.

Commit by Christophe Giboudeaux on qt5-port :: rv1.7.2-65-gd0591c9 akonadi/ (7 files in 2 dirs): (link)

com.trolltech -> org.qtproject

Commit by Christophe Giboudeaux on qt5-port :: rv1.7.2-64-g3e6341f akonadi/CMakeLists.txt: (link)

Qt5DbusTools was merged into Qt5DbusMacros

Commit by Christophe Giboudeaux on qt5-port :: rv1.7.2-63-g4c21881 akonadi/ (7 files in 7 dirs): (link)

Use -fPIE where (and if) needed.

-fPIE becomes mandatory when Qt5 is configured with -reduce-relocations

Commit by Christophe Giboudeaux on qt5-port :: rv1.7.2-62-gf8a8f3a akonadi/CMakeLists.txt: (link)

Find Qt5Gui. Needed for setQuitOnLastWindowClosed(bool)

Commit by Christophe Giboudeaux on qt5-port :: rv1.7.2-61-g658c27f akonadi/CMakeLists.txt: (link)

Fix the buildsystem
If we don't explicitly find Qt5Core, Qt5CoreMacros is never loaded and Qt5DbusToolsMacros fails.

Commit by Volker Krause on master :: rv1.7.2-38-g6ddfed7 akonadi/server/src/storage/mysql-global.conf: (link)

Revert "Set the MySQL binlog format explicitly."

This reverts commit 8f6eb20aaa854224a6d4070ee2459290ec431576.

It turns out that MySQL <= 5.5 fails with a binlog_format specified,
but no binlog enabled (which we don't want to enabled). Further
research on why this was failing for a few people before showed
broken mysql.conf files that for some reason contained a section
that enabled the binlog explicitly. If that's more than a handfull
of people affected, we can add a filter in Akonadi that removes
those lines when assembling the config file.

Commit by Christophe Giboudeaux on qt5-port :: rv1.7.2-60-g6152216 akonadi/: (link)

Merge branch 'cmake-2.8.7-port' into qt5-port

Commit by Christophe Giboudeaux on cmake-2.8.7-port :: rv1.7.2-44-g482c6dd akonadi/server/src/akonadiconnection.cpp: (link)

Merge branch 'master' into cmake-2.8.7-port

Commit by Volker Krause on 1.7 :: rv1.7.2-1-g2ddfb99 akonadi/server/src/nepomuk/queryserviceclient.h: (link)

Build with Clang.

BUG: 297696

(cherry picked from commit 1ce93440f9dbfcd01a3f4c11119f120e82a7dfb2)

Commit by Volker Krause on master :: rv1.7.2-37-g8f6eb20 akonadi/server/src/storage/mysql-global.conf: (link)

Set the MySQL binlog format explicitly.

The combination of the transaction isolation level we use and the default
binlog format doesn't work. Newer MySQL versions (>= 5.5 apparently)
automatically switch to a supported format, older ones just fail.

We don't actually enable the binlog, nor do we need it, so I don't really
know why it's on for some users in the first place.

BUG: 295700

Commit by Christian Mollekopf on master :: rv1.7.2-36-g21c4978 akonadi/server/src/akonadiconnection.cpp: (link)

Check the actual id of the resource to decide if it is the owner.

Otherwise other resources, acting as client, are mistakenly detected as owner of the item.

Commit by Christian Mollekopf on 1.7 :: rv1.7.2-2-g4a2a24b akonadi/server/src/akonadiconnection.cpp: (link)

Check the actual id of the resource to decide if it is the owner.

Otherwise other resources, acting as client, are mistakenly detected as owner of the item.
(cherry picked from commit 21c49789128fcf56b01b5ba97d4830c7c837c6fb)

Commit by shaheed :: r1288489 akonadi/trunk/playground/pim/akonadi/exchange/ (2 files in 2 dirs): (link)

Whitespace and copyright fixes.

Commit by shaheed :: r1288039 akonadi/trunk/playground/pim/akonadi/exchange/calendar/excalresource.cpp: (link)

Only add a recurrence when we have one!

Commit by shaheed :: r1287865 akonadi/trunk/playground/pim/akonadi/exchange/calendar/ (excalresource.cpp excalresource.h): (link)

Fix the deadlock when we have more than one exception on a
recurrence.

Commit by Volker Krause on master :: rv1.7.2-35-g2552d4d akonadi/: (link)

Merge branch '1.7'

Conflicts:
CMakeLists.txt
Mainpage.dox

Commit by Volker Krause on 1.7 :: rv1.7.1-3-g1443369 akonadi/ (CMakeLists.txt Mainpage.dox NEWS): (link)

Prepare Akonadi 1.7.2 release.

Commit by Till Adam on 1.7 :: rv1.7.1-2-g1e1346c akonadi/server/src/ (nepomuksearch.cpp nepomuksearch.h): (link)

Avoid a nepomuk round trip by requesting the akonadi item id property manually in all cases.

Normally when a property is asked for as part of at sparql query, the
query engine should extract it from the string and supply it as a
property in the result object. This seems to not work at the moment, so
to make sure we actually get the akonadi item id back from searches, and
avoid having to roundtrip again to get them, let's add the property
request manually, like the stored searches code does.
(cherry picked from commit 37e6f51c6b6c6f0d74c66efbf771ace40e88cc98)