aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * testlib: add key sequence functionLiang Qi2017-11-032-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtQuick][QtTest] Added keySequence() function in TestCase. Task-number: QTBUG-53381 Change-Id: Iea25410d40fc0745e16a10c1af35ec81c4c83668 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Fix failed assertions coming from the QML list modelLars Knoll2017-12-291-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractItemModel has become more strict in sanity checking the arguments of beginInsertRows and friends with change 00c09e752ff7e482e1308e0e34721dc979204595 in qtbase. Unfortunately, the QML list model was feeding it out of bound rows in some cases, leading to failed assertions. Fix this properly, by calculating the inserted/removed and changed rows on the fly when syncing the list model from the worker thread. Adjust the code in the XML list model as well, so it does call things in the proper order. Fix two tests, one for a minimal change in behavior (more correct now), the other to remove an assertion that is not valid anymore in debug builds (where assertions in QtCore will call rowCount()). Change-Id: Ied85269f78d41b64e06388590be3ed227ac88fdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Fix deprecation warningAllan Sandfeld Jensen2017-12-051-3/+6
| | | | | | | | | | | | | | | | | | | | | Use sizeInBytes instead of byteCount for huge QImage support. Change-Id: Iad1c61e68a88521d23ff9652ae0507f574b003b0 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | wasm: bitfield packing fixLorn Potter2018-01-173-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | emscripten seems to have issues with them, acting as if they are const, and cannot be changed. Change-Id: I1b86580ca80dab08a0efbd25fbf5167625a704f9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | wasm: get declarative building and running for webassemblyLorn Potter2018-01-041-1/+8
|/ / | | | | | | | | | | | | One thread Change-Id: Iab9bd20eb5951c7b0fe0b6f48f1f14ea7560d8f7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Warn if a layout has children with anchorsJan Arve Sæther2017-11-284-2/+14
| | | | | | | | | | | | | | | | | | We get several bug reports due to this mistake. Print a warning about it and that it *might* eat your cats. Task-number: QTBUG-63303 Change-Id: I0b1ae21dc4419efee88623765a8d6dd302fbc1f4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix positioning and placement of initially invisible items in layoutsSascha Siebert2017-11-222-30/+28
| | | | | | | | | | | | | | | | | | | | | | Instead of misusing implicitWidth/Height as a storage mechanism in scenarios where width/height is used for preferred size evaluation, new members are created to hold this information to prevent incorrect sizing in mentioned scenario and get rid of blocking signals. Task-number: QTBUG-57455 Change-Id: I102c45805c4106e5829b17b65c2e247b2381573f Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | Merge remote-tracking branch 'origin/wip/new-backend' into devSimon Hausmann2017-11-211-31/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4isel_moth.cpp src/qml/compiler/qv4jsir_p.h src/qml/jsruntime/qv4engine_p.h src/qml/jsruntime/qv4vme_moth.cpp tests/auto/qml/qml.pro Change-Id: Ia7b6ec24c7fcbcbb1786d9e798d2df294020ae37
| * \ Merge remote-tracking branch 'origin/dev' into new-backendLars Knoll2017-11-083-5/+30
| |\ \ | | | | | | | | | | | | Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c
| * | | Simplify JSCallData constructionLars Knoll2017-11-071-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic53532edae9a209aa7125af6f00a9d993d74f1a3 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | | Rename JSCall to JSCallDataLars Knoll2017-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As, this is going to change in a simple stack based structure to keep pointers to the data to pass to calls. Change-Id: Ia9aa3f81ee3eeba36affd16aac7b2fe97d59aea9 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * | | Merge remote-tracking branch 'origin/dev' into HEADLars Knoll2017-10-2220-75/+59
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4codegen.cpp src/qml/compiler/qv4compileddata.cpp src/qml/compiler/qv4compileddata_p.h src/qml/compiler/qv4isel_moth_p.h src/qml/compiler/qv4ssa.cpp src/qml/jit/qv4assembler_p.h src/qml/jit/qv4isel_masm_p.h src/qml/jit/qv4regalloc.cpp src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4qmlcontext_p.h src/qml/jsruntime/qv4regexp.cpp src/qml/jsruntime/qv4regexp_p.h src/qml/jsruntime/qv4regexpobject.cpp src/qml/jsruntime/qv4runtime.cpp src/qml/jsruntime/qv4vme_moth.cpp src/qml/qml/v8/qqmlbuiltinfunctions.cpp tests/auto/qml/qml.pro tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp tools/qmlcachegen/qmlcachegen.cpp Change-Id: I1577e195c736f3414089036b957a01cb91a3ca23
| * | | | Change CallData::argc to be a QV4::ValueErik Verbruggen2017-09-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of mimicking a Value. This makes sure that argc now stays correct even when anything on Value changes. Most of the change is mechanical: replace callData->argc by callData->argc(). Change-Id: I521831ae1ffb3966bad6589c18d7a373e13439d7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.10' into wip/new-backendSimon Hausmann2017-09-122-27/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Iccb35fab856c7d8ec4aaaf021b70a65cfaa564b3
| * \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/new-backendSimon Hausmann2017-09-085-127/+138
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4isel_moth.cpp src/qml/compiler/qv4jsir.cpp src/qml/jsruntime/qv4mathobject.cpp Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637
| * | | | | | Always set the correct FunctionObject when calling JS functionsLars Knoll2017-09-021-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed ScopedCallData to JSCall, enforced passing a JS FunctionObject to it, and added call() and callAsConstructor() methods to it. Change-Id: I30db65c9765c2896b5909fe2105c0934c6dad861 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | Move ScopedCallData and ScopedStackFrame into a separate fileLars Knoll2017-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ae42aa7a811aa93fe0950725e9d253a0c5e8dba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | Merge remote-tracking branch 'origin/dev' into wip/new-backendLars Knoll2017-08-2240-15/+7004
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff06429f948ac6cdec77a9e5bb8c5375c56fe705
| * | | | | | | Remove Scope::result and convert calling convention for builtinsLars Knoll2017-08-081-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for faster calling of builtins, and completely avoid scope creation in many cases. Change-Id: I0f1681e19e9908db10def85a74e134a87fc2e44c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | | | Change function signatures for call/construct backLars Knoll2017-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change those back again to return a value. This will be required to avoid creation of Scope objects between JS function calls. Change-Id: I05cb5cf8fd0c13dcefa60d213ccd5983fab57ea3 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | | | | | | Replace remaining Q_NULLPTR with nullptrKevin Funk2017-11-175-6/+6
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28a32af7f1c306a3002d47025a842475f848c1a4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | | | Add new PathAngleArc typeMichael Brasser2017-11-072-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This type allows working with arcs in different ways (based on angles rather than start/end positions) that can be more intuitive for certain use cases (such as a circular progress indicator). [ChangeLog][QtQuick][Path] Add new PathAngleArc type Change-Id: Icbe5fc0450edd9a4d92f9a8d03438842b72a312d Task-number: QTBUG-62684 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-061-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | Change-Id: I1ed923d72566af663555898c3ec708191eef8ae9
| * | | | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-241-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlimport.cpp src/qml/qml/qqmlimport_p.h src/qml/qml/qqmltypenamecache.cpp Done-with: Ulf Hermann<ulf.hermann@qt.io> Change-Id: I41ba7a592b2659ddf53da6952ea3b456a7bba319
| | * | | | | Fix outdated FDL license headerKai Koehne2017-10-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76dccf547de40b5e72fd7abaa062fa96cb2c118a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2518-50/+50
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I176f91a8c51e81a2df3fe91733118261491223ee Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | | | | Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-09-201-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4compileddata.cpp src/qml/compiler/qv4compileddata_p.h src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4qmlcontext.cpp src/qml/jsruntime/qv4qmlcontext_p.h src/qml/jsruntime/qv4regexpobject.cpp src/qml/jsruntime/qv4regexpobject_p.h src/qml/types/qqmllistmodel.cpp src/quick/items/qquickanimatedimage_p.h src/quick/scenegraph/qsgrenderloop.cpp tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp Change-Id: If20ef62b2c98bdf656cb2f5d27b1897b754d3dc0
| * | | | | Settings: document how to have several categoriesMitch Curtis2017-09-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f27a162936015e2aeb9d52079a65b218498b50a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | | | qmltest: Enumerate test cases / functions without evaluating QMLTor Arne Vestbø2017-09-131-25/+0
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most, if not all, QML tests are written without any sort of dynamic instantiation of the test data, so doing view.setSource() will evaluate the whole source file, compute bindings, create items, windows, etc. This is less then ideal when all you want is to list the test functions using -functions, or when running a single test from the command line, as in both cases we'll still actually evaluate every single QML file. This makes it really hard to evaluate test output, e.g. from the CI, especially with logging enabled, as even if a single test is requested, the logs are filled with results from the loading of the other tests. To improve the situation we use a non-instantiated QML component that we then inspect its compilation data, looking for test cases and functions. In the future the implementation of TestCase's qtest_run* machinery should be built on top of QTestLib instead of being reimplemented in JavaScript, but this is left for later. Change-Id: Ie5448208daf786e335583ab6bdfbc195891ec1f5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | shapes: Reduce stroke/fill node dataLaszlo Agocs2017-09-052-27/+14
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Do not store the superfluous window and geometry pointers. Change-Id: Ib9cf4e62bdc6f32dc99cda25eddfebdfa05d579b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-053-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickwindow.cpp src/quick/scenegraph/qsgrenderloop.cpp Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca
| * | | Doc: Fix capitalization in section titlesTopi Reinio2017-08-293-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and fix some section titles to be less confusing. Change-Id: If83c3faffead9e2e9be7fc0fb360f1c5b8b1bb51 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
* | | | Revert "Make QtQuickTest::mouseEvent use QTest::mouseX"Jani Heikkinen2017-09-041-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems this is causing QTBUG-62925 and QTBUG-62926 so revert is the best option at this point to proceed This reverts commit 4c46dce8fd9c9dddddd1d07f56396b3eabb2efc4. Change-Id: Ia8ea85c1ac1ada1752b29c9fbd8439f5963d46d2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Merge dev into 5.10Frederik Gladhorn2017-09-022-19/+24
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I4376b711fbf02ea978f5d347d34a4a6a0c95dab2
| * | | | Make QtQuickTest::mouseEvent use QTest::mouseXAlbert Astals Cid2017-08-301-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes QQuickItem::isUnderMouse returning wrong information when moving the mouse cursor with QtQuickTest::mouseX Also changes TestCase.mouseDrag to actually resemble more what real life does, i.e. send mouse moves with the same localPos if the item has already moved and update tst_drag.qml accordingly Change-Id: I80e4ab097da90d21ba987466c1b82467755a6b56 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | | QQmlSettings: use categorised loggingMitch Curtis2017-08-291-13/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to e.g. easily see where the settings are saved to without having to define the macro and recompile the code. Change-Id: I9c65e6702929d86b1e439f3d836c881b3ebad14f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | | Doc: Fix issues for Qt Quick Shapes documentationTopi Reinio2017-09-011-109/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use \value for enumeration types - Wrap paragraphs and code examples at 80 characters - Fix minor typos and missing punctuation Change-Id: Ia483b4f00fb54ae1005d097160309a46b69faf5c Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | Fix some qdoc warnings for 5.10Friedemann Kleint2017-08-281-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative/src/imports/shapes/qquickshape.cpp:577: warning: Command '\li' outside of '\list' and '\table' qtdeclarative/src/imports/shapes/qquickshape.cpp:585: warning: Command '\li' outside of '\list' and '\table' qtdeclarative/src/imports/shapes/qquickshape.cpp:592: warning: Command '\li' outside of '\list' and '\table' qtdeclarative/src/imports/shapes/qquickshape.cpp:596: warning: Command '\li' outside of '\list' and '\table' qtdeclarative/src/imports/shapes/qquickshape.cpp:602: warning: Command '\li' outside of '\list' and '\table' qtdeclarative/src/imports/shapes/qquickshape.cpp:608: warning: Unexpected '\endlist' qtdeclarative/src/quick/handlers/qquickpinchhandler.cpp:138: warning: Missing property type for QQuickPinchHandler::minimumX qtdeclarative/src/quick/handlers/qquickpinchhandler.cpp:151: warning: Missing property type for QQuickPinchHandler::maximumX qtdeclarative/src/quick/handlers/qquickpinchhandler.cpp:164: warning: Missing property type for QQuickPinchHandler::minimumY qtdeclarative/src/quick/handlers/qquickpinchhandler.cpp:177: warning: Missing property type for QQuickPinchHandler::maximumY qtdeclarative/src/quick/items/qquickitem.cpp:7241: warning: No such parameter 'enabled' in QQuickItem::setAcceptTouchEvents() qtdeclarative/src/quick/items/qquickitem.cpp:7241: warning: Undocumented parameter 'accept' in QQuickItem::setAcceptTouchEvents() qtdeclarative/src/quick/items/qquickwindow.cpp:4829: warning: No such parameter 'backend' in QQuickWindow::sceneGraphBackend() Change-Id: Iec2ced892e068317c60517cedacc27e8c82b26b3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-08-181-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qqmltypecompiler.cpp src/qml/jsruntime/qv4qmlcontext.cpp src/qml/jsruntime/qv4qobjectwrapper.cpp src/qml/qml/qqmlcustomparser.cpp src/qml/qml/qqmlimport.cpp src/qml/qml/qqmlimport_p.h src/qml/qml/qqmlmetatype.cpp src/qml/qml/qqmlmetatype_p.h src/qml/qml/qqmltypenamecache.cpp src/qml/qml/qqmltypenamecache_p.h src/qml/qml/qqmltypewrapper.cpp src/qml/qml/qqmltypewrapper_p.h src/qml/qml/qqmlvmemetaobject.cpp src/qml/util/qqmladaptormodel.cpp Change-Id: Ic959d03e6f9c328fb02710d9abbb0f27cddde131
| * | Use QQmlType by valueLars Knoll2017-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQmlType is now refcounted, and we need to use it by value, to control it's lifetime properly. This is required, so we can clean up the QQmlMetaTypeData cache on engine destruction and with trimComponentCache() Task-number: QTBUG-61536 Change-Id: If86391c86ea20a646ded7c9925d8f743f628fb91 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Nvpr renderer: Adapt QPen behavior when setting dashPatternBerthold Krevert2017-08-091-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fallback to correct default values if dashPattern array is empty (while strokeStyle is set to DashLine at the same time) and check for odd sized dashPattern arrays. Change-Id: Ic1dbf9f80c5efaab3bbf138158c12979a4414595 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | shapes: Remove unused signalLaszlo Agocs2017-08-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Gradients are set just like with Rectangle, and there is no notify signal. Remove the never emitted signal from the header. Change-Id: If3ae880f4cce4042ce6b399a6fde8013acd5a2b1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge branch 'wip/pointerhandler' into dev" into refs/staging/devShawn Rutledge2017-08-094-0/+105
|\ \ \
| * \ \ Merge branch 'wip/pointerhandler' into devShawn Rutledge2017-08-084-0/+105
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ifae425744d69779a661c7465d33163a7d53fb8a4
| | * \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-08-0824-529/+729
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9
| | * \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerJan Arve Saether2017-07-1122-67/+5819
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/shared/LauncherList.qml src/quick/items/qquickevents.cpp src/quick/items/qquickevents_p_p.h src/quick/items/qquickwindow.cpp tests/auto/quick/touchmouse/tst_touchmouse.cpp Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b
| | * | | | | PointerHandlers plugin: fix the build on iOSShawn Rutledge2017-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version suffix isn't necessary, and causes a link error when building applications. Change-Id: I4725b9190e0ea1fb4b2c4c5b752e40d5be2fedc3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | * | | | | Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-05-0813-54/+57
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia06843de255547174efa556b1ab76be4b4be4287
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-04-138-76/+243
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/dev' into wip/pointerhandlerShawn Rutledge2017-03-023-35/+26
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e43a0a47d49de38617f6afc7548f9a9e212a851
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 14:46:02 +0000