diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-03 12:35:35 +0100 |
|---|---|---|
| committer | Robert Brock <robert.brock@kdab.com> | 2016-05-03 11:44:45 +0000 |
| commit | b9223b05abeb163b447067bfafc1797f3459389d (patch) | |
| tree | a16bb78e6505982f53eafc87bff8add1dbbbcdb4 /src/quick3d | |
| parent | a7cd21c42d70415fc6aded1f5ff32633ef42cb0c (diff) | |
Camera controller naming convention
Renamed the QOrbitControl to QOrbitCameraController
to be more in line with the FirstPerson version.
Change-Id: Ibf5fb0d3cc548b7dc25d56ea385a64c7a76770aa
Task-number: QTBUG-50660
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d')
| -rw-r--r-- | src/quick3d/imports/extras/defaults/defaults.pri | 2 | ||||
| -rw-r--r-- | src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml (renamed from src/quick3d/imports/extras/defaults/qml/OrbitController.qml) | 0 | ||||
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/extras/defaults/defaults.pri b/src/quick3d/imports/extras/defaults/defaults.pri index 249c9139b..28a1d1051 100644 --- a/src/quick3d/imports/extras/defaults/defaults.pri +++ b/src/quick3d/imports/extras/defaults/defaults.pri @@ -18,5 +18,5 @@ QML_FILES = \ $$PWD/qml/GoochMaterial.qml \ $$PWD/qml/PhongAlphaMaterial.qml \ $$PWD/qml/TextureMaterial.qml \ - $$PWD/qml/OrbitController.qml \ + $$PWD/qml/OrbitCameraController.qml \ $$PWD/qml/FirstPersonCameraController.qml diff --git a/src/quick3d/imports/extras/defaults/qml/OrbitController.qml b/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml index 328b7b98e..328b7b98e 100644 --- a/src/quick3d/imports/extras/defaults/qml/OrbitController.qml +++ b/src/quick3d/imports/extras/defaults/qml/OrbitCameraController.qml diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 95be07095..aa65c8b65 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -74,7 +74,7 @@ static const struct { // Entities { "SkyboxEntity", 2, 0 }, // Camera Controllers - { "OrbitController", 2, 0 }, + { "OrbitCameraController", 2, 0 }, { "FirstPersonCameraController", 2, 0 }, }; |