From 7ee0143a417678f7108838230c5ada3bbd62c6cc Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Fri, 23 Oct 2009 16:56:58 +0200
Subject: Fix build caused by merge error.

---
 demos/qmediaplayer/mediaplayer.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h
index f3af7cc..08db0e5 100644
--- a/demos/qmediaplayer/mediaplayer.h
+++ b/demos/qmediaplayer/mediaplayer.h
@@ -93,7 +93,6 @@ public slots:
     void playPause();
     void scaleChanged(QAction *);
     void aspectChanged(QAction *);
-    void hasVideoChanged(bool);
 
 private slots:
     void setAspect(int);
-- 
cgit v0.12