slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

All QWindow properties that have "window" in them have been renamed.

Browse Source 
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.

Change-Id: I2903a7404a738ae651ba07d4bdc003520473bd80
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
This commit is contained in:
Shawn Rutledge
2012-10-19 18:14:17 +02:00
committed by The Qt Project
parent cb6a5bfda5
commit d175f79d53
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/video/qmlvideo/main.cpp
View File

@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
QmlApplicationViewer viewer; QmlApplicationViewer viewer;
viewer.requestWindowOrientation(Qt::LandscapeOrientation); viewer.requestOrientation(Qt::LandscapeOrientation);
viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml")); viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml"));
QQuickItem *rootObject = viewer.rootObject(); QQuickItem *rootObject = viewer.rootObject();
rootObject->setProperty("source1", url1); rootObject->setProperty("source1", url1);

6
examples/video/qmlvideofx/main.cpp
View File

@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
QmlApplicationViewer viewer; QmlApplicationViewer viewer;
viewer.requestWindowOrientation(Qt::LandscapeOrientation); viewer.requestOrientation(Qt::LandscapeOrientation);
viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile); viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile);
QQuickItem *rootObject = viewer.rootObject(); QQuickItem *rootObject = viewer.rootObject();
rootObject->setProperty("fileName", fileName); rootObject->setProperty("fileName", fileName);
@@ -129,8 +129,8 @@ int main(int argc, char *argv[])
videoPath = moviesLocation.first(); videoPath = moviesLocation.first();
viewer.rootContext()->setContextProperty("videoPath", videoPath); viewer.rootContext()->setContextProperty("videoPath", videoPath);
viewer.setWindowTitle("qmlvideofx"); viewer.setTitle("qmlvideofx");
viewer.setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | viewer.setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint |
Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
viewer.setMinimumSize(QSize(600, 400)); viewer.setMinimumSize(QSize(600, 400));