diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-10-23 14:56:58 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-10-23 14:56:58 (GMT) |
commit | 7ee0143a417678f7108838230c5ada3bbd62c6cc (patch) | |
tree | 03af20be4eae77ea99fde0615d21cdd25517f5df /demos/qmediaplayer | |
parent | 8faa1dd4275fa06a54fc84f72f070d2028208fab (diff) | |
download | Qt-7ee0143a417678f7108838230c5ada3bbd62c6cc.zip Qt-7ee0143a417678f7108838230c5ada3bbd62c6cc.tar.gz Qt-7ee0143a417678f7108838230c5ada3bbd62c6cc.tar.bz2 |
Fix build caused by merge error.
Diffstat (limited to 'demos/qmediaplayer')
-rw-r--r-- | demos/qmediaplayer/mediaplayer.h | 1 |
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); |