From kde-commits  Wed Nov 10 20:05:57 2010
From: Sebastian Trueg <sebastian () trueg ! de>
Date: Wed, 10 Nov 2010 20:05:57 +0000
To: kde-commits
Subject: playground/base/nepomuk-kde/backupsync3/gui/backup
Message-Id: <20101110200557.BB182AC89E () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128941959417293

SVN commit 1195315 by trueg:

paint simple selection

 M  +2 -1      mergeconflictdelegate.cpp  


--- trunk/playground/base/nepomuk-kde/backupsync3/gui/backup/mergeconflictdelegate.cpp #1195314:1195315
@@ -109,7 +109,8 @@
 {
     painter->save();
 
-    //painter->fillRect(option.rect, QColor(randomRgb(), randomRgb(), randomRgb()));
+    if(option.state & QStyle::State_Selected)
+        painter->fillRect(option.rect, option.palette.highlight());
 
     // draw label
     QFont font(option.font);