diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
commit | 099f466847039954c581030c2a5aa2bfce08e0eb (patch) | |
tree | 194a94d15a68b0c38d2d45c12275afb2c91b9831 /examples/qt3d/planets-qml/Planet.qml | |
parent | 7bbd402770fa27f944840c95b6a3c6121883bc58 (diff) | |
parent | b71f09d143002f15abfd4a407651544942a75c44 (diff) |
Merge branch '5.5.0' into 5.5
Conflicts:
src/input/qkeyboardcontroller.cpp
Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
Diffstat (limited to 'examples/qt3d/planets-qml/Planet.qml')
-rw-r--r-- | examples/qt3d/planets-qml/Planet.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/qt3d/planets-qml/Planet.qml b/examples/qt3d/planets-qml/Planet.qml index 005312b5d..4381ebdb1 100644 --- a/examples/qt3d/planets-qml/Planet.qml +++ b/examples/qt3d/planets-qml/Planet.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 SphereMesh { property real r: 0 |