summaryrefslogtreecommitdiffstats
path: root/src/input
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-194-4/+4
| | | | | | Task-number: QTBUG-68933 Change-Id: I4226b8b9d70548b6921948c5ea47520f40f5df98 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix bad use of QEvent::TimerThiago Macieira2018-05-011-1/+1
| | | | | | | | | | | | | | | | | QEvent::Timer == 1 == Qt::TapGesture This is not what was intended here. I'm assuming it's the Gesture event. Note that there are multiple gesture types possible (hence, Qt::TapGesture), so this code probably needs to be updated. Caught by Clang 6: qmousehandler.cpp:92:10: warning: comparison of two values with different enumeration types in switch statement ('QEvent::Type' and 'Qt::GestureType') [-Wenum-compare-switch] Change-Id: I3840d727dee443318644fffd152938d633280de1 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-208-163/+238
| | | | | | | | | | | | | | | | | | | | | Since Qt 5.11, QDoc uses Clang to parse C++ documentation. Clang requires a module header, as well as proper include paths, to build a precompiled header and process the sources. To do this, add a custom module header that pulls in all Qt 3D modules - this way, we can continue using a single documentation project to covers all of Qt 3D. Fix all documentation warnings are caused by missing namespaces, QML module/type names and typos, as well as a number of linking problems and other minor issues. After this change, the remaining documentation issues consist of 'No documentation for ...' warnings. Task-number: QTBUG-67790 Change-Id: I38b91163c475a00cc1893e793240470c5409eb57 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Revert "Doc: Divide documentation into submodules"Topi Reinio2018-04-203-124/+0
| | | | | | | | | | | This reverts commit c8964b8f1cf56718a189b0f57bad446cec30a8b8. QDoc now supports documentation-specific custom module headers and include headers that allow us to keep using a single documentation project that covers multiple modules. Change-Id: I84706a7149097a6b03f0f266e55d6f712a6c773e Reviewed-by: Martin Smith <martin.smith@qt.io>
* Document state of the Qt 3D modulesKai Koehne2018-03-121-0/+3
| | | | | | | | | | | | | Do make it explicit which ones are still in development also in the landing page, and add \preliminary and \since tags (for released and TP modules, respectively). Note that the \preliminary, \since tags currently do not work for \qmlmodule, which hopefully gets fixed at one point: QTBUG-65963. Change-Id: I6648311c38f331286be37eefa60794984cd239b7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/animation/doc/src/qt3danimation-module.qdoc src/render/backend/abstractrenderer_p.h src/render/backend/buffervisitor_p.h src/render/backend/renderer.cpp src/render/backend/renderer_p.h src/render/backend/triangleboundingvolume_p.h src/render/backend/trianglesextractor_p.h src/render/frontend/sphere_p.h src/render/jobs/calcboundingvolumejob.cpp src/render/jobs/job_common_p.h src/render/jobs/pickboundingvolumejob.cpp src/render/jobs/pickboundingvolumejob_p.h src/render/jobs/pickboundingvolumeutils.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/boundingsphere/tst_boundingsphere.cpp tests/auto/render/commons/testrenderer.h tests/auto/render/raycasting/tst_raycasting.cpp tests/auto/render/render.pro tests/auto/render/renderer/tst_renderer.cpp Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3
| * Doc: add doc to undocumented methods and properties qt3dNico Vertriest2018-02-061-1/+1
| | | | | | | | | | | | Change-Id: Ia498dd96a6d35997a3f493f26b376fb8fa146196 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Doc: Divide documentation into submodulesTopi Reinio2018-02-093-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc in Qt 5.11 will use Clang (libclang) to parse C++ documentation. In order to do that, Clang needs to have the include paths available when parsing source; qmake provides that information to QDoc but only when the documentation project is located under the correct module (source) path. By having dedicated doc projects for Qt 3D Core, Render, Input, etc. the number of documentation warnings is signicantly reduced. A top-level 'Qt 3D' project is still kept, and contains the landing page, overview, examples, and top-level 'C++ classes' and 'QML types' pages that list all types documented across all Qt 3D submodules. Change-Id: Id5936de36f31c2a8764a64e1e9d7ae0d10e8ab14 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge branch '5.10' into devSean Harmer2018-01-176-54/+38
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I248aa369ba98659a61e563fd29cc811c76ea1e2d
| * Iterate by const reference on handlesMike Krus2018-01-134-6/+6
| | | | | | | | | | | | | | | | When iterating on handles, use const references to avoid copy of non trivial type. Found by Clazy clazy-range-loop Change-Id: I33ec54b3958160da2517e196411bcf92cd7b3bff Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Get rid of the INDEXBITS template argument for QHandleLars Knoll2017-12-132-48/+32
| | | | | | | | | | | | | | | | | | It's not required anymore, as the resource manager can grow as needed. Change-Id: If509de7f2ef90e1af9729d8fc60d7ecb08ede687 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-132-2/+2
|\| | | | | | | Change-Id: I2d373d538df3a65ac2d41238e5c6a214a151be68
| * Make m_pressAndHoldTimer into a raw pointer to avoid deleting it twiceSvenn-Arne Dragly2017-09-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | The timer is parented to the QMouseHandler (introduced in 595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a) and was therefore deleted both by the parent and by the QScopedPointer, leading to crash on exit. This commit removes the QScopedPointer and uses a raw pointer instead. Task-number: QTBUG-63462 Change-Id: I6b031caf7cb69ccbde74995661f4ce8c73f21d88 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Improve plugin loading with -no-feature-libraryUlf Hermann2017-10-202-17/+12
| | | | | | | | | | | | | | | | | | | | Drop an unused include and make more of an effort to load (possibly static) QInputDeviceIntegration and QSceneImportFactory plugins. pluginPath was unused in qsceneimportfactory.cpp in this case, and generated compile warnings. Change-Id: I033c5bace84018a9e6c640b4318f2d34b91f7c19 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-252-2/+2
| | | | | | | | | | Change-Id: I480f8b917e41d514f9efff01b2f2664b61ea3440 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Replace Q_DECL_FINAL with finalKevin Funk2017-09-2522-49/+49
| | | | | | | | | | Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2540-86/+86
|/ | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Get rid of the AllocationPolicy template argument in the ResourceManagerLars Knoll2017-09-111-32/+16
| | | | | | | We always use the same policy anyway. Change-Id: I3349b8c19ce0e6239b140dfac7ba66f8dda1b9be Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: add doc to undocumented methods/propertiesNico Vertriest2017-08-283-0/+9
| | | | | | Change-Id: I8967110b0237421299c2103f847a38e0526f9a6b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* QMouseHandler: Add a parent to the internal timerGuilhem Vallat2017-08-252-0/+9
| | | | | | | | | Without it the timer is leaked and doesn't follow the mouse handler when move from a thread to another. Task-number: QTBUG-62779 Change-Id: I34afc36165d2bbbce626d6c2c74f9408a319a7cb Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Complete QML documentation for QAxisAccumulatorPaul Lemire2017-08-181-0/+18
| | | | | | Change-Id: I839196116a5b4d70fa0545c0c6fd28079efeebca Task-number: QTBUG-61993 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix qml signal documentation for QMouseHandlerPaul Lemire2017-08-181-25/+49
| | | | | | | | Also align everything properly Change-Id: I65d4ed2646ed69a5037f9e8bca3c6ade6f7199b8 Task-number: QTBUG-61997 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: add doc to undocumented methodsNico Vertriest2017-08-111-0/+3
| | | | | | | | - qtext2dentity.cpp - qabstractphysicaldevice.cpp Change-Id: I026ac031c366c979e17667c3635c1a391a5bba8a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Use QSharedPointer::create() moreMarc Mutz2017-07-222-3/+3
| | | | | | | | | | This is the result of running the (experimental) clang-tidy check qt-modernize-qsharedpointer-create Discarded changes: none. Change-Id: Ic6368521ebf5841267ffe7917cc652627f7b26a7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: add basic doc to undocumented classesNico Vertriest2017-06-091-0/+5
| | | | | Change-Id: Ib67712bd961a3e0b113ddd25feaa819695e792b9 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Normalize Q_ARG to avoid temporary memory allocationsSergio Martins2017-06-032-2/+2
| | | | | | | Found by -Wclazy-connect-not-normalized Change-Id: I774424bb53c0d24bd49d5fafdfb8f02e9f05ee16 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix container detachments detected by clazySergio Martins2017-05-261-1/+2
| | | | | Change-Id: I551073c386247215f1c51dce92e5f05b5d335cc0 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for -no-feature-wheeleventStephan Binner2017-04-2713-8/+57
| | | | | | | Change-Id: I72591f43c0e2c4cc6e3e589f8d8e52fbb1041666 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix build for -no-feature-gesturesStephan Binner2017-04-272-1/+9
| | | | | | | Change-Id: Ib0f0d7f21bf32b09f8dc6d3a4859d037b4e39af7 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix build for -no-feature-shortcutStephan Binner2017-04-271-0/+2
| | | | | | Change-Id: I1ddd01924fc1d5667be7e0bba2540e24c2272bc3 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix warnings for -no-feature-libraryStephan Binner2017-04-271-0/+5
| | | | | | Change-Id: I5a6713fe6081c36fdae9dcb7b7671403f737e4c0 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix spelling in comments and docsAndy Maloney2017-04-061-1/+1
| | | | | Change-Id: Ib93da3bc94ee43980d1190955c8c37e886c4b0fa Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch '5.8' into 5.9Sean Harmer2017-04-02105-210/+310
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/jobs/qthreadpooler.cpp src/core/nodes/qcomponent.cpp src/core/qpostman.cpp src/core/qscene_p.h src/core/services/qservicelocator_p.h src/input/frontend/qinputaspect.cpp src/plugins/sceneparsers/assimp/assimpimporter.cpp src/plugins/sceneparsers/assimp/assimpimporter.h src/plugins/sceneparsers/gltf/gltfimporter.h src/plugins/sceneparsers/gltf/gltfio.cpp src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp src/quick3d/imports/render/qt3dquick3drenderplugin.cpp src/quick3d/quick3dextras/qt3dquickwindow.cpp Change-Id: I3566708c6f74a34959e7bb64b64e93647ca3f699
| * Coding convention fix for Src/inputRobert Brock2017-03-16105-208/+307
| | | | | | | | | | | | | | | | Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I1d1b61c2fac42505f85a1c4421e1292259270568 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Wrap QLibrary header inclusion inside QT_CONFIG(library)Kimmo Ollila2017-03-211-0/+2
| | | | | | | | | | Change-Id: I9f5f5e467bf271ded01d2f59354e19a567ea456e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Doc: added parameter specificationsNico Vertriest2017-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | qpaintedtextureimage.cpp: - undocumented parameter 'h' in Qt3DRender::QPaintedTextureImage::setHeight() - undocumented parameter 'size' in Qt3DRender::QPaintedTextureImage::setSize() - undocumented parameter 'w' in Qt3DRender::QPaintedTextureImage::setWidth() qskyboxentity.cpp:298: warning: Undocumented return value qaxisaccumulator.cpp:250: warning: Undocumented parameter 'sourceAxisType' in Qt3DInput::QAxisAccumulator::setSourceAxisType() Change-Id: I609ce4472c2468557bb2cb0042e9fc4923514b92 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Deliver all events by default unless marked as intermediateSean Harmer2017-02-096-15/+0
| | | | | | | | | | | | | | | | | | | | This change inverts m_final flag on property change events so that now, all events are delivered by default. The animation aspect now marks intermediate calculated changes and these are not delivered unless the user subscribes to them. Change-Id: Ide6c30b29a91ed874d47c52d0ee1352f6680c3d8 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-301-11/+5
|\| | | | | | | Change-Id: I0bc5a9f5a6971cd6bb6ad531515928adefc5b0cb
| * Doc: corrected several qdoc errors qt3dNico Vertriest2017-01-251-10/+4
| | | | | | | | | | | | | | | | qaxisaccumulator.cpp:182: warning: QML property documented multiple times: 'real Qt3D.Input::AxisAccumulator::value' Errors on \return Change-Id: Ibff02113e1a4ac3cfc79d23960812345cba513cb Reviewed-by: Martin Smith <martin.smith@qt.io>
| * Doc: minor spelling mistakeNico Vertriest2017-01-251-1/+1
| | | | | | | | | | Change-Id: I7b2675400a7111bdb1f9817d52a96706942c2f1d Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Set the final flag on scene changes coming from the backendPaul Lemire2017-01-266-0/+15
| | | | | | | | | | | | | | This fixes a regression introduced by the patch introducing property tracking. Change-Id: Ib2e41183ea1ff389e6bad97cfa308311ee024541 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge branch '5.8' into devSean Harmer2016-12-2115-11/+512
|\| | | | | | | | | | | | | Conflicts: src/input/frontend/qaxisaccumulator.cpp Change-Id: I7d213339241743e60f11cf0f3ae68076cb762c62
| * Merge branch '5.8.0' into 5.8Sean Harmer2016-12-1615-11/+512
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/backend/render-backend.pri src/render/backend/renderer_p.h src/render/frontend/qrenderaspect.cpp Change-Id: If0481f031a6caf7995fefa93b96f1fdeb96cbd26
| | * Fix warnings about unregistered metatypesSean Harmer2016-12-081-0/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-57495 Change-Id: Ia1dc858d3c6c223498cec3644dcd8d35b7181630 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| | * Add plumbing and process AxisAccumulators each frameSean Harmer2016-12-0715-4/+294
| | | | | | | | | | | | | | | Change-Id: I91a0f9384c7ef2ba642db1a2becdba1d2e374d87 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| | * QAxisAccumulaor should be a componentSean Harmer2016-12-073-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | So that it can be aggregated by entities to accumlate axis values which is behavior implemented on the backend. Change-Id: Idd7a1a2c1e3f7e73c3c83023ebad9b3e85f31a5d Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| | * Add backend class for AxisAccumulator and testsSean Harmer2016-12-073-2/+210
| | | | | | | | | | | | | | | Change-Id: I2d6071c11054eff7d5a574ce3a3dba54dd9bad12 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* | | Add missing emit keyword when calling signalsSergio Martins2016-12-183-3/+3
|/ / | | | | | | | | | | | | It's improves readability and fixes clazy-incorrect-emit warnings. Change-Id: I1cfda5534e08f6f3ce0809716e0adbe182c50c0d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: removed superfluous (double) documentation + link errorNico Vertriest2016-12-071-8/+3
| | | | | | | | | | | | | | | | | | - removed link to Tessellation Modes QML Example - QMouseDevice::sensitivity documented twice - QTextureImage::source documented twice Change-Id: I7d1a37a158bf2861103b20a5d387a005e7c759c6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Doc: Specify #include path for each \classTopi Reinio2016-12-075-0/+6
|/ | | | | | | | | | | | QDoc tries to guess the correct #include statement, displayed in the requisites table in the class reference. However, this often produces incorrect information for a module as complex as Qt3D. To fix this, manually specify the include path with the \inheaderfile command. Change-Id: I42929b92600d07d759f4f76e9051ff656785c652 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>