summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-08-11 12:21:55 +0200
committerPaul Lemire <paul.lemire@kdab.com>2016-08-11 20:18:34 +0000
commitdc478967e91a0b39f1262a35de1c51f2c529fba6 (patch)
tree0b774985cc6b1662be05f6ba3760d5224222bebc
parent600e67c2836aae5dcd22948e657fc9a6c5c068ee (diff)
Qt3DWindow rename defaultFramegraph to defaultFrameGraph
For coherency with other function names. This kind of API change is allowed since Qt3DWindow is in the Extras module which is still in tech preview for 5.7 Change-Id: Ic67f96cfb2dfcb3b2d724c97f2cf472bfaf40a07 Task-number: QTBUG-54841 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--examples/qt3d/basicshapes-cpp/main.cpp2
-rw-r--r--src/extras/defaults/qt3dwindow.cpp2
-rw-r--r--src/extras/defaults/qt3dwindow.h2
-rw-r--r--tests/manual/assimp-cpp/main.cpp2
-rw-r--r--tests/manual/bigscene-cpp/main.cpp2
-rw-r--r--tests/manual/custom-mesh-cpp/main.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index 301aabb66..b4b01ff30 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
{
QApplication app(argc, argv);
Qt3DExtras::Qt3DWindow *view = new Qt3DExtras::Qt3DWindow();
- view->defaultFramegraph()->setClearColor(QColor(QRgb(0x4d4d4f)));
+ view->defaultFrameGraph()->setClearColor(QColor(QRgb(0x4d4d4f)));
QWidget *container = QWidget::createWindowContainer(view);
QSize screenSize = view->screen()->size();
container->setMinimumSize(QSize(200, 100));
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp
index 782be9037..ab0b0e400 100644
--- a/src/extras/defaults/qt3dwindow.cpp
+++ b/src/extras/defaults/qt3dwindow.cpp
@@ -144,7 +144,7 @@ Qt3DRender::QFrameGraphNode *Qt3DWindow::activeFrameGraph() const
return m_renderSettings->activeFrameGraph();
}
-Qt3DExtras::QForwardRenderer *Qt3DWindow::defaultFramegraph() const
+Qt3DExtras::QForwardRenderer *Qt3DWindow::defaultFrameGraph() const
{
return m_forwardRenderer;
}
diff --git a/src/extras/defaults/qt3dwindow.h b/src/extras/defaults/qt3dwindow.h
index 1d73966de..109e1be75 100644
--- a/src/extras/defaults/qt3dwindow.h
+++ b/src/extras/defaults/qt3dwindow.h
@@ -98,7 +98,7 @@ public:
void setActiveFrameGraph(Qt3DRender::QFrameGraphNode *activeFrameGraph);
Qt3DRender::QFrameGraphNode *activeFrameGraph() const;
- Qt3DExtras::QForwardRenderer *defaultFramegraph() const;
+ Qt3DExtras::QForwardRenderer *defaultFrameGraph() const;
Qt3DRender::QCamera *camera() const;
diff --git a/tests/manual/assimp-cpp/main.cpp b/tests/manual/assimp-cpp/main.cpp
index 9701cb66a..06e0907be 100644
--- a/tests/manual/assimp-cpp/main.cpp
+++ b/tests/manual/assimp-cpp/main.cpp
@@ -118,7 +118,7 @@ int main(int ac, char **av)
{
QApplication app(ac, av);
Qt3DExtras::Qt3DWindow view;
- view.defaultFramegraph()->setClearColor(Qt::black);
+ view.defaultFrameGraph()->setClearColor(Qt::black);
// Root entity
Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity();
diff --git a/tests/manual/bigscene-cpp/main.cpp b/tests/manual/bigscene-cpp/main.cpp
index 95b198f58..ebbd499f3 100644
--- a/tests/manual/bigscene-cpp/main.cpp
+++ b/tests/manual/bigscene-cpp/main.cpp
@@ -77,7 +77,7 @@ int main(int ac, char **av)
{
QGuiApplication app(ac, av);
Qt3DExtras::Qt3DWindow view;
- view.defaultFramegraph()->setClearColor(Qt::black);
+ view.defaultFrameGraph()->setClearColor(Qt::black);
QEntity *root = new QEntity();
diff --git a/tests/manual/custom-mesh-cpp/main.cpp b/tests/manual/custom-mesh-cpp/main.cpp
index 1544f3d01..c11c98ea6 100644
--- a/tests/manual/custom-mesh-cpp/main.cpp
+++ b/tests/manual/custom-mesh-cpp/main.cpp
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
{
QGuiApplication app(argc, argv);
Qt3DExtras::Qt3DWindow view;
- view.defaultFramegraph()->setClearColor(QColor::fromRgbF(0.0, 0.5, 1.0, 1.0));
+ view.defaultFrameGraph()->setClearColor(QColor::fromRgbF(0.0, 0.5, 1.0, 1.0));
// Root entity
Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();