Merge remote-tracking branch 'origin/master' into frameworks

Conflicts: kontact/plugins/planner/kcmplanner.desktop ktimetracker/ktimetracker_config_behavior.desktop ktimetracker/ktimetracker_config_display.desktop ktimetracker/ktimetracker_config_storage.desktop
12 years ago · 0369244ed0
parent d48f88a354 a2be120e35
commit 0369244ed0
1 changed files with 2 additions and 1 deletions
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@ -1262,7 +1262,8 @@ void KMMainWidget::slotItemMoved( const Akonadi::Item &item, const Akonadi::Coll
 //-------------------------------------------------------------------------
 void KMMainWidget::slotFocusQuickSearch()
 {
-    mMessagePane->focusQuickSearch();
+    const QString text = mMsgView ? mMsgView->copyText() : QString();
+    mMessagePane->focusQuickSearch(text);
 }

 //-------------------------------------------------------------------------