summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-23 14:56:58 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-23 14:56:58 (GMT)
commit7ee0143a417678f7108838230c5ada3bbd62c6cc (patch)
tree03af20be4eae77ea99fde0615d21cdd25517f5df
parent8faa1dd4275fa06a54fc84f72f070d2028208fab (diff)
downloadQt-7ee0143a417678f7108838230c5ada3bbd62c6cc.zip
Qt-7ee0143a417678f7108838230c5ada3bbd62c6cc.tar.gz
Qt-7ee0143a417678f7108838230c5ada3bbd62c6cc.tar.bz2
Fix build caused by merge error.
-rw-r--r--demos/qmediaplayer/mediaplayer.h1
1 files changed, 0 insertions, 1 deletions
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);