diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-19 18:14:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 13:21:22 +0100 |
| commit | d175f79d53d313caf26aab403aefab6a975f50f3 (patch) | |
| tree | 49c32bd0bfc82800f054a970488eddba01fc3723 | |
| parent | cb6a5bfda534870e064b4a34a254a5c383af073d (diff) | |
All QWindow properties that have "window" in them have been renamed.
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.
Change-Id: I2903a7404a738ae651ba07d4bdc003520473bd80
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | examples/video/qmlvideo/main.cpp | 2 | ||||
| -rw-r--r-- | examples/video/qmlvideofx/main.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/video/qmlvideo/main.cpp b/examples/video/qmlvideo/main.cpp index 469a34deb..149fc7a85 100644 --- a/examples/video/qmlvideo/main.cpp +++ b/examples/video/qmlvideo/main.cpp @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) QmlApplicationViewer viewer; - viewer.requestWindowOrientation(Qt::LandscapeOrientation); + viewer.requestOrientation(Qt::LandscapeOrientation); viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml")); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("source1", url1); diff --git a/examples/video/qmlvideofx/main.cpp b/examples/video/qmlvideofx/main.cpp index 54b7a78b0..dff51776a 100644 --- a/examples/video/qmlvideofx/main.cpp +++ b/examples/video/qmlvideofx/main.cpp @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) QmlApplicationViewer viewer; - viewer.requestWindowOrientation(Qt::LandscapeOrientation); + viewer.requestOrientation(Qt::LandscapeOrientation); viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("fileName", fileName); @@ -129,8 +129,8 @@ int main(int argc, char *argv[]) videoPath = moviesLocation.first(); viewer.rootContext()->setContextProperty("videoPath", videoPath); - viewer.setWindowTitle("qmlvideofx"); - viewer.setWindowFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | + viewer.setTitle("qmlvideofx"); + viewer.setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); viewer.setMinimumSize(QSize(600, 400)); |