summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50Tim Jenssen2020-05-27102-215/+341
|\ | | | | | | Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33
| * Utils: Use QRegularExpression in fileutilshjk2020-05-271-7/+7
| | | | | | | | | | Change-Id: I48b192630e52ff3825bcb401a19faef59e846da3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * McuSupport: Qul v1.2 adjustmentsAlessandro Portale2020-05-278-13/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bump supported version from 1.1 to 1.2 - Look in Qul_DIR/kits for boards json files (UL-2390) - Remove "pragma main;" from app template main qml (UL-1708) - Add a main.cpp for BareMetal and FreeRTOS each (QTCREATORBUG-24063) - Removed ambiguous armgcc download link (QTCREATORBUG-24052) Task-number: UL-1708 Task-number: UL-2390 Task-number: QTCREATORBUG-24063 Task-number: QTCREATORBUG-24052 Task-number: QTCREATORBUG-24079 Change-Id: Ieb3d0c22b9099b12f91096b5a90c6e84698be788 Reviewed-by: Christian Kamm <mail@ckamm.de>
| * Doc: Improve usage of terminology related to embedded devicesLeena Miettinen2020-05-2719-43/+46
| | | | | | | | | | | | | | | | Make a distinction between "Boot2Qt" and "generic remote Linux" devices. Use "embedded devices" as a more general term. Change-Id: Ice06e6737d6baca001a2a13a6cec7be7624dff2e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Utils: Add another missing #includehjk2020-05-271-3/+3
| | | | | | | | | | | | | | | | | | Some implicit QActionGroup inclusion is gone in Qt dev. Also, sort includes. Change-Id: Ie6726daf28a4d21a54225c4606cebfc3b81895ba Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Utils: Add missing #includehjk2020-05-271-0/+1
| | | | | | | | | | | | | | Some implicit QSet inclusion is gone in Qt dev. Change-Id: I473b423baabdde8d7e3369a6e883eefeb11d02d9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * remove variant.hpp errorTim Jenssen2020-05-271-2/+0
| | | | | | | | | | | | | | | | So this can be used with a Qt 5.15 build outside of QtCreator. Change-Id: I691687bf661be21d9c28f13a52ff5df58bb7412a Reviewed-by: hjk <hjk@qt.io>
| * Doc: Resize front page images to remove scrollbarLeena Miettinen2020-05-2640-33/+90
| | | | | | | | | | | | Change-Id: I8555bd5f7952530a02d57be436fc27c8a04de0be Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Debugger: Drop unnecessary use of ModuleNotFoundErrorhjk2020-05-251-1/+1
| | | | | | | | | | | | | | | | | | That's Python 3 only, and doesn't add value here. Change-Id: I9b1702ea8b0b0ddb090fdfc393228b4430da0b07 Task-number: QTCREATORBUG-24004 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * WebAssembly: Fix run configuration for Qt 5.15 app with emsdk 1.39.xAlessandro Portale2020-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With Emscripten SDK 1.39.x, emrun quits and shuts down the web server before the complete WebAssembly application can be fetched by the browser. Adding "--serve_after_close" to the emrun call restores the original behavior. That parameter is accepted by previous Emscripten SDK versions and seems to not change how it used behave in earlier versions. Task-number: QTCREATORBUG-24072 Change-Id: Ie43604d42eb9c5a7cccd09fdf1c33391dc31098d Reviewed-by: hjk <hjk@qt.io>
| * Locator: Fix regression of filesystem lookup with line/columnOrgad Shaneh2020-05-251-2/+5
| | | | | | | | | | | | | | This amends commit 40921421ae7d6ad7c7644e0f7ffe900ccd70ee5e. Change-Id: Ib546813e77395c8816758f9adb21a71f072abd49 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * qbs build: Clang: Adapt llvm-config variants to check forNikolai Kosjar2020-05-221-1/+2
| | | | | | | | | | Change-Id: Ib961efe9b72acdfc383cade2053a4a1126e99132 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * QmlPreview: Don't use MainFileAspect if it doesn't existUlf Hermann2020-05-221-15/+16
| | | | | | | | | | | | | | | | | | We only need to choose the main file if we're dealing with a qmlproject. Fixes: QTCREATORBUG-24056 Change-Id: I5b5dfa29a46fa07de7ee570fa033d978e72dfdb5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io>
| * CppTools: Fix license file path persistencehjk2020-05-221-0/+1
| | | | | | | | | | | | | | | | Broke with ea6da69e8. Fixes: QTCREATORBUG-24024 Change-Id: If097c4bc824c1a6b6c005bcf32aef09229804be2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * ClangTools: Fix referencing wrong counter for summary textNikolai Kosjar2020-05-221-1/+1
| | | | | | | | | | | | Fixes: QTCREATORBUG-23585 Change-Id: Icb3002434a728bd0d157190b7079b35bb639d0df Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Bump version to 4.12.2Eike Ziller2020-05-223-6/+6
| | | | | | | | | | Change-Id: I734d8571ab672cbbccaebe6d3d1a97cd15f31831 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * CompilationDbPM: Do not change the kit's toolchainChristian Kandeler2020-05-201-2/+0
| | | | | | | | | | | | | | | | Amends 45d42d4518. Fixes: QTCREATORBUG-24047 Change-Id: I115eaf06fb3c055069918d20f360bd027f15d680 Reviewed-by: hjk <hjk@qt.io>
| * Doc: Update information about supported devicesLeena Miettinen2020-05-204-48/+30
| | | | | | | | | | Change-Id: I17aed738f147dedee69acaa9c3794394f92d12d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Git: Fix upstream status for branches with slashOrgad Shaneh2020-05-191-5/+11
| | | | | | | | | | | | | | Like wip/foo Change-Id: Ia2816660f7878e872b2e49c4811f5893a1b8dc75 Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * Squish: Remove pastecode.xyz from testsChristian Stenger2020-05-191-2/+1
| | | | | | | | | | | | | | | | Service is unavailable. Task-number: QTCREATORBUG-24002 Change-Id: I012681ec1ec1deb30387e1762fe72a877e56fa10 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| * Mcu: Remove unused functionshjk2020-05-191-24/+0
| | | | | | | | | | | | | | | | Last and only users are gone with f08fe165ab586e61. Change-Id: Id5ff577ce3d1c8c47269536eca2140c9340c5b03 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Android: silence assert in AndroidExtraLibraryListModelv4.12.1Assam Boudjelthia2020-05-181-1/+2
| | | | | | | | | | Change-Id: I57f2f8d6df3eb2b726b7056569d5e8f809e81177 Reviewed-by: hjk <hjk@qt.io>
| * Android: make sure to remove the adb daemon logs from devices listAssam Boudjelthia2020-05-182-4/+7
| | | | | | | | | | | | Fixes: QTCREATORBUG-21797 Change-Id: I9153a5b2a0da4826179b436945fcc4616d65bb25 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Doc: Fix typo "sependencies" > "dependencies"Leena Miettinen2020-05-181-1/+1
| | | | | | | | | | Change-Id: I1d3f3f0bbdcff3d557038d8feca5ffe234d58314 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Ensure QDoc finds Qt Design Studio examplesTopi Reinio2020-05-1811-1/+1
| | | | | | | | | | | | | | | | | | | | The name of the example project directory must match with the project file name and the \example command argument. This is case sensitive on platforms other than Windows. Change-Id: Ie6fa6934ee444b42f024ebf00d6a9b20dfd6abce Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Update change log for 4.12.1Eike Ziller2020-05-181-0/+39
| | | | | | | | | | Change-Id: I25cce97a5a0a871e24c8898f3bb37e09199a9872 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Android: use latest ndk version instead of ndk-bundleAssam Boudjelthia2020-05-181-2/+2
| | | | | | | | | | | | Fixes: QTCREATORBUG-23903 Change-Id: Iae3561818d86952dad9209d55984c82498d07575 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0Tim Jenssen2020-05-1556-434/+576
|\ \ | |/ | | | | Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
| * Build script: Add option for passing arguments to build commandEike Ziller2020-05-151-1/+6
| | | | | | | | | | | | | | So one can pass e.g. -j3 when locally testing while still doing other things Change-Id: I7a528884f19698290e49c372eb31030afe609d23 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Doc: Update information about views for editing 3D assetsJohanna Vanhatapio2020-05-152-43/+27
| | | | | | | | | | | | | | | | Task-number: QDS-2056 Change-Id: Iee6aab42c4cd6d97d99eafc3599e55828f0d9657 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Update information about project wizardsLeena Miettinen2020-05-155-44/+49
| | | | | | | | | | | | | | | | | | | | Qt Quick 3D, Flow Item and Flow view wizards have been added, the Qt for MCUs wizard is now included in Qt Design Studio, and the font loader wizard has been removed. Task-number: QDS-2056 Change-Id: Ie5d42320661977d57767c3bf58fd480e7d6c3c8d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Doc: Update information about 3D EditorJohanna Vanhatapio2020-05-1510-111/+130
| | | | | | | | | | | | | | Change-Id: I047b96e1db411ccbbe73a94f701cc7e632bc98c9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * McuSupport: Fix compile for gcc 5.3Christian Stenger2020-05-151-4/+4
| | | | | | | | | | Change-Id: I389330addba4b4516eb5da8f72b41b56f612888a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * ClangTools: Fix crash when starting the analyzer againNikolai Kosjar2020-05-152-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address a nullptr dereference of m_runWorker in ClangTool::updateForCurrentState() for the case described as (C2) below, reproducible with "./qtcreator -test ClangTools". Two use cases are connected to this: (C1) Run the analyzer twice with clearing app output pane in-between (C2) Run the analyzer twice without clearing app output pane in-between Relevant observations in this context are: (O1) Closing the app output pane destroys the RunControl/RunWorker. (O2) Running the analyzer a second time will first create a new RunControl/RunWorker, then destroy the old one. Now, the change ClangTools: Avoid accessing deleted run worker This reverts commit d02f5664e53df41ff7156eb46069e339479074d2. fixed a use-after-free-crash for (C1), but introduced a nullptr-deref-crash for (C2) as it resets m_runWorker to nullptr on RunControl destruction, which conflicts with the order mentioned in (O2). To fix both use cases, revert the mentioned change and access m_runWorker only when we know that it exists for sure - right after signal emission. Change-Id: I034f0905d635b15c0c6bbe499648b62d5a058c04 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Doc: Update information about Scene Environment propertiesLeena Miettinen2020-05-141-6/+5
| | | | | | | | | | | | | | | | | | | | "Blend mode" field seems to have been removed. The Skybox option has been added to "Background mode" field. Task-number: QDS-2056 Change-Id: Ie5c5b5fae4aba83bd8b9b50357bb83d58fbb69c2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * McuSupport: Read supported targets from SDK .json filesAlessandro Portale2020-05-143-89/+148
| | | | | | | | | | | | | | | | | | ... Replace the current hard-coded list of supported (non-Desktop) targets. Task-number: UL-2012 Change-Id: I65851d11eea9f62635d56c42788caeae8a77a4f3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Debugger: Work around for gdb reporting zero array sizes in some caseshjk2020-05-142-5/+11
| | | | | | | | | | | | Task-number: QTCREATORBUG-23998 Change-Id: I101d032705b66faf50260067f6aa604214f09298 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Doc: Move Qt Bridge product name macros to the common macros fileLeena Miettinen2020-05-142-4/+3
| | | | | | | | | | | | | | ..from the Qt Design Studio Manual doc configuration file. Change-Id: Iebbfb5404cae4ef277f05c867e7259997b19a27e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Fix availability of "Link with Qt" info barEike Ziller2020-05-143-8/+33
| | | | | | | | | | | | | | | | | | The info bar should never appear if the button is disabled, for example because the Qt Creator directory is not accessible. Fixes: QTCREATORBUG-23900 Change-Id: I819c87f5ca51f69f34bd462fca8e877be3544100 Reviewed-by: hjk <hjk@qt.io>
| * ClangTools: Fix placeholder in tr()Nikolai Kosjar2020-05-141-1/+1
| | | | | | | | | | Change-Id: I90727287ebdbe12b8e422e7e91adc9f3e5abafbd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * ProjectExplorer: Ensure that the session model stays sortedChristian Kandeler2020-05-132-0/+6
| | | | | | | | | | | | Fixes: QTCREATORBUG-23996 Change-Id: I96c8c1b780f5b56cb064146de3de6a4c90f9147a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * LSP: Fix wrong assertDavid Schulz2020-05-131-1/+1
| | | | | | | | | | Change-Id: If1015ba4f1d5519ac379e4c4b1cca8ffbf2c52ae Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Add library export documentation for Sketch Qt-bridgeVikas Pachdha2020-05-132-0/+20
| | | | | | | | | | | | Task-number: QDS-2046 Change-Id: Idca24fdac106da1b6631518ddd9bb9fa7253a8c7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Remove link to non-existing tutorialLeena Miettinen2020-05-131-1/+0
| | | | | | | | | | | | | | Part 5 is still a work-in-progress. Change-Id: I7c8cd07be3921b9fd36eeb913d9e393e6f15d895 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Doc: Remove extra copies of images that were movedLeena Miettinen2020-05-133-0/+0
| | | | | | | | | | | | | | | | They are now in doc/qtcreator/images. They seem to reappear here during merges. Change-Id: I7dc0b58997996601be7e54fb0a45898f0a5718a7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Squish: Don't expect pastes to pastebin.com to appear in listRobert Loehning2020-05-121-2/+6
| | | | | | | | | | Change-Id: I02a73244e3aecad906f2c08b37d60ebe1880f534 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Doc: Update info about States viewLeena Miettinen2020-05-126-61/+61
| | | | | | | | | | | | | | | | | | Check terminology, restructure information, and update screenshots. Task-number: QDS-2056 Change-Id: Ieaa2d0856bf2d310f67d8c0d9f9376a48cf33534 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Doc: Update screenshot of Properties view in Design modeLeena Miettinen2020-05-122-1/+1
| | | | | | | | | | | | | | | | | | ...and remove the numbers from the image and text, as one can easily see the item type. Task-number: QDS-2056 Change-Id: I821db7a0f3a4ff1999c58701f379ae3667821a0a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Doc: Update info about QML types supported by Qt Quick DesignerLeena Miettinen2020-05-126-44/+48
| | | | | | | | | | | | | | Update screenshots. Change-Id: If079a93940dc103b4afa283f01c94825d895bfa3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QbsProjectManager: Fix potential null pointer accessChristian Kandeler2020-05-121-1/+1
| | | | | | | | | | | | | | | | | | We retrieved the watcher result from the wrong pointer. Fixes: QTCREATORBUG-23924 Change-Id: I876d8adc0aef011deb3f5827f3e50c43a8d92dfc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
View Lorry Controller Status