aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Android: Ignore an error when doing an incremental build4.14Andy Shaw2021-03-201-1/+1
| | | | | | | | | Since this is not really an error but it is outputted to stderr, we need to explicitly ignore it so it does not show an error dialog. Change-Id: Ia972cf134278216c317649b5483e3deac683374d Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add changes file for 4.14.2v4.14.2Eike Ziller2021-03-191-0/+54
| | | | | Change-Id: Iaec33f8ffa103c335070ec363b9943fcbde86432 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Update Qbs submodule to the top of 1.18 branchIvan Komissarov2021-03-181-0/+0
| | | | | Change-Id: I42928931324eef91b155badc687ffd5d20d63749 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Highlighter: readd autoconf highlighterDavid Schulz2021-03-181-0/+396
| | | | | | | | | | | | | It isn't in the public repository of the syntax files, but it still seems to work. Amends: 14834e6b0a4e7c1272ec3a1838b0634dd66e72ea Fixes: QTCREATORBUG-25391 Change-Id: I23819bdc79c5b4fab92b1150ed102f742a204e89 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix issues with Devel package for qmake-based pluginsEike Ziller2021-03-172-0/+8
| | | | | | | | | Add the pch files that qmake uses. On Windows, the .lib files must have the major version too, like the DLLs. Change-Id: I437bbeac0323c5b9bc174ddea8c0d9be6497b4e6 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Editors: Fix another soft assert about current viewEike Ziller2021-03-161-0/+5
| | | | | | Task-number: QTCREATORBUG-24869 Change-Id: I575153a909f398ade4dce4edbb4927ea0d35c20f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update Qbs submodule to the top of 1.18 branchIvan Komissarov2021-03-151-0/+0
| | | | | Change-Id: Ifa6522e01b32c48e830c395347e891a89c9ad35a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Prepare for clang > 9Robert Löhning2021-03-151-1/+2
| | | | | Change-Id: I4cf6e8be63568d56388b0cf87ae692735bf4c113 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editors: Fix soft assert about empty currentViewEike Ziller2021-03-151-2/+4
| | | | | | | | | | | | We need to always either have a current view or a current editor. Make sure we set the current view if we end up without a current editor when closing files. Amends ee1e6ca50821ace4323a0838452dda59b1a352a2 Fixes: QTCREATORBUG-24869 Change-Id: I9e1982697700079e037695e100ef71eadaf7849f Reviewed-by: David Schulz <david.schulz@qt.io>
* Update Qbs submodule to the top of 1.18 branchIvan Komissarov2021-03-111-0/+0
| | | | | Change-Id: Icc28aa5ac3c222a3a1bc3c018b59cb4ef73d1f6b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* More bumping of the Copyright Year to 2021Alessandro Portale2021-03-112-2/+2
| | | | | | | | Also for the qmake and qbs based build systems. Amends: 0af4f5152e7918d7e02823259482fe45b2c9c8f0 Change-Id: Ifcf1730d7b2b28dd9582d5b3569f50e3b7c91e07 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump IDE_COPYRIGHT_YEAR to 2021Alessandro Portale2021-03-101-1/+1
| | | | | Change-Id: Iadb0f2618b02cd9f36366d718d50be7efcb5f679 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* LLDB: Drop secondary lookup of native typesChristian Stenger2021-03-091-37/+1
| | | | | | | | | | | | | | | | | | | Although already tried to lookup a native type with an lldb internal mechanism we still tried to do it "manually" again. This secondary approach was needed at some point when lldb had no integrated way to lookup a type inside all modules. Lookups done manually will not provide a better result than the lldb internal one. The error output generated with this blocks debugging which makes QC unusable at this state. So, remove the secondary lookup completely. Fixes: QTCREATORBUG-25185 Fixes: QTCREATORBUG-25217 Change-Id: Ibd8a125a89633c611bf750e0f1759c639717e1d2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: hjk <hjk@qt.io>
* macOS: Fix vanishing controls in Welcome mode with macOS dark modeEike Ziller2021-03-054-5/+13
| | | | | | | | | | The example set selector and the search input field were missing some palette tweaks that were done by other classes deriving from WelcomePageFrame. Fixes: QTCREATORBUG-25405 Change-Id: I43a022aa5464a1167f94d26e945de225a436b768 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Update Qbs submodule to the top of 1.18 branchIvan Komissarov2021-03-021-0/+0
| | | | | Change-Id: Ia684a71c5b460cdbb6617e30ea218e349a8901d1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* LLDB: Do not print warnings to LocalsChristian Stenger2021-03-011-1/+1
| | | | | Change-Id: I552f75ebbb57c4af30582aa764fec75aa08df340 Reviewed-by: hjk <hjk@qt.io>
* LLDB: Fixup filtering out function signaturesChristian Stenger2021-03-011-3/+1
| | | | | | | | | Amends 2f67d75ca411ab5d4c95dde59e2f0d77a1f80e41. Task-number: QTCREATORBUG-25185 Task-number: QTCREATORBUG-25217 Change-Id: Ic22d67d742273f9a8944c64df4c8a0647c4157f4 Reviewed-by: hjk <hjk@qt.io>
* Fix a link error when building the qmldesigner pluginChristophe Giboudeaux2021-03-011-1/+1
| | | | | | Fixes: QTCREATORBUG-25152 Change-Id: I36e51f3f552b3639d77342ee56e7efe5b44497e5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake build: Fix setting WITH_PROJECT_FILE_UPDATESIvan Komissarov2021-03-011-1/+1
| | | | | | | This amends 13f466c. Change-Id: Ib555d8ac9598c25e9f526a21ff0324f334eb6594 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Help: Fix crash with previous/next document in help modeMiikka Heikkinen2021-02-262-2/+7
| | | | | | | | | | | "Previous/next Open Document in History" crashed in help mode when only a single page is open. Disable the actions in this case, and add a guard that prevents setting the current page to an invalid index. Fixes: QDS-3743 Change-Id: I569292d8c348269dd12d2ebb089c03173cbd4bc2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use GNUInstallDirs to install desktop and appstream filesHeiko Becker2021-02-261-1/+1
| | | | | | | | | c81baf1a9cc938a283f6c52c8fd10bab84183391 introduced the usage of GNUInstallDirs for Linux. Use it to install desktop files and appstream metadata, too. Change-Id: I13a363e5383e1150fd9b8d7e33d55ac53bee63ff Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Squish: Wait for the docs update progress barChristian Stenger2021-02-251-4/+6
| | | | | Change-Id: I73e80119a7e5a8d09397138d1301154af597f907 Reviewed-by: Robert Löhning <robert.loehning@qt.io>
* Bump version to 4.14.2Eike Ziller2021-02-243-6/+6
| | | | | Change-Id: I792587c71eadf0b2602d73e7fa4be324cc2766cf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update 4.14.1 change logv4.14.1Eike Ziller2021-02-231-0/+1
| | | | | Change-Id: I988aebbd52c4c6ce8b09c49ee3cd63dc63ec9513 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* cmake build: Explicitly turn on project file updates on the QtC sideIvan Komissarov2021-02-231-0/+1
| | | | | | | | | | We want to have flags consistent with the Qbs build and project file updates are disabled by default (for standalone qbs builds in Brew or choco) to avoid dependency on QtGui Task-number: QTCREATORBUG-25232 Change-Id: I217057f45519e0c92201d1b76d5b04924804aed0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Add .pri files to development packageEike Ziller2021-02-225-0/+41
| | | | | | | | | | | | | This adds at least partial, transitional support for building 3rdparty plugins with qmake against Qt Creator built with CMake. This might still miss some other .pri files that follow their own naming conventions. Fixes: QTCREATORBUG-24055 Fixes: QTCREATORBUG-25334 Change-Id: I83cc547da938976c2ec12a21a17f286b937147f7 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Debugger: Avoid looking up function signaturesChristian Stenger2021-02-221-0/+5
| | | | | | | | | | | Looking up function signatures ends up in massive stderr output which blocks the debugger for ages, so omit them as long we are not sure where they originate. Task-number: QTCREATORBUG-25185 Task-number: QTCREATORBUG-25217 Change-Id: I9b022d2194a6cb61651ee0648be526fc94a02da9 Reviewed-by: hjk <hjk@qt.io>
* Update changes file for 4.14.1Eike Ziller2021-02-191-0/+13
| | | | | Change-Id: I1855a07186e0cbbc51ca475bd525818bcb9e1bc0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QmlDesigner: Easen assert on non-fatal double qml node insertTapani Mattila2021-02-191-1/+1
| | | | | | Change-Id: I3ca0d0c5427f548e249bdc3af2fd1d8281544ba7 Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Sqlite: Fix missing typenameMarco Bubke2021-02-181-1/+2
| | | | | | | | | Some compilers are more picky than others. Amends e3d12e659a. Change-Id: Idb189658724880252e17ff1d561a13e281d2ec3a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update Qbs submodule to the top of 1.18 branchIvan Komissarov2021-02-171-0/+0
| | | | | Change-Id: I820c20cfe285c6796977b9880d05f3c7f4c80a3a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlPuppet: Fix custom 3D geometries for Qt 6.1Miikka Heikkinen2021-02-165-10/+46
| | | | | | | | Private API puppet uses for custom 3D geometries has changed. (cherry picked from commit baf3528af5f01c1d27d4539f91ef00e7da76433d) Change-Id: Ib9be20f836c7e985b850966c3bdd620cbeac246a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Sqlite: Add readTo methodMarco Bubke2021-02-155-1/+90
| | | | | | | | | There are cases when you want to read to an already existing container. This will prepare for the RETURNING extension in the next Sqlite version where you can write and read. That will simplify quite some code. Change-Id: I740ffbedecf72bb5518392f3707a0a6b2221db56 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Sqlite: Add callback methodMarco Bubke2021-02-156-3/+126
| | | | | | | | | | Sometimes it is better to have a callback instead of returning a container. The call has to manage the state if an exception is called but otherwise it will reduce the memory footprint. There will be to a RETURNING to Sqlite which will read back values as you write. Change-Id: I7eb49850e2c76f883a03277b31c5e713e9774c92 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix installation directory in plugin install wizardEike Ziller2021-02-152-5/+5
| | | | | | | | | | Correctly initialize the bool variable that decides where the plugin is installed. Fix creation of installation directory: QDir::cdUp does not do anything for directories that do not exist. Change-Id: I5ee559a663380f293046eded7a2c3efbb1023776 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Update Qbs submodule to the top of 1.18 branchIvan Komissarov2021-02-121-0/+0
| | | | | Change-Id: I459f950d0c9d1271988badcb09d4c6d4263058f9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlDesigner: Sync signal handlers when merging ModelNodeVikas Pachdha2021-02-101-0/+9
| | | | | | Task-number: QDS-3702 Change-Id: Ia4f8484b181150383b711706f5e5adc166012b69 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ProjectExplorer: Use canonical paths for compiler toolchain matchCristian Adam2021-02-101-1/+4
| | | | | | | | | | | | On Linux (Ubuntu 20.04) Qt Creator would use /usr/bin/g++ as compiler for C++. CMake would pick /usr/bin/c++ as C++ compiler. Both of them are symlinks to /usr/bin/x86_64-linux-gnu-g++-9 ammends 4ae5516453e86b64326e61b14603ed1508aeb319 Change-Id: Id50cb47ed4e728541baed6a191435f2ad0137628 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlDesigner.CapturedDataCommand: Store visible propertyThomas Hartmann2021-02-081-0/+4
| | | | | Change-Id: Idc2b4c9a859f9a9e03dea915ca98e91b4efdd488 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Wizards: Fix language string in .ts fileChristian Kandeler2021-02-081-1/+1
| | | | | | Fixes: QTCREATORBUG-25293 Change-Id: I6e0ed7d271d60e651bf7c0aacad36a2c8e0916ed Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Doc: Describe Debugger settings in appropriate sectionsLeena Miettinen2021-02-084-4/+64
| | | | | | | | Link to the "Debugger Settings" section where appropriate. Task-number: QTCREATORBUG-24500 Change-Id: I7e19211c22bf0139678d49e46db3bd2bb04c7260 Reviewed-by: hjk <hjk@qt.io>
* Doc: Move info about debugger settingsLeena Miettinen2021-02-084-195/+217
| | | | | | | | | | | ...to a separate .qdocinc file included from "Interacting with the Debugger". Change a conflicting section title in run settings docs. Task-number: QTCREATORBUG-24500 Change-Id: I6e3e205d1dfdcfabaf80fc18bd2b73c1256644e4 Reviewed-by: hjk <hjk@qt.io>
* qmlpuppet: fix crashTim Jenssen2021-02-052-2/+2
| | | | | | | | initializeView(); creates the necessary engine where we need to set the languageUi. Change-Id: Ib9f9f35e00167ce0bfe4d96ed4e66a965daea084 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMakeProjectManager: Do not use dynamic allocation for CMakeToolCristian Adam2021-02-051-6/+6
| | | | | | | ammends 87197be604e3c5f8bf39e9aa11fdfea88b6eab75 Change-Id: I600c0c26b3301607360f93ff6075f7c7d4a1b438 Reviewed-by: hjk <hjk@qt.io>
* CMakeProjectManager: Do not report CMake as invalid when adding/cloningCristian Adam2021-02-051-3/+9
| | | | | | Fixes: QTCREATORBUG-25250 Change-Id: Ic78a5645540145977c7ff0b05d8d7a5c3fc15fda Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core: Do not remove context objects during shutdownEike Ziller2021-02-051-0/+2
| | | | | | | | | | | | | | | | | | Like we suppress context updates during shutdown also disconnect from the context object's destroyed signal. At that point we don't care anymore. This also avoids issues if the context object lives as the child of a widget in the MainWindow geometry. These widgets (and respectively their children) are destroyed only in the QObject destructor, i.e. after the MainWindow itself already destroyed all its members, including the m_contextWidgets map. Amends 6d97c1fcb1f0a8c712d902065a887f8b74c61cf4 Fixes: QTCREATORBUG-25310 Change-Id: I75db6f8783b5f62aa9805b69d4d2bba07b906a5b Reviewed-by: David Schulz <david.schulz@qt.io>
* McuSupport: Remove explicit appointment of Jom as CMAKE_MAKE_PROGRAMAlessandro Portale2021-02-041-14/+0
| | | | | | | | | | | | | | | | Detecting the presence of Jom, setting CMAKE_MAKE_PROGRAM to it and choosing "NMake Makefiles JOM" as CMake generator was implemented in a time where the Qt SDK did not yet ship ninja. By now, ninja is shipped and it *should* be automatically installed as dependency of Qt for MCUs. Qt Creator will by default prefer ninja as generator/buildtool if it is installed. Task-number: QTMCU-18 Change-Id: Ia83ac3a454b90bb5b5b69ddefb3fbb8f23fa15c9 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <christiaan.janssen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Meson plugin: Fix segfault when switching build typeAlexis Jeandet2021-02-041-1/+1
| | | | | | Change-Id: I837e0a7ba8dd731438d36cfb766fd60c9643be73 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix build for Qt5.14Christian Stenger2021-02-041-0/+2
| | | | | | | Amends 59488d96067. Change-Id: I70fd3f962de5abb6254a406263df2ea61c7e9bcc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qmlpuppet: call engine()->setUiLanguageTim Jenssen2021-02-031-0/+2
| | | | | | | so qml components can react on it Change-Id: I31dc46fabeef0936accd23ed22cbebfe2cd8663c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>