Qt/EPG: Display the short description and the long one when available.

(cherry picked from commit 3f7e57a4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/gui/qt4/dialogs/epg.cpp

@@ -96,12 +96,11 @@ void EpgDialog::showEvent( EPGEvent *event )
     QDateTime end = event->start.addSecs( event->duration );
     title->setText( event->start.toString( "hh:mm" ) + " - "
                     + end.toString( "hh:mm" ) + " : "
-                    + event->name );
+                    + event->name
+                    + ( event->shortDescription.isEmpty()
+                        ? "" : " - " + event->shortDescription ) );
 
-    if( !event->description.isEmpty() )
-        description->setText( event->description );
-    else
-        description->setText( event->shortDescription );
+    description->setText( event->description );
 }
 
 void EpgDialog::updateInfos()