From c0fe2d62abe68de74de6b8bf91635c1cdaf5d239 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 18:35:45 +0000
Subject: reolved merge conflict

---
(limited to 'core/pim/osearch/doclnksearch.cpp')

diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 3428798..ef0e482 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -88,4 +88,6 @@ QPopupMenu* DocLnkSearch::popupMenu()
  		actionSearchInFiles->addTo( _popupMenu );
 	}
 	return _popupMenu;
+	(void) new DocLnkItem( this, (DocLnk*)rec );
+	_resultCount++;
 }
--
cgit v0.9.0.2