From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Fri, 30 Nov 2012 10:44:52 +0000 (+0100)
Subject: Remove the remaining usages of deprecated QWindow accessors
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=18f42ab9b5e5b7bd9bd324af4c2ac449a5c2107e;p=konrad%2Fqtdeclarative.git

Remove the remaining usages of deprecated QWindow accessors

Change-Id: I146e7b8e3ae0ee74f5f4e3ef85f59d50a639c0f5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---

diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 6a96395..6be10ad 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -312,7 +312,7 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD
             // an asynchronous test and we need to show the window
             // and wait for the first frame to be rendered
             // and then wait for quit indication.
-            view->setFramePos(QPoint(50, 50));
+            view->setFramePosition(QPoint(50, 50));
             if (view->size().isEmpty()) { // Avoid hangs with empty windows.
                 qWarning().nospace()
                     << "Test '" << QDir::toNativeSeparators(path) << "' has invalid size "
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 32bf32e..87a577b 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -503,7 +503,7 @@ int main(int argc, char ** argv)
                     window->setFormat(surfaceFormat);
                     window->setClearBeforeRendering(true);
                     window->setColor(QColor(Qt::transparent));
-                    window->setWindowFlags(Qt::FramelessWindowHint);
+                    window->setFlags(Qt::FramelessWindowHint);
                 }
 
                 if (options.fullscreen)