diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-06 14:24:48 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-06 14:24:48 +0000 |
| commit | d01b296f5d3bf5bb5355a868c4f7eeba051c2d23 (patch) | |
| tree | ad83da26bdcf21bf686157bc773a237ec7a83da4 /examples | |
| parent | faa8fc18bfeca06de6c4a7bdbb14e1be9eb96f54 (diff) | |
| parent | f865508efd13cae9d09c425d0e419f81057f1948 (diff) | |
Merge branch '5.8' into 5.9
Conflicts:
src/core/nodes/qnode.cpp
Change-Id: Id989bec6c54eee94651906d44ece752c10b7d0d1
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/materials-cpp/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index 5ca6998e0..b788bff30 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -81,7 +81,6 @@ int main(int argc, char* argv[]) // Scene Camera Qt3DRender::QCamera *basicCamera = view.camera(); basicCamera->setProjectionType(Qt3DRender::QCameraLens::PerspectiveProjection); - basicCamera->setAspectRatio(view.width() / view.height()); basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f)); basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f)); basicCamera->setPosition(QVector3D(0.0f, 3.5f, 25.0f)); |