lp:~neon/akonadi/master
- Get this branch:
- bzr branch lp:~neon/akonadi/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/akonadi.
Last successful import was .
Recent revisions
- 2652. By David Faure
-
Replace assert with early return, in case the collection was deleted meanwhile.
Another comment in the same file says
// Do not assert on invalid collections, since a collection may be deleted
// in the meantime and deleted collections are invalid.
Therefore it looks like this is expected. - 2650. By Montel Laurent <email address hidden>
-
Merge remote-tracking branch 'origin/
Applications/ 16.04' - 2648. By Daniel Vrátil <email address hidden>
-
Fix SessionThread dtor timeout when destroying default Session
The default Session does not have any owner and is managed by QThreadStorage,
so it is only destroyed when QApplication is being destroyed. Because at
this point event loop is no longer running, SessionThread::doThreadQuit( )
is not invoked from SessionThread dtor and we hit the 10 seconds timeout.This affects especially unit-test which take less than second to execute,
but then get stuck for 10 seconds in the SessionThread dtor during
clean up.Since the new code relies on QCoreApplicatio
n::aboutToQuit( ) to destroy
the default Sessions while qApp is still running we had to adjust
AKONADITEST_MAIN() a little to start the QApplication event loop, because
otherwise the signal is not emitted.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)