The CMAKE_AUTOMOC feature is strict about the name of moc includes,
and these ones do not match what they should. They are also unnecessary.
CMAKE_AUTOMOC creates a separate file concatenating the moc files
per-target.
Merged revisions 1142156-1142158,1142169,1142180,1142184,1142224,1142244,1142319,1142374,1142387-1142388,1142391,1142398-1142399,1142401,1142407,1142412,1142414,1142416-1142417,1142423,1142448,1142455,1142567-1142568,1142572 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1142156 | vkrause | 2010-06-24 10:48:55 +0200 (Thu, 24 Jun 2010) | 4 lines
While I'm at it, add a unit test for bug 238996, works fine.
BUG: 238996
................
r1142157 | ervin | 2010-06-24 10:58:24 +0200 (Thu, 24 Jun 2010) | 5 lines
Make sure the SessionPool is more aggressive at getting a password from
the user and make another connection attempt.
Adjust the DummyPasswordRequester to make it possible to write unit
tests with failed attempts at getting a valid password.
................
r1142158 | ervin | 2010-06-24 11:00:15 +0200 (Thu, 24 Jun 2010) | 8 lines
Adjusting so that the SettingsPasswordRequester can spawn a
configuration dialog without triggering extra behavior on the resource
(like emitting signal, or triggering a reconnect).
Also make the error handling on the session pool connection more
explicit about the different possible cases.
................
r1142169 | vkrause | 2010-06-24 11:30:17 +0200 (Thu, 24 Jun 2010) | 2 lines
Add (currently failing) unit test for Horde-generated events.
................
r1142180 | mlaurent | 2010-06-24 12:02:25 +0200 (Thu, 24 Jun 2010) | 2 lines
not necessary done in kmkernel
................
r1142184 | mlaurent | 2010-06-24 12:08:26 +0200 (Thu, 24 Jun 2010) | 2 lines
not necessary to test
................
r1142224 | lfranchi | 2010-06-24 14:21:58 +0200 (Thu, 24 Jun 2010) | 2 lines
Fix sending in all formats when Any is chosen
................
r1142244 | mlaurent | 2010-06-24 15:38:17 +0200 (Thu, 24 Jun 2010) | 2 lines
Don't show unsubscribed collection
................
r1142319 | mlaurent | 2010-06-24 18:48:06 +0200 (Thu, 24 Jun 2010) | 2 lines
Fix enable/disable expirydialogbox
................
r1142374 | djarvie | 2010-06-24 20:53:01 +0200 (Thu, 24 Jun 2010) | 2 lines
Add CalEvent::mimeTypes() method
................
r1142387 | lfranchi | 2010-06-24 21:47:49 +0200 (Thu, 24 Jun 2010) | 2 lines
Only update if body part has been changed---avoids flicker on reading new messages that are marked as read as well as being decrypted/verified.
................
r1142388 | lfranchi | 2010-06-24 21:48:40 +0200 (Thu, 24 Jun 2010) | 2 lines
Workaround KMime unsymmetric parsing/assembling, by only sending headers of ItemModifyJob. Should fix duplication issues with messages.
................
r1142391 | smartins | 2010-06-24 21:59:47 +0200 (Thu, 24 Jun 2010) | 13 lines
SVN_SILENT:
Blocked revisions 1142390 via svnmerge
........
r1142390 | smartins | 2010-06-24 20:56:49 +0100 (Thu, 24 Jun 2010) | 6 lines
SVN_SILENT:
Add brackets to avoid "ambiguous else" compiler warning.
MERGE: none
........
................
r1142398 | vkrause | 2010-06-24 22:41:39 +0200 (Thu, 24 Jun 2010) | 4 lines
Add a command line option to connect to an Akonadi remote debugging
server, much more convenient than setting the corresponding environment
variables manually.
................
r1142399 | winterz | 2010-06-24 22:41:48 +0200 (Thu, 24 Jun 2010) | 9 lines
port forward SVN commit 1106762 by winterz from e35:
fix a crash when deleting Notes (journals) that don't exist in the local
calendar but might exist in the Kolab resource.
kolab/issue3599
MERGE: 4.4
................
r1142401 | smartins | 2010-06-24 22:43:18 +0200 (Thu, 24 Jun 2010) | 13 lines
SVN_SILENT:
Blocked revisions 1142386 via svnmerge
........
r1142386 | smartins | 2010-06-24 20:46:27 +0100 (Thu, 24 Jun 2010) | 6 lines
Don't use a QCString for storing binary data. Fixes attachment corruption.
Fixed kolab/issue4410
MERGE: trunk, 4.4
........
................
r1142407 | winterz | 2010-06-24 22:52:11 +0200 (Thu, 24 Jun 2010) | 14 lines
SVN_SILENT:
Recorded merge of revisions 1106762 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1106762 | winterz | 2010-03-23 17:49:57 -0400 (Tue, 23 Mar 2010) | 7 lines
fix a crash when deleting Notes (journals) that don't exist in the local
calendar but might exist in the Kolab resource.
kolab/issue3599
MERGE: trunk,4.4
........
................
r1142412 | winterz | 2010-06-24 23:25:22 +0200 (Thu, 24 Jun 2010) | 9 lines
merge forward SVN commit 1106985 by winterz from e35:
handle all sorts of problems with adding notes that might occur when
using the Kolab Notes resource.
kolab/issue3106, kolab/issue3469
MERGE: 4.4
................
r1142414 | winterz | 2010-06-24 23:26:42 +0200 (Thu, 24 Jun 2010) | 14 lines
SVN_SILENT:
Recorded merge of revisions 1106985 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1106985 | winterz | 2010-03-24 08:56:18 -0400 (Wed, 24 Mar 2010) | 6 lines
handle all sorts of problems with adding notes that might occur when
using the Kolab Notes resource.
kolab/issue3106, kolab/issue3469
MERGE: trunk,4.4
........
................
r1142416 | winterz | 2010-06-24 23:23:06 +0200 (Thu, 24 Jun 2010) | 7 lines
merge forward SVN commit 1107007 by winterz from e35:
make sure not to re-load resources that are already open (and presumably loaded)
part of the kolab/issue3106 fix
MERGE: 4.4
................
r1142417 | winterz | 2010-06-24 23:33:30 +0200 (Thu, 24 Jun 2010) | 12 lines
SVN_SILENT:
Recorded merge of revisions 1107007 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1107007 | winterz | 2010-03-24 10:47:19 -0400 (Wed, 24 Mar 2010) | 4 lines
make sure not to re-load resources that are already open (and presumably loaded)
part of the kolab/issue3106 fix
MERGE: trunk,4.4
........
................
r1142423 | lfranchi | 2010-06-25 00:00:53 +0200 (Fri, 25 Jun 2010) | 2 lines
Don't do crypto operations on attachments when autosaving, which crashes. Still requires code to save the non-default attachment crypto settings if they exist.
................
r1142448 | stefanek | 2010-06-25 04:16:40 +0200 (Fri, 25 Jun 2010) | 9 lines
When a rowsRemoved() signal is received in the middle
of a fill job, and the removed rows cover the job entirely
don't delete the job but make it skip directly to pass 2.
Fixes some crashes related to dangling pointers left
in this particular case.
BUG: 233397
................
r1142455 | stefanek | 2010-06-25 05:21:55 +0200 (Fri, 25 Jun 2010) | 5 lines
Cache the value of hasAnnotation() as it's called
by the delegate in the painting operations and it
causes a sync dbus call to be made.
................
r1142567 | tmcguire | 2010-06-25 09:27:40 +0200 (Fri, 25 Jun 2010) | 4 lines
Invalidate the annotation cache when the annotation was changed.
Now using "Add Note" in KMail immediatley updates the annotation icon
again.
................
r1142568 | tmcguire | 2010-06-25 09:27:42 +0200 (Fri, 25 Jun 2010) | 1 line
warning--
................
r1142572 | vkrause | 2010-06-25 09:44:49 +0200 (Fri, 25 Jun 2010) | 2 lines
remove usage warning
................
svn path=/branches/work/komo/kdepim/; revision=1142578
Merged revisions 1133254,1133258,1133261,1133263,1133265,1133285-1133286,1133296-1133297,1133299-1133301,1133308,1133312-1133313,1133315,1133317,1133321,1133323,1133326-1133327,1133329-1133330,1133338,1133348,1133356,1133359,1133362,1133377-1133379,1133388-1133393,1133397,1133399,1133404,1133407-1133409,1133419-1133420,1133424,1133427,1133429,1133467,1133471,1133476,1133530,1133535 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1133254 | smartins | 2010-06-01 12:27:59 +0200 (Tue, 01 Jun 2010) | 4 lines
Make reminders work for to-dos too.
CCBUG: 230474
................
r1133258 | mlaurent | 2010-06-01 12:37:12 +0200 (Tue, 01 Jun 2010) | 2 lines
migrate "MessageListView::StorageModelThemes" too
................
r1133261 | mlaurent | 2010-06-01 13:02:57 +0200 (Tue, 01 Jun 2010) | 2 lines
Migrate folder icons (needs more tests)
................
r1133263 | mlaurent | 2010-06-01 13:08:07 +0200 (Tue, 01 Jun 2010) | 2 lines
Done
................
r1133265 | mlaurent | 2010-06-01 13:19:51 +0200 (Tue, 01 Jun 2010) | 2 lines
Migrate MessageListView::StorageModelAggregations too
................
r1133285 | mlaurent | 2010-06-01 14:44:08 +0200 (Tue, 01 Jun 2010) | 2 lines
Start to migrate folder view
................
r1133286 | mlaurent | 2010-06-01 14:48:17 +0200 (Tue, 01 Jun 2010) | 2 lines
not necessary now
................
r1133296 | krake | 2010-06-01 15:02:25 +0200 (Tue, 01 Jun 2010) | 2 lines
Only attempt delete from store when that settings is actually enabled
................
r1133297 | tmcguire | 2010-06-01 15:09:18 +0200 (Tue, 01 Jun 2010) | 18 lines
No such file here.
SVN_SILENT:
Blocked revisions 1131606 via svnmerge
........
r1131606 | tmcguire | 2010-05-28 16:19:02 +0200 (Fri, 28 May 2010) | 10 lines
Fix parsing of dist list entries without a UID, which is the
case for all dist list entries on Kolab dist lists.
Now I can see dist list members for dist lists saved on
Kolab again.
How did that ever work??
MERGE: trunk? Needs to be checked
........
................
r1133299 | mlaurent | 2010-06-01 15:10:36 +0200 (Tue, 01 Jun 2010) | 3 lines
FolderView->CollectionView better name.
Migration done in kmail-migration (will commite it soon)
................
r1133300 | mlaurent | 2010-06-01 15:12:32 +0200 (Tue, 01 Jun 2010) | 2 lines
migrate Enable/height favorite collection view
................
r1133301 | mlaurent | 2010-06-01 15:15:03 +0200 (Tue, 01 Jun 2010) | 2 lines
Done
................
r1133308 | smartins | 2010-06-01 15:27:33 +0200 (Tue, 01 Jun 2010) | 4 lines
To show up in side by side view, the collection must at least support the event mime type.
This is the 4.4 behaviour.
................
r1133312 | mlaurent | 2010-06-01 15:35:58 +0200 (Tue, 01 Jun 2010) | 2 lines
Bye bye old option
................
r1133313 | tmcguire | 2010-06-01 15:36:05 +0200 (Tue, 01 Jun 2010) | 11 lines
Don't close the distribution list dialog if the item creation failed.
SVN_MERGE
This is a merge of:
r1131609 | tmcguire | 2010-05-28 16:22:52 +0200 (Fri, 28 May 2010) | 5 lines
Changed paths:
M /branches/kdepim/enterprise/kdepim/kmail/distributionlistdialog.cpp
Only close the dialog when the dist list was saved ok.
Part of kolab/issue4281
................
r1133315 | smartins | 2010-06-01 15:37:49 +0200 (Tue, 01 Jun 2010) | 6 lines
To show up in timeline view, the collection must at least support the event mime type.
This is the 4.4 behaviour.
BUG: 232166
................
r1133317 | tmcguire | 2010-06-01 15:38:42 +0200 (Tue, 01 Jun 2010) | 14 lines
Merged with r1133313
SVN_SILENT:
Recorded merge of revisions 1131609 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1131609 | tmcguire | 2010-05-28 16:22:52 +0200 (Fri, 28 May 2010) | 5 lines
Only close the dialog when the dist list was saved ok.
Part of kolab/issue4281
MERGE: trunk?
........
................
r1133321 | tmcguire | 2010-06-01 15:40:48 +0200 (Tue, 01 Jun 2010) | 17 lines
Not needed here.
SVN_SILENT:
Blocked revisions 1131612 via svnmerge
........
r1131612 | tmcguire | 2010-05-28 16:25:06 +0200 (Fri, 28 May 2010) | 9 lines
When the resource is locked, also cache if the user cancels
the subresource selection dialog.
This fixes multiple dialogs appearing when the user saves a
dist list but cancels the subresource dialog.
kolab/issue4281
MERGE: trunk?
........
................
r1133323 | mlaurent | 2010-06-01 15:44:02 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove old options (not necessary with akonadi)
................
r1133326 | tmcguire | 2010-06-01 15:46:24 +0200 (Tue, 01 Jun 2010) | 13 lines
SVN_SILENT:
Blocked revisions 1131621 via svnmerge
........
r1131621 | tmcguire | 2010-05-28 17:04:06 +0200 (Fri, 28 May 2010) | 6 lines
Prevent multiple subresource dialogs in KAddressbook's dist list
editor as well.
kolab/issue4281
MERGE: trunk?
........
................
r1133327 | tmcguire | 2010-06-01 15:49:40 +0200 (Tue, 01 Jun 2010) | 18 lines
SVN_SILENT:
Blocked revisions 1133221-1133222 via svnmerge
........
r1133221 | tmcguire | 2010-06-01 11:01:11 +0200 (Tue, 01 Jun 2010) | 4 lines
Factor out the resource selection into a seperate method.
MERGE: can probably be blocked, I need to check.
........
r1133222 | tmcguire | 2010-06-01 11:02:32 +0200 (Tue, 01 Jun 2010) | 5 lines
Ask the user in which resource the dist list should be saved
kolab/issue4400
MERGE: can probably be blocked after checking
........
................
r1133329 | mlaurent | 2010-06-01 15:54:58 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove not necessary entry
................
r1133330 | smartins | 2010-06-01 16:01:09 +0200 (Tue, 01 Jun 2010) | 4 lines
SVN_SILENT:
Remove trailing spaces.
................
r1133338 | smartins | 2010-06-01 16:24:28 +0200 (Tue, 01 Jun 2010) | 2 lines
Add support for kcal filters, it's what we still use for filtering for now.
................
r1133348 | krake | 2010-06-01 16:54:44 +0200 (Tue, 01 Jun 2010) | 3 lines
Import metadata of remaining DIMAP cache items (import failed, or kept explicitly) into a local maildir resource working on the respective DIMAP directory.
................
r1133356 | krake | 2010-06-01 17:18:59 +0200 (Tue, 01 Jun 2010) | 2 lines
Copy "*.rc" files from KMail 1 "appdata"
................
r1133359 | mlaurent | 2010-06-01 17:27:43 +0200 (Tue, 01 Jun 2010) | 2 lines
Bye bye some old key
................
r1133362 | mlaurent | 2010-06-01 17:38:52 +0200 (Tue, 01 Jun 2010) | 2 lines
Migrate "Composer/previous-fcc"
................
r1133377 | krake | 2010-06-01 17:46:27 +0200 (Tue, 01 Jun 2010) | 2 lines
Migrate POP3 filter configs
................
r1133378 | mlaurent | 2010-06-01 17:59:39 +0200 (Tue, 01 Jun 2010) | 2 lines
Migrate "FolderSelectionDialog/LastSelectedFolder" not used in kmail2 yet (need to implement it soon)
................
r1133379 | mlaurent | 2010-06-01 18:00:49 +0200 (Tue, 01 Jun 2010) | 2 lines
Delete "TreeWidgetLayout" entry
................
r1133388 | tmcguire | 2010-06-01 18:18:05 +0200 (Tue, 01 Jun 2010) | 1 line
Fix crash.
................
r1133389 | tmcguire | 2010-06-01 18:18:26 +0200 (Tue, 01 Jun 2010) | 1 line
Add support for completing contact groups.
................
r1133390 | tmcguire | 2010-06-01 18:18:28 +0200 (Tue, 01 Jun 2010) | 1 line
Remove some code duplication and unused includes.
................
r1133391 | mlaurent | 2010-06-01 18:18:33 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove some old groups which are not necessary in kmail2
................
r1133392 | mlaurent | 2010-06-01 18:25:26 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove other account
................
r1133393 | krake | 2010-06-01 18:25:56 +0200 (Tue, 01 Jun 2010) | 2 lines
The top level folder can actually only contain collections, no items since it represents the IMAP accounts "root" folder
................
r1133397 | smartins | 2010-06-01 18:36:19 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove uneeded signal
................
r1133399 | mlaurent | 2010-06-01 18:37:36 +0200 (Tue, 01 Jun 2010) | 3 lines
not necessary to delete old group when we look at all folder.
Delete them when we start to migrate
................
r1133404 | mlaurent | 2010-06-01 19:05:41 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove old entry
................
r1133407 | smartins | 2010-06-01 19:18:57 +0200 (Tue, 01 Jun 2010) | 4 lines
Filters working in month view.
BUG: 234492
................
r1133408 | mlaurent | 2010-06-01 19:19:14 +0200 (Tue, 01 Jun 2010) | 2 lines
Remove old entry
................
r1133409 | smartins | 2010-06-01 19:28:23 +0200 (Tue, 01 Jun 2010) | 2 lines
Turn on dynamic filtering so items disappear immediately when filtered.
................
r1133419 | krake | 2010-06-01 19:51:49 +0200 (Tue, 01 Jun 2010) | 2 lines
Fixed typo in message and message parameter
................
r1133420 | krake | 2010-06-01 19:52:21 +0200 (Tue, 01 Jun 2010) | 2 lines
Fix waiting for a broken resource
................
r1133424 | mlaurent | 2010-06-01 20:01:28 +0200 (Tue, 01 Jun 2010) | 2 lines
Fix layout warning
................
r1133427 | krake | 2010-06-01 20:03:40 +0200 (Tue, 01 Jun 2010) | 2 lines
Fix check for unmigrated DIMAP accounts
................
r1133429 | smartins | 2010-06-01 20:04:56 +0200 (Tue, 01 Jun 2010) | 2 lines
Don't allow two delete jobs for the same incidence, can happen if the user is fast.
................
r1133467 | tmcguire | 2010-06-01 21:43:15 +0200 (Tue, 01 Jun 2010) | 4 lines
Improve crash handling code a bit.
Set the crash handler in a central place (KMKernel), and use KCrash
in a more appropriate way.
................
r1133471 | mlaurent | 2010-06-01 21:46:44 +0200 (Tue, 01 Jun 2010) | 2 lines
Fix compile
................
r1133476 | tmcguire | 2010-06-01 22:02:11 +0200 (Tue, 01 Jun 2010) | 1 line
Enable the composer again in case composing failed.
................
r1133530 | lfranchi | 2010-06-02 00:00:55 +0200 (Wed, 02 Jun 2010) | 3 lines
fix specialcollection folder functions in kmkernel
statistics from them are now valid at all times, not just on first run
................
r1133535 | lfranchi | 2010-06-02 00:05:28 +0200 (Wed, 02 Jun 2010) | 2 lines
Extend timer lag for action updates after collection changes. This gives time for the ETM to receive the newly updated items, otherwise we are in stale state until the user click on something else.
................
svn path=/branches/work/komo/kdepim/; revision=1133689
Montel Laurent
Christophe Giboudeaux
Stephen Kelly
Andras Mantia
Volker Krause