diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-16 12:06:42 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-16 12:06:42 +0100 |
| commit | c38ba06bbc139b1d070bf279bc9e05384ece1e87 (patch) | |
| tree | 85093824bba8fe333ca93e5184aca00e8e7f3220 /examples/qt3d/audio-visualizer-qml | |
| parent | caeb69e2401fe4e8e4d7dfa34e39eee941478a9e (diff) | |
| parent | 78973b481c3cfb6db2511f0487d1045ad16a21eb (diff) | |
Merge branch '5.6' into 5.7
Conflicts:
examples/qt3d/examples-common/qorbitcontrol.h
src/core/qnodecreatedchange.cpp
src/core/qnodecreatedchange.h
src/input/frontend/qaxisactionhandler.h
src/input/frontend/qinputaspect.h
src/input/frontend/qkeyboardhandler.h
src/input/frontend/qmousedevice.h
src/input/frontend/qmousehandler.h
src/input/frontend/qphysicaldevicecreatedchange.h
src/input/input.pro
src/logic/qframeaction.h
src/plugins/sceneparsers/assimp/assimp.pro
src/quick3d/imports/input/importsinput.pro
src/quick3d/imports/render/importsrender.pro
src/render/backend/trianglesextractor.cpp
src/render/framegraph/qclearbuffer.h
src/render/framegraph/qlighting.h
src/render/framegraph/qstateset.h
src/render/frontend/qrenderattachment.h
src/render/geometry/qabstractattribute.h
src/render/geometry/qabstractbuffer.h
src/render/geometry/qattribute.h
src/render/geometry/qboundingvolumespecifier.h
src/render/geometry/qbuffer.h
src/render/materialsystem/qfilterkey.h
src/render/materialsystem/qparameter.h
src/render/materialsystem/qparametermapping.h
src/render/renderstates/qblendstate.h
src/render/renderstates/qdepthmask.h
src/render/renderstates/qpointsize.cpp
src/render/renderstates/qrenderstatecreatedchange.cpp
src/render/renderstates/qstencilop.h
src/render/renderstates/qstencilopseparate.h
src/render/renderstates/qstenciltestseparate.h
src/render/texture/qabstracttexture.h
src/render/texture/qabstracttextureimage.h
src/render/texture/qtextureproviders.h
Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4
Diffstat (limited to 'examples/qt3d/audio-visualizer-qml')
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/images/normalmap.png | bin | 533 -> 308 bytes | |||
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/images/songtitle.png | bin | 7438 -> 5764 bytes | |||
| -rw-r--r-- | examples/qt3d/audio-visualizer-qml/touchsettings.cpp | 3 |
3 files changed, 1 insertions, 2 deletions
diff --git a/examples/qt3d/audio-visualizer-qml/images/normalmap.png b/examples/qt3d/audio-visualizer-qml/images/normalmap.png Binary files differindex be522bbf9..0c3941c4e 100644 --- a/examples/qt3d/audio-visualizer-qml/images/normalmap.png +++ b/examples/qt3d/audio-visualizer-qml/images/normalmap.png diff --git a/examples/qt3d/audio-visualizer-qml/images/songtitle.png b/examples/qt3d/audio-visualizer-qml/images/songtitle.png Binary files differindex 1f47b971f..2a9961093 100644 --- a/examples/qt3d/audio-visualizer-qml/images/songtitle.png +++ b/examples/qt3d/audio-visualizer-qml/images/songtitle.png diff --git a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp index f55705395..0dd6d36d9 100644 --- a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp +++ b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp @@ -45,8 +45,7 @@ TouchSettings::TouchSettings(QObject *parent) bool TouchSettings::isHoverEnabled() const { -#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) - || defined(Q_OS_WINRT) +#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WINRT) return false; #else bool isTouch = false; |
