diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-19 00:50:41 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-19 00:50:41 (GMT) |
| commit | c6048dcff55f4809d984e50ddadb38348cae72d3 (patch) | |
| tree | 303177ca86407a9faa2b284cd8ecaef3831e73b1 | |
| parent | 5c09309811c13fa360ba5e7b3173039da9c038f6 (diff) | |
| parent | 017cf88ef18cdbf5d302a658c625f605320005f8 (diff) | |
| download | Qt-c6048dcff55f4809d984e50ddadb38348cae72d3.zip Qt-c6048dcff55f4809d984e50ddadb38348cae72d3.tar.gz Qt-c6048dcff55f4809d984e50ddadb38348cae72d3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
| -rw-r--r-- | src/multimedia/mediaservices/base/qvideowidget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/mediaservices/base/qvideowidget.h b/src/multimedia/mediaservices/base/qvideowidget.h index 3722857..a21739a 100644 --- a/src/multimedia/mediaservices/base/qvideowidget.h +++ b/src/multimedia/mediaservices/base/qvideowidget.h @@ -121,7 +121,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_hueChanged(int)) Q_PRIVATE_SLOT(d_func(), void _q_saturationChanged(int)) Q_PRIVATE_SLOT(d_func(), void _q_fullScreenChanged(bool)) - Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged()); + Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged()) }; QT_END_NAMESPACE |