aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qqmlprofilereventreceiver_p.h: Add "We mean it" commentv5.11.0-alpha1Friedemann Kleint2018-02-141-0/+11
| | | | | | | | | | Fix warning: QtQmlDebug: WARNING: .../src/qmldebug/qqmlprofilereventreceiver_p.h does not have the "We mean it." warning Amends b82296f825daf0ba110fea4aa1b61f96d63f371b. Change-Id: I540bee466be96ba787283bfc7b1d5c36066df2ed Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Clear the last value when removing propertiesErik Verbruggen2018-02-141-0/+3
| | | | | | | | | | | | When we remove a property from an object, we shrink the used entries by one (or 2 when an accessor is defined) by moving subsequent entries "down" over the removed entry. We also have to set the last entry (or 2) to Undefined, otherwise any heap objects referenced there would be retained. Task-number: QTBUG-66090 Change-Id: I75905fafd0d88891820d894a869b9714bc9807e0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* doc: Add documentation for undocumented thingsMartin Smith2018-02-148-9/+65
| | | | | | | | | | There were several undocumented elements in the API that clang-qdoc warned about. These are now documented, although original authors might want to contribute better descriptions. A few uses of a macro "qdoc" were corrected to Q_CLANG_QDOC. Change-Id: I4e1d4c5f3266a334d7286e55ed1b113319de2273 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix typosJarek Kobus2018-02-143-6/+6
| | | | | Change-Id: I8afc27444e5c92b7c6aed3ff987dffb135bdfe46 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* ScenGraph: Prefer printf style loggingKai Koehne2018-02-139-109/+116
| | | | | | | | This generates more compact code, saving 20480 bytes on disk (Linux 64 bit, release build). Change-Id: I73d6d88b7b61b87a5d714e131fcf86ee80c83f38 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Use only cache path to cache .qmlc files on AndroidBogDan Vatra2018-02-131-0/+2
| | | | | | Task-number: QTBUG-58223 Change-Id: Ibc599ac2e62aa60405af0022c7f5bab6eac3e3c4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix: Make Image element support detection of suitable file extensionEirik Aavitsland2018-02-135-3/+56
| | | | | | | | | | | | If the source is a non-existent local file or resource, then instead of giving up directly, check if there exists a file/resource with the same name and a known supported image/texture file extension (suffix). [ChangeLog][QtQuick][Image] Support detection of suitable file extension Task-number: QTBUG-66127 Change-Id: I4c0edb639017e8707eed8e532ba55d29917751cb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix memory leak with ListModel.getSimon Hausmann2018-02-122-3/+35
| | | | | | | | | | | | | | | | | This is a regression introduced with commit 3cc589c98390992e3ee8a7970dc2913ea857d623, which in turn fixed a leak with QV4::QObjectWrapper objects. Unfortunately the allocate() call into the persistent (weak) value storage in the list model introduced a leak of the weak value itself. This is fixed by replacing the free standing weak value allocation with the use of the existing jsWrapper weak value in the declarative data (QQmlData). That weak value is freed property in the destroy() method of the QV4::QObjectWRapper. The extra QQmlData allocation is hidden behind a unified allocation, similar to what we do in void QQmlType::create(QObject **, void **, size_t) const. Task-number: QTBUG-66189 Change-Id: I5351e3e484542709a6b210e84aa19b14d28e11ad Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Windows: Fix tst_QQmlDebugProcess failureFriedemann Kleint2018-02-121-0/+1
| | | | | | | | | Change qqmldebugprocessprocess to be a a console process so that qDebug() messages appear on stderr. Task-number: QTBUG-66334 Change-Id: I5c02f893c3326cab19469bfe2b7fe60a804a439f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* doc: Fix qdoc warnings for templates and staticsMartin Smith2018-02-097-16/+17
| | | | | | | | | | Several \fn commands needed template parameters added, and several static functions that were not accessible were documented but should not have been documented. The template texts were added and the qdoc comments of the static functions were changed to non-qdoc comments. Change-Id: Icc44e243fbec2023865f47b7c73dc15d241d5b4d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* doc: Add template parameters to \fn commandsMartin Smith2018-02-091-8/+8
| | | | | | | | Added template parameters to several \fn commands for functions in class QSGSimpleMaterialShader<State>. Change-Id: Id8c0ce98f625e83ec4935dc5ef83d3c6dbc78255 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix crashes on WinRT when allocation of executable memory is disabledSimon Hausmann2018-02-094-6/+16
| | | | | | | | | | This regressed in commit b56f7d6f79b0de73c405b1503bfeb71ef5caf58f. We need to choose the YARR JIT (as well as the regular JIT) only if we can allocate executable memory. Change-Id: I150238fda7b3699cb1d7ffedeeed3c6f3f54132b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QmlDebug: Clear profiler client's trackedEngines on clear()Ulf Hermann2018-02-081-0/+1
| | | | | Change-Id: Ibd3e033339e26158c5f5c3dadbbcb6a903671cf5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix misleading doc for kerningRobert Loehning2018-02-083-9/+9
| | | | | | | | | | It currently sounds as if activating kerning would speed up drawing while the opposite is true. Change-Id: I7ba8caa82931617213c70570b6b81f82d5b61e52 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* QQmlProfilerService: Don't crash test if client is never createdUlf Hermann2018-02-081-0/+3
| | | | | | | | | If the self-terminating tests fail to establish a debugging session, we never get a profiler client and we also don't abort on the connection failure. Change-Id: I91d97dd07ff4d3e3519d4bc03115ae82af93d652 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Stabilize testLars Knoll2018-02-081-2/+2
| | | | | | | | | | | | In some cases on X11, the clipboard wouldn't be empty even though we just cleared it. The reason seems to be that it's then owned by a different process. So simply check whether we own the selection before checking that it's empty. This should avoid the random failures we've been seeing in this test. Change-Id: Id069eda5a24ad29e932aeb6a28275c20b010f90c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix CONFIG+=qtquickcompiler with multiple resource filesSimon Hausmann2018-02-083-21/+28
| | | | | | | | | | Fix command line option handling to allow for processing of multiple .qrc files as input files when generating the loader.cpp file. Task-number: QTBUG-66161 Change-Id: I1ecd40bf863c6570ccf42846106791b7f53fe432 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Stabilize the flickableinterop autotestLars Knoll2018-02-081-2/+2
| | | | | | | | | | Make sure the Rectangles we're sending the touch events to are visible on screen, otherwise I get consistent failures in this test on Linux. Change-Id: Icc2ba7ba73c434dd2ef725adbaa57ab6d413f354 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add a plugins.qmltypes for sharedimageUlf Hermann2018-02-081-0/+11
| | | | | | | | The plugin doesn't define any types, but we still want to have a description of it for tooling purposes. Change-Id: Ib5a5b021e5e79621da694993fe4bad8f6a130289 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* QmlDebug: Use EngineControl to hold engines until we're done with themUlf Hermann2018-02-084-17/+29
| | | | | | | | | Holding the engines with EngineControl makes sure we always receive the full trace before the connection drops. Task-number: QTBUG-66269 Change-Id: I9177c2a52743ba781547696508342c8d98557121 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QmlDebug: Don't lie about blocked engines in EngineControlUlf Hermann2018-02-082-13/+25
| | | | | | | | Previously additional engineIds could be accidentally added to the list by processing the engineAdded and engineRemoved signals. Change-Id: Ibac0c1ff48ae31c736371d319fe91d33a3396b05 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use qmlcachegen path from qtPrepareToolSamuli Piippo2018-02-081-4/+2
| | | | | | | Full path is already resolved by qtPrepareTool. Change-Id: If4232d247f64ffde85ce5ebe7bea8ab77d5bf32e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QQuickPointerHandler: implement QQmlParserStatusShawn Rutledge2018-02-081-1/+6
| | | | | | | | componentComplete() is useful to inform the handler that its parent Item is complete. Change-Id: Iec0e171d647dad45e0af2e0878f540d6f76f53bf Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* FolderListModel docs: import 2.11 (Qt minor version) (QUIP 99)Shawn Rutledge2018-02-081-4/+4
| | | | | | | | | In Qt 5.11 it will now be possible to do import Qt.labs.folderlistmodel 2.11 in 5.12 it will be 2.12, and so on. Change-Id: I89f71692ea2c11bc039ad204084a57802375d75e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix debug builds using musl libcJan Murawski2018-02-071-1/+1
| | | | | | | | Make use of the glib backtrace functions only when building with glibc. Task-number: QTBUG-66228 Change-Id: Icfb4bae9db00d7a8ebf34cf471479c90d8681ddb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix clang 5 warningsAllan Sandfeld Jensen2018-02-072-2/+5
| | | | | | | Fixes clang develop-builds Change-Id: If262d7038fc36bcec281be4c218b3cf3d4ae4deb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove unnecesary checksJesus Fernandez2018-02-071-2/+0
| | | | | | | | | | | | | | CID 186959 (#1 of 1): Macro compares unsigned to 0 (NO_EFFECT) unsigned_compare: This greater-than-or-equal-to-zero comparison of an unsigned value is always true. rev >= 0. CID 186960 (#2 of 2): Operands don't affect result (CONSTANT_EXPRESSION_RESULT) result_independent_of_operands: rev <= 255 /* std::numeric_limits<unsigned char>::max() */ is always true regardless of the values of its operands. This occurs as the logical first operand of ?:. Coverity-Id: 186959 Coverity-Id: 186960 Change-Id: Iaadadb89de1c8732b2756da8fda397632b6b7d93 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* blacklist qmlprofiler autotests which depend on AUT terminatingShawn Rutledge2018-02-061-0/+10
| | | | | | | | | | | QTBUG-66230 is causing some failures in tst_QQmlProfilerService when the profiler depends on the application under test to terminate by itself. That should be fixed soon but temporary blacklisting will help get the dev branch moving again. Task-number: QTBUG-66230 Change-Id: I868c92ace0add3ce30128caa23cd3fa9a3a6977e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.10' into dev" into ↵Shawn Rutledge2018-02-06118-725/+1866
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-02-02118-725/+1866
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp src/qml/compiler/qqmlirbuilder.cpp src/qml/compiler/qqmlirbuilder_p.h src/qml/compiler/qqmltypecompiler.cpp src/qml/compiler/qv4codegen.cpp src/qml/compiler/qv4codegen_p.h src/qml/compiler/qv4compileddata_p.h src/qml/compiler/qv4compiler.cpp src/qml/compiler/qv4compilercontext_p.h src/qml/compiler/qv4isel_moth.cpp src/qml/compiler/qv4jsir.cpp src/qml/compiler/qv4jsir_p.h src/qml/jit/qv4isel_masm.cpp src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4functionobject.cpp src/qml/jsruntime/qv4runtimecodegen.cpp src/qml/jsruntime/qv4script.cpp src/qml/jsruntime/qv4script_p.h src/qml/qml/qqmltypeloader.cpp src/quick/items/qquickanimatedimage.cpp src/quick/items/qquickanimatedimage_p_p.h src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp tests/auto/qml/qmlplugindump/qmlplugindump.pro tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp tools/qmlcachegen/qmlcachegen.cpp tools/qmljs/qmljs.cpp Done-with: Shawn Rutledge <shawn.rutledge@qt.io> Done-with: Lars Knoll <lars.knoll@qt.io> Done-with: Ulf Hermann <ulf.hermann@qt.io> Change-Id: I010e6525440a85f3b9a10bb9083f8e4352751b1d
| | * Make sure we send the UngrabMouse event when clearing grabbersJan Arve Sæther2018-01-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused a regression in QtLocation autotest declarative_ui\tst_map_mouse.qml where the sequence of tests test_basic_press_release() and test_enabled() caused test_enabled() to fail. Change-Id: I53621a9a18d0574163260674c11bdcb02c3e1218 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Fix uploading of compressed textures of ETC2_EAC typeEirik Aavitsland2018-01-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The call to glCompressedTexImage2D would fail since the code did not account for the fact that the ETC2_EAC scheme uses twice the number of bytes as other ETC schemes. Change-Id: I93502f5848b112cac2f798453a0d32a2c0a2a20b Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * MSVC: Don't set a DLL base address for 64-bitThiago Macieira2018-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker complains: LINK : warning LNK4281: undesirable base address 0x67000000 for x64 image; set base address above 4GB for best ASLR optimization And it's not really required anymore, as the recommended /DYNAMICBASE is the default. Change-Id: I56b444f9d6274221a3b7fffd150caab1beecfd43 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-249-75/+87
| | |\ | | | | | | | | | | | | Change-Id: I37bc7afea415261639b71e7b8dfc9177fdd4cb62
| | | * Fix namespace builds with -no-qml-debugJoni Poikelin2018-01-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65924 Change-Id: I47b3afbb8235900156c814874d5ae2250cf13da8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Add details about URL redirection/interception to changes-5.9.4Ulf Hermann2018-01-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65834 Change-Id: I77d77b0ab628b8a90ad48f06fab0cf8025d06109 Reviewed-by: Arnaud Vrac <avrac@freebox.fr> Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | | * Doc: Do make 'Licenses and Attributions' valid for multiple Qt versionsKai Koehne2018-01-222-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt documentation is supposed to be valid for older Qt versions too. Anyhow, the generated attributions are only valid for the exact version the documentation was generated from, so make this explicit. Also mention since when the libraries are under LGPL3/GPL3. Change-Id: Iec8f67e5e43be456cc77283ca6d2a7ebe142f501 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Doc: Rename Renderer page to 'Scene Graph OpenGL Renderer'Kai Koehne2018-01-221-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the architecture might be similar for e.g. the DirectX Renderer, the details are only valid for OpenGL backend. Make this explicit by renaming the page. Change-Id: I24bf82de35099ae14eb6bfb9d58b422b476636ac Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | * Avoid repeated calls into thread local storage to get the animation timerLars Knoll2018-01-223-44/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead hold a direct pointer to the animation timer and make it's methods non static. Change-Id: I6382fd2a1c02464ddb573f0210a14c603fd932db Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
| | | * Remove another call to QOpenGLContext::currentContext()Erik Verbruggen2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | .. by getting the context from the readily available state. Change-Id: Ie2819a112b31e080a865c657d0fc63cd1968e7a3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | | * Doc: Improve "Qt Quick Scene Graph Renderer"Kai Koehne2018-01-191-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some typos and grammar errors. Change-Id: I9a3fa591ada5ec299ea1277386405944138c9ddc Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-24114-660/+1807
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/qml/compiler/qv4codegen.cpp src/qml/compiler/qv4compileddata_p.h src/qml/debugger/qqmlprofiler_p.h src/qml/jsruntime/qv4engine.cpp src/qml/memory/qv4mm.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlobjectcreator.cpp src/qml/qml/qqmlobjectcreator_p.h src/qml/types/qqmldelegatemodel.cpp src/quick/items/qquickitem_p.h src/quick/items/qquickwindow.cpp tests/auto/quick/touchmouse/BLACKLIST tests/benchmarks/qml/holistic/tst_holistic.cpp Change-Id: I520f349ab4b048dd337d9647113564fc257865c2
| | | * Fix QQmlDelegateModel::object documentationPaolo Angelelli2018-01-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is talking about item() but such a method doesn't exist anymore. Change-Id: I1935d8b9e88b27a9db1122545a2a82a42d827671 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | | * Blacklist tst_TouchMouse::buttonOnDelayedPressFlickable() on mingwUlf Hermann2018-01-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is flaky and needs to be fixed. Task-number: QTBUG-65823 Change-Id: I471754631493eed20400a2a57b7e55c5007e55f7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * Merge "Merge remote-tracking branch 'origin/5.9.4' into 5.9" into ↵Liang Qi2018-01-186-17/+144
| | | |\ | | | | | | | | | | | | | | | refs/staging/5.9
| | | | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-186-17/+144
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I2837d46455d8f82f0272b463fdf59a3fcfe53ea3
| | | | | * Use localPos for windowPos when passing mouse events to QQuickWidgetv5.9.4Ulf Hermann2018-01-173-9/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickWidget thinks of itself as a toplevel window, so it cannot process the offsets in a parent window. Amends 41293196b4db1aa7a0c616af312875c484639644. Task-number: QTBUG-65800 Change-Id: I8c5dcb8f44a6cbdb58bcc956d8263e68d8180bec Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | | | * Blacklist test_move() in tst_qquickcustomaffector on win/gccUlf Hermann2018-01-172-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is unstable. Also, print the actual numbers if the fuzzyCompare QVERIFYs fail again. This way we can see better what is going on. Task-number: QTBUG-65819 Change-Id: I65368300498382f7bfebb25299280aa15e3a56ef Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | | * Don't recreate QOpenGLContext when the application is sharing contextsAndy Shaw2018-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63304 Change-Id: Idfefb246a15166e04c0db0c894a705a7be2ecf67 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | | | * Add changes file for Qt 5.9.4Antti Kokko2018-01-081-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf69bf3bc6370aa8d402a3309f6e2337a1af208a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>