From 032f0f673308d30e4e718250e4668834037186a1 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@digia.com>
Date: Fri, 8 Aug 2014 13:06:00 +0200
Subject: [PATCH] Migrate to QSurfaceFormat::setDefaultFormat()
setDefaultFormat() is being moved form QQuickWindow to QSurfaceFormat.
Change-Id: Id76c2c332c837e2e988a2e8f4da2975065938e32
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
---
examples/quick/controls/gallery/src/main.cpp | 4 ++--
examples/quick/dialogs/systemdialogs/main.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/quick/controls/gallery/src/main.cpp b/examples/quick/controls/gallery/src/main.cpp
index b0d12b85f..8971aa153 100644
--- a/examples/quick/controls/gallery/src/main.cpp
+++ b/examples/quick/controls/gallery/src/main.cpp
@@ -47,10 +47,10 @@ int main(int argc, char *argv[])
{
QtQuickControlsApplication app(argc, argv);
if (QCoreApplication::arguments().contains(QLatin1String("--coreprofile"))) {
- QSurfaceFormat fmt = QQuickWindow::defaultFormat();
+ QSurfaceFormat fmt;
fmt.setVersion(4, 4);
fmt.setProfile(QSurfaceFormat::CoreProfile);
- QQuickWindow::setDefaultFormat(fmt);
+ QSurfaceFormat::setDefaultFormat(fmt);
}
QQmlApplicationEngine engine(QUrl("qrc:/main.qml"));
return app.exec();
diff --git a/examples/quick/dialogs/systemdialogs/main.cpp b/examples/quick/dialogs/systemdialogs/main.cpp
index 6d0fef3cd..d7bf3849e 100644
--- a/examples/quick/dialogs/systemdialogs/main.cpp
+++ b/examples/quick/dialogs/systemdialogs/main.cpp
@@ -47,10 +47,10 @@ int main(int argc, char *argv[])
{
QtQuickControlsApplication app(argc, argv);
if (QCoreApplication::arguments().contains(QLatin1String("--coreprofile"))) {
- QSurfaceFormat fmt = QQuickWindow::defaultFormat();
+ QSurfaceFormat fmt;
fmt.setVersion(4, 4);
fmt.setProfile(QSurfaceFormat::CoreProfile);
- QQuickWindow::setDefaultFormat(fmt);
+ QSurfaceFormat::setDefaultFormat(fmt);
}
QQmlApplicationEngine engine(QUrl("qrc:/dialogs/systemdialogs/systemdialogs.qml"));
return app.exec();
--
GitLab