--- a/qtmobility/src/multimedia/qvideowidget.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget.h Mon May 03 13:18:40 2010 +0300
@@ -56,16 +56,13 @@
Q_OBJECT
Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject)
Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged)
- Q_PROPERTY(AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode NOTIFY aspectRatioModeChanged)
+ Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode NOTIFY aspectRatioModeChanged)
Q_PROPERTY(int brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged)
Q_PROPERTY(int contrast READ contrast WRITE setContrast NOTIFY contrastChanged)
Q_PROPERTY(int hue READ hue WRITE setHue NOTIFY hueChanged)
Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
- Q_ENUMS(AspectRatio)
public:
- enum AspectRatioMode { IgnoreAspectRatio, KeepAspectRatio };
-
QVideoWidget(QWidget *parent = 0);
~QVideoWidget();
@@ -76,7 +73,7 @@
bool isFullScreen() const;
#endif
- AspectRatioMode aspectRatioMode() const;
+ Qt::AspectRatioMode aspectRatioMode() const;
int brightness() const;
int contrast() const;
@@ -87,7 +84,7 @@
public Q_SLOTS:
void setFullScreen(bool fullScreen);
- void setAspectRatioMode(QVideoWidget::AspectRatioMode mode);
+ void setAspectRatioMode(Qt::AspectRatioMode mode);
void setBrightness(int brightness);
void setContrast(int contrast);
void setHue(int hue);