aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Fix casting of <cpp>.boolqds/v2.2.1Thomas Hartmann2021-10-151-0/+2
| | | | | | | | | Font.bold is of type <cpp>.bool and we did not recognize it. Task-number: QDS-5274 Change-Id: I420dc62e1f1dc8b9e22a2c0678c882a72d8b0907 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* ImageViewer: Fix crash when opening invalid movieEike Ziller2021-10-071-1/+9
| | | | | | | | | | | | | | | Qt 6 sends the finished signal directly from QMovie::start, so if we connect QMovie::finished directly to QMovie::start, we end up in an endless recursion and stack exhaustion. Use a queued connection, and do not restart a movie if it went invalid. Fixes: QTCREATORBUG-26377 Change-Id: I9980615f44d0cf7e92f85c010427bd6b67046949 Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* qmljseditor: fix crash at shutdownTim Jenssen2021-10-061-2/+1
| | | | | | Change-Id: Ifae7ec5f378c0b2d3e667bd26a509fbcbefadecf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* QmlDesigner: Remove x,y when setting center anchorsThomas Hartmann2021-10-051-0/+4
| | | | | | Change-Id: Id6cde717f8a6fe66ac78c65e2e1ac387ec6d3c1d Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Work around QRegularExpression crashes on macOS with RosettaEike Ziller2021-10-041-0/+5
| | | | | | | | | | | | Looks like the regular expression jitting is not reentrant when running under Rosetta for some reason. It was crashing when loading bigger subdir .pro files which regular expressions in it, like qtcreator.pro. Disable JIT if we run under Rosetta. Task-number: QTBUG-97085 Change-Id: Icbab1ca8f62afa9cc86045983e84087a7694b5ad Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* QmlDesigner: Do not mark file as changed for "formeditorColor"qds/v2.2.0Thomas Hartmann2021-09-301-1/+1
| | | | | | | Task-number: QDS-4044 Change-Id: I52a3707edeee8c2204fb67d8101d2a0e99af06ae Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Allow resolvedUrl in ui.qml filesThomas Hartmann2021-09-301-1/+1
| | | | | Change-Id: I220582466ffe62392b78419b9a2f6b83cf73f9af Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* Git: Take Prepend to PATH into account again, take #2v5.0.2hjk2021-09-291-3/+3
| | | | | | | | | | Amends b5a4d38022, which uses FilePath::searchInPath which does not exist in 5.0. Task-number: QTCREATORBUG-26329 Change-Id: I94ac35cc95a47e4f82c6205ad24d8bdc69ddf1af Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* TaskHub: Add #include <QThread>hjk2021-09-291-0/+1
| | | | | Change-Id: I395252692fedb547bc0927f2c2838d674bbd56ee Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Git: Take Prepend to PATH into account againhjk2021-09-292-1/+8
| | | | | | Task-number: QTCREATORBUG-26329 Change-Id: If4ac35cc95a47e4f82c6205ad24d8bdc69ddf1af Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Don't call TaskHub::addTask() directly from non-main threadJarek Kobus2021-09-292-5/+13
| | | | | | | Fixes: QTCREATORBUG-26335 Change-Id: I23323edd32fa1f8d5d49943e3b4c37a305e53dd2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update Qbs submodule to the top of 1.20 branchIvan Komissarov2021-09-281-0/+0
| | | | | Change-Id: I39d2bd127b0dc75d24614fd1a30b50be71a8d4ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Fix widths distributions in project welcome pageAlessandro Portale2021-09-271-3/+2
| | | | | | | | | | | | | | | | | The widths of the "Sessions" and "Projects" lists are not well distributed on Full HD screen width. The sessions are squeezed and the projects are extra wide. Set a stretch factor also on the Settings widget, so that both stretch proportionally. Use a 1 to 3 ratio. This change also removes the setting of struts which does not appear to have any effect and was (by mistake?) assigned to one sublayout, twice. Fixes: QTCREATORBUG-26319 Change-Id: I365a6a6c5d9c2250e3f711cc139d3279f2f5e3b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Core: Polish welcome screen grid hover animationAlessandro Portale2021-09-241-11/+21
| | | | | | | | | | | | | | * Fix offset calculation (arrived at top in less than 200ms) * Use "OutQuad" easing for the speed of the sliding text * "Fade in" separator line and description during animation * Animate covering of image by background color * Draw rectangles with qdrawutil (fixes HighDpi) * Change refresh timer from 5 to 10 ms Change-Id: I53899227d875a3faf086ebc6b3d83e5eb9dcaa12 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger: Fix debugging of terminal apps with GDB < 10Orgad Shaneh2021-09-241-3/+9
| | | | | | | | Fixes: QTCREATORBUG-26299 Change-Id: I96ed413a4722799090307e6682d2ec70f4de9b56 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Modes: Temporarily re-add a removeMode functionEike Ziller2021-09-244-0/+30
| | | | | | | | | | | | | | | | | | | | | Partially reverts 6a142dfd95ab497c1fe247cd4289affa13444577 Looks like this was used by 3rdparty plugin(s) for a mode that is only useful for some time and then should not be shown again. Re-add removeMode from before 5.0, but do not trigger that automatically from the mode destructor, so it doesn't interfere at shutdown. This patch is just a binary compatible partial revert. Since removeMode is broken in several aspects (e.g. corresponding commands are not removed) and we don't really support adding and removing modes during runtime, this should be replaced later on by a different way to handle the usecase, like a "visible" property for modes, which could be useful in other ways too. Fixes: QTCREATORBUG-26270 Change-Id: Ief2a36d94bd09b0511a14f528b33fdbcc4c4222b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* CMake: NinjaPath was never supposed to be written to the settingsEike Ziller2021-09-231-0/+7
| | | | | | | | | | | | | | | | It is a value written by the installer, and to be read from the install settings. Writing it to the local user settings breaks it if the user uninstalls Qt and installs it at a different location. Also add a temporary fixup, removing the setting from the local user settings, if it was already written there. Amends beda74932642c730f1fb24d1ac2a9617f5b10a40 Fixes: QTCREATORBUG-26289 Change-Id: I27652031b13aaf17a5daff3bfba1312bf1158ec7 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* CMakePM: Display <File System> tree node only on failureCristian Adam2021-09-224-18/+11
| | | | | | | | | | Fixes: QTCREATORBUG-25994 Fixes: QTCREATORBUG-25974 Change-Id: I383fe5c28d1f71c8f7939bc9fe4f1f0bf1d6a01b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit 36a0151c6d041a82203c40b4d8b6a800d04e361b) Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Update Qbs submodule to the top of 1.20 branchIvan Komissarov2021-09-211-0/+0
| | | | | Change-Id: Ic9f108b1f0c96ee82bacb78da3c14998e95e53d3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Implement heuristics for parsing version numberJarek Kobus2021-09-211-12/+49
| | | | | | | | | | Similar solution exists in QtHelp module: QString QHelpDBReader::qtVersionHeuristic() const Fixes: QTCREATORBUG-26292 Change-Id: I9037785920e25428db0fa7f03f737c5ef66c4ac3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix QtProjectImporter test for Qt 6.2 versions in PATHEike Ziller2021-09-211-6/+45
| | | | | | | | | | | | | In Qt 5, qmake is statically linked to the bootstrap library, so just copying qmake somewhere results in a runnable executable. In Qt 6 this changed, and qmake depends on the dynamic QtCore library, and on Linux also on ICU. Copy these in addition to the qmake executable. Keep the directory structure as in Qt, so the dynamic linker finds them. Change-Id: Ie4f6b617bc91d847b1e4fe38dc8a1c603eae4087 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* MSVC: Fix C4996 in sqlite3.cKai Köhne2021-09-201-0/+1
| | | | | | | | | | | | | Fixes warnings sqlite3.c:43154: warning: C4996: 'GetVersionExA': was declared deprecated sqlite3.c:43164: warning: C4996: 'GetVersionExW': was declared deprecated We know that we're running on Windows NT based versions (the default), so we can as well skip this check. Change-Id: Idd7db098645060bf8b9e449e59904f2f63fb0e0a Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update Qbs submodule to the top of 1.20 branchIvan Komissarov2021-09-171-0/+0
| | | | | | Change-Id: I1b00b572cb009b9b43fe505659fe6821665e46fe Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* StudioWelcome: Register help for qtquick3dThomas Hartmann2021-09-171-5/+7
| | | | | Change-Id: I6b5b8da97299341b262d09307a2adb03f7219b83 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Reaper: do not disconnect process before reapingCristian Adam2021-09-172-2/+3
| | | | | | | | | | | | | AbstractProcessStep is relying on signals which breaks with the disconnect call. Amends ebae255e49cd2c5411f6948417e0d927dd020525 Fixes: QTCREATORBUG-26271 Change-Id: I16ebaad68352be5c41492e5c4d4fbc3f032e2e39 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Populate targets list on add new build stepCristian Adam2021-09-171-0/+3
| | | | | | | | | | | | | | | The target list was recreated when the parsing of CMake project finished. But for already configured projects, the list was not used when a new build step was added. This new step will only get the targets list when the CMake project would be reparsed. Fixes: QTCREATORBUG-25759 Change-Id: I54d12a71dacf9fcec2ad0f3e341fe8057880251d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit a88f1426c3c08e4066ef642e2aac8c803db15bb4) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Allow loading of projects that do not have any targetsCristian Adam2021-09-171-7/+0
| | | | | | | | Fixes: QTCREATORBUG-25509 Change-Id: I4e56576f0d9fdffa50c81f4901fb30d17952553e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 86825283ed7e38ed78ff0e76c755a027b2da461f) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmake: Fix crash with Qt 6 when canceling parsingEike Ziller2021-09-172-6/+7
| | | | | | | | | | | In Qt 5, QFutureWatcher::isFinished was only true if the finished signal was already sent. That changed in Qt 6, where it represents the state of the QFuture instead. Use an explicit bool for representing "finished signal was sent" instead. Task-number: QTCREATORBUG-24098 Change-Id: I4dd8e1c7f6659b2856634d522fb1c0f7eef6741b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Welcome: Remove spacing between the link buttons on Welcome screenAlessandro Portale2021-09-171-2/+1
| | | | | | | | | | | | | | The 5-pixel spacing causes the sensation of flickering while hovering over the buttons. Other elements on the welcome screen (recent projectsm sessions, etc.) don't have spacing, and therefore, the hovering feels "smoother". This change removes the spacing and compensates that by increasing the link height accordingly. Fixes: QTCREATORBUG-26275 Change-Id: I0159d65d941971c169faf2f156cd4f8c0ddd365c Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* ClangTools: Adjust test filesChristian Stenger2021-09-163-5/+16
| | | | | | | | | Qt6 handles multimedia and multimediawidgets as add-on modules, so they get installed only if explicitly checked while installing. Make them optional for testing Qt6 as well. Change-Id: I33b0686a61bf20ace790aa0c2bc27a5219d30aac Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlDesigner: Include the ID in the invalid ID messageMahmoud Badri2021-09-162-7/+7
| | | | | | Change-Id: Ieacf36991cbe5e5f96cdc8dc26413cbbaec25608 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CompilationDatabaseProjectManager: Fix unexpected double emit of signalChristian Kandeler2021-09-162-6/+14
| | | | | | | | | | | | Do not rely on QFutureWatcher::isFinished(), which triggers a crash in the plugin unit test with Qt 6 (race condition?). Change-Id: I379d894ebd4a28a64b1e70e0cee6eef9ab720a14 Reviewed-by: Christian Stenger <christian.stenger@qt.io> (cherry picked from commit 32541fef3b01c5a2430a59ee110587fa19dd3689) Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Decrease timeout for capture imageMarco Bubke2021-09-161-1/+1
| | | | | | | | It was 10 min. Now it is 10 s. Task-number: QDS-5077 Change-Id: I703721d08631590102611c5779929fdeae47d971 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
* Android: Handle Qt 5 CMake projects target build dir retrievalAssam Boudjelthia2021-09-163-12/+32
| | | | | | | | This makes sure that Qt 5 CMake android projects return the build dir and not the android build libs folder. Change-Id: I675e2ea2946beb63bbe08b9bf4b7d9603c386f09 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Fix floating dock widget behaviorHenning Gruendl2021-09-151-1/+1
| | | | | | | | | | Fix floating dock widget being covered by the main window if not having focus on macOS. Task-number: QDS-3144 Change-Id: I25230819a567a5582b97a0a52f0e46594dbab6ea Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Android: fix for retrieving the path to deployment file and build dirAssam Boudjelthia2021-09-158-32/+77
| | | | | | | | | | | | | | | The Android deployment file for CMake project was constructed based on the main project target and thus was always expecting the file to be under the build folder root path. This makes sure the correct path to the output path is retrieved. This practically different problems with running examples when the main project is a Qt module, for both qmake and cmake. Fixes: QTCREATORBUG-25793 Change-Id: I5fdedd94c7c4c84c351c28476ca14b0f95f99f22 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* AutoTest: Silence soft assertChristian Stenger2021-09-151-1/+1
| | | | | | | | | | | | We synchronize the test tools now earlier and may not have finished setting up the configuration of the current project. This means the project might have no valid target yet. Amends 481070d8080f. Change-Id: Ic0c1817318a343e68587930c492397a6094a4ce2 Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Provide a descriptive message for invalid IDsMahmoud Badri2021-09-143-2/+28
| | | | | | | | Fixes: QDS-5044 Change-Id: I12f78851f5200e417fe6f323a0773587400cd90f Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix bug in mime type magic rules with Qt 6.2Eike Ziller2021-09-141-4/+5
| | | | | | | | | | | | | | | | | | | | | There was a bug in the copying and comparison of mime magic rules, that did not copy/compare the sub-rules. With Qt 5 this was probably never actually used, because we save the magic rules in a QList, and that didn't use MimeMagicRule as "values", but internally used pointers to heap-allocated objects, so e.g. appending a list of rules to another list of rules would only copy the pointers to the actual objects (as long as the items were never modified). In Qt 6, QList has the same semantics as QVector, so MimeMagicRule is actually used as values, which uses the copy operations. As a result, the moment the MimeMagicRule was copied from the parser to the mime type, it would loose its sub-rules. Which breaks the whole mime magic logic, and leads to wrong mime type resolution, e.g. for *.ui files. Change-Id: I90c46264423f18f73a6efc01887a0b8b6199d35d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* sdktool: Fix sanity check for Qt 6Eike Ziller2021-09-131-2/+2
| | | | | | | | | | | | | | Qt 6 happily converts a QString into a QVariantList, so the check if the existing value is convertable to a QVariantList is no longer strict enough. Utils::PersistentSettingsWriter/Reader luckily only uses QVariantList explicitly, so instead check if the type matches QVariantList explicitly. Change-Id: I52858308db3b0bef518d2b1b370668f0f4845d73 Reviewed-by: Alp Öz <aoz@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* WebAssembly: Fix emcc execution for some emsdk versions on LinuxAlessandro Portale2021-09-101-1/+1
| | | | | | | | | | | | | In order to run emcc 1.39.8 on Ubuntu 20.04., the PATH environment variable must not be empty, because the emsdk wrapper scripts depend on it. Therefore, in WebAssemblyEmSdk::version(), we don't start anymore with a clean environment bu with the related device environment. Task-number: QTCREATORBUG-26199 Change-Id: I8b7603ef8126ebaef0fa4ed9e254296623c945e9 Reviewed-by: hjk <hjk@qt.io>
* iOS/CMake: Fix building for iOS deviceEike Ziller2021-09-101-26/+23
| | | | | | | | | | | | | | Fix detection if a kit is an iOS kit. iOS device kits do not have a device set, if no device is currently connected. So we would end up with the normal desktop macOS CMake configuration instead of the special iOS one. Just check for the device type like before, and guard the else branch with its own check for macOS target device. Amends a71d725e46cf694867400be2bd079b699e62301a Change-Id: I829e549e5743ec2b358713f2df6d9cd5e32f6b70 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Migrate to fixed add_shaders prefix handlingLaszlo Agocs2021-09-102-0/+4
| | | | | | | | | One way to get rid of the "qml" in there is to use BASE. An alternative would be to update the file paths in the source code. Here we chose the former. Change-Id: If49cb584aea022d5d74b2348ec99ed831b715111 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* StudioWelcome: Remove cluster tutorial videosThomas Hartmann2021-09-106-30/+0
| | | | | | | | | Those videos are outdated. Also removing the thumbnails. Change-Id: I07e3215db8a47d9f2e8b28f187b529b81630a4dd Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Limit Style switch in MCU modeAleksei German2021-09-091-0/+5
| | | | | | | Task-number: QDS-4954 Change-Id: Iba840ec00c938c09f79c390f0d81fa3006b4f7a9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Clangd: prevent adding refactorings for outdated documentsDavid Schulz2021-09-091-0/+3
| | | | | Change-Id: I658662dca345e1ae209a4d74e145b59c44417b00 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlJS: Fix crashChristian Stenger2021-09-091-3/+5
| | | | | | | Fixes: QTCREATORBUG-26151 Change-Id: Ibfc2a17f0eb8eb7c4804045dba9a1963249ba860 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* Docker: Fix conditionChristian Stenger2021-09-091-1/+1
| | | | | Change-Id: I28c845ebd5a04e13cb109af03f6094306da64394 Reviewed-by: hjk <hjk@qt.io>
* Fix handling of aab checkbox in apk build stepAssam Boudjelthia2021-09-091-1/+1
| | | | | | | | | | | | Loosen the condition for enabling the aab builds and make it available for any Qt version from 5.14 and above, since Google now require apps to be packaged as aab to submit to the store, and Qt 6 always has an aab target anyways. The multi-abi is coming for Qt 6.3 though, but aab builds could still be allowed now. Change-Id: If7c7b40c2d01cfe9c2887dc5aa17af48a37af43a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Fix build type for multi-configuration generatorsCristian Adam2021-09-091-9/+10
| | | | | | | Fixes: QTCREATORBUG-26079 Change-Id: Ia849cfcea6f3fb10d791ad32c32413d95aa31569 Reviewed-by: Alp Öz <aoz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 05:56:11 +0000