aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update 4.13 change logv4.13.0-beta1Eike Ziller2020-07-101-0/+5
| | | | | Change-Id: I2d87a104bc0a4a90a8da644686545bc093689e0d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AutoTest: Correct completing test run configurationChristian Stenger2020-07-102-12/+11
| | | | | | | | | | | | | Ensure all possible project parts are taken into account when gathering build system targets. When having multiple possible build system targets for a test - which may easily happen e.g. when defining tests beside the main application inside a big top-level CMakeLists.txt - let the user decide which one to run. Fixes: QTCREATORBUG-24268 Change-Id: Ia7b7e4148fe8e8dab55832c435f12cc78f5c2f7a Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Fix wrong caching of text layoutChristian Stenger2020-07-102-1/+4
| | | | | | | | | The text layout must get recalculated also when the width of the underlying model index has changed. Fixes: QTCREATORBUG-24236 Change-Id: I4ded56832c765320b6845cf35ad61453875dad50 Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Output slot names in debug viewThomas Hartmann2020-07-091-0/+6
| | | | | Change-Id: Iad37f28e85818228ca264f53c7757a1ff6a0e183 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Clang: Fix error when including float.h with mingwChristian Kandeler2020-07-094-17/+104
| | | | | | | | | | | Prevent mingw from trying to #include_next a private header from a path we cannot add to our list of includes. Fixes: QTCREATORBUG-24251 Task-number: QTCREATORBUG-24027 Change-Id: I18a9db130b9c2265cd208c3506d08d2e1c4cee45 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QmlDesigner: Remove curly braces from states codeThomas Hartmann2020-07-091-2/+4
| | | | | | | | This is not required and looks ugly. Change-Id: Id0e5adabaff2cd16fb8e457e93a2ee71fb323416 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Clang: Fix handling of paths inside common pri fileChristian Stenger2020-07-091-2/+4
| | | | | | | | | | contains() expects a regular expression as value, so using a bare windows path may be a bad idea. Beside this fix the LLVM_INCLUDEPATH which is reported wrong already by llvm-config. Change-Id: I95aa3e461541099aac6607c4a8db8a38f9b2b0f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* ClangTools: Fix icons in the DiagnosticsView context menuAlessandro Portale2020-07-091-3/+4
| | | | | | | | "Online" instead oof "info" Foreground-colored variant of the filter icon. Change-Id: I88cd824632de4152b4b9153403bd0512417d46dc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbs build: Fix linking ClangFormat on WindowsChristian Kandeler2020-07-091-0/+1
| | | | | | | | | | Apparently, the MSVC linker gets confused if an input library ("clangFormat.lib") has the (almost) same file name as an output library ("ClangFormat.lib"), even though the latter is specified with an absolute path. Change-Id: Ia76e60fd10e16ce8daff880f4005d40d7f20d08c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* German translation: Avoid ambiguous shortcut overloadRobert Loehning2020-07-091-1/+1
| | | | | | | | | | | D clashes with "Datei". E clashes with "Erstellen". B clashes with "Bearbeiten". U clashes with "Auswahl in Kleinschreibung wandeln". G clashes with git shortcuts Change-Id: I2d13eb45f73847526b896420510bdba196949787 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* MSVC: Use proper codec for vswhere output parsingChristian Kandeler2020-07-091-0/+1
| | | | | | Fixes: QTCREATORBUG-24311 Change-Id: Ifeefd51ddc9f3eb738ee2649328209ed3494f9a5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* QmlDesigner: Adjust priority of template mergerThomas Hartmann2020-07-081-9/+8
| | | | | | Task-number: QDS-2488 Change-Id: Iac6fc179e2c28fe59c9db7e09f4989c548b3249c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* C++: Fix highlighting Q_PROPERTY with template typesChristian Kandeler2020-07-082-3/+2
| | | | | | | | | | | | | | | | | | | | | | | We override the Q_PROPERTY macro in our own header. This appears to have two effects: 1) The macro arguments are properly highlighted. 2) There is no completion from libclang for Q_PROPERTY, meaning our own helpful snippet is the only completion candidate. I don't understand the reason for either of these; they seem to be more or less random effects of parsing peculiarities. As it turns out, our macro redefinition breaks if the type of the property is based on a template class, leading to false errors in the code model. Removing our macro redefinition fixes the code model, but also removes the aforementioned effects. Turning the macro into a variadic macro fixes the code model and keeps effect 1), but not effect 2). Therefore, we also update the snippet to provide an extra string that makes it clear this it's a helpful snippt, rather than just a normal completion. Fixes: QTCREATORBUG-24243 Change-Id: I4044d5e633af3ebdba36032d5efd3333b5a36214 Reviewed-by: David Schulz <david.schulz@qt.io>
* Android: check forward port exist before removing itAssam Boudjelthia2020-07-082-7/+30
| | | | | | Task-number: QTCREATORBUG-24155 Change-Id: I3675a63d5aa85b8d11be9021d1a79fac1390b26e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix compileChristian Stenger2020-07-081-1/+1
| | | | | | | Amends 3f655815be222bdbd. Change-Id: I19cd488322f50b0319ca18c094598f0bce4fcb45 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Merge remote-tracking branch 'origin/4.12' into 4.13Eike Ziller2020-07-080-0/+0
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: Icb405079fd601619b506e5c56b6ef465bc0424bc
| * Bump version to 4.12.4v4.12.44.12Eike Ziller2020-07-073-7/+7
| | | | | | | | | | Change-Id: I8175830fb3a6f006ebd6f71441452ac04587ce44 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: Fix spinbox empty value handlingMiikka Heikkinen2020-07-081-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force zero value when text value converts to NaN. Also, onEditingFinished doesn't trigger if value is something not accepted by the validator (the empty value), so do the equivalent also on focus loss, if value is still dirty (meaning onEditingFinished didn't happen). This ensures we're never left with different value shown and written in qml file. Change-Id: I3862d8d11adf7955f99b50b515e015ad132a5c78 Fixes: QDS-1539 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Android: keep manual Qt version names in the autodected kit nameAssam Boudjelthia2020-07-081-2/+6
| | | | | | | | | | | | | | | | | | | | With in 19154bf0e75a52f8611843fd49729b79115b7bc7, When having an offial Qt for Android and a manual Qt for Android with the name version, the kit will have the same name, avoid that by keeping the exact name of the manual versions. Change-Id: I280a286f99cbc17185a5309c8825381e03ea7ff6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Android: silence adb irrelevant SynchronousProcess error outputsAssam Boudjelthia2020-07-081-4/+6
| | | | | | | | | | | | Task-number: QTCREATORBUG-24155 Change-Id: Ibebc48d471ef7aeec37c99eda5c27d5419c913f3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Android: fix qml debugger not starting on Qt 5.14+Assam Boudjelthia2020-07-081-0/+28
| | | | | | | | | | | | Task-number: QTCREATORBUG-24155 Change-Id: Iddc5f7cb31a3512762d1e72b42108e5ed61bd9af Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Editor: Do not use the editor palette to store editor scheme colorsDavid Schulz2020-07-081-67/+64
| | | | | | | | | | | | | | | | | | | | Otherwise all editor ancestors like scrollbars might get an incorrect palette. Fixes: QTCREATORBUG-24270 Change-Id: I133cd1dbe284282122972130666c280ea412ea1a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Add slot/function support to NodeMetainfoThomas Hartmann2020-07-072-1/+48
| | | | | | | | | | | | Change-Id: Ie8e153d552a003ca189b65fe8691cb84091c8159 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Use perfparser 4.13, not 4.12Ulf Hermann2020-07-071-0/+0
| | | | | | | | | | Change-Id: I29848bbd1e78133216cc0bccbce3e8f142887cba Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CppEditor: Make "Add curly braces" quickfix more robustChristian Kandeler2020-07-073-6/+34
| | | | | | | | | | | | | | | | | | | | Anchor the opening brace at the closing parenthesis, rather than at the statement. This way, we won't get troubled by macro weirdness in the statement part. Fixes: QTCREATORBUG-13921 Change-Id: I05af24d1642e6b62c78bb2f47a1ef0b1fea326d0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Fix crash with ADSHenning Gruendl2020-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | When pressing Ctrl + Shift + F in design mode the OutputPanePlaceHolder is requesting its splitter, which isn't set with ADS. To avoid nullptr access a check for the splitter before accessing. Change-Id: I3085bba23d4cf9bddcfec154e4557000d880600d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | GccParser: Catch file paths in "inlined from" linesChristian Kandeler2020-07-072-0/+37
| | | | | | | | | | Change-Id: Ia16e5e4e3d3ce453e54df8eac48248164059bdc9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ClangTools: Fix clazy output parsingChristian Kandeler2020-07-071-1/+1
| | | | | | | | | | | | | | | | | | We must not paste stdout and stderr together, because if there is stderr output (as in some versions of clazy), then the trailing messages will make the JSON parsing fail. Change-Id: Ia31efdf3376eeb2e232b32bb0cdb543345e2dbfc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Autotest: Introduce ItemDataCacheDavid Schulz2020-07-074-49/+57
| | | | | | | | | | Change-Id: Icbd703a8ddd3c5dea4a90d2c32c1866764bc0267 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | clangpchmanagerbackend: Fix compiler warningsChristian Kandeler2020-07-071-10/+10
| | | | | | | | | | | | | | | | | | | | "warning: catching polymorphic type ‘const class Sqlite::StatementIsBusy’ by value [-Wcatch-value=]" ---[ Fields ]-----------------[ uncomment and edit as applicable ]---| Change-Id: I84c1d3e21b36f291bc9adc075666fdf55d5ca6cc Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | ParseIssuesDialog: Flush the parserChristian Kandeler2020-07-071-0/+1
| | | | | | | | | | | | | | Amends 1c6e4fbd32. Change-Id: I53bc79a6e909daf83a42ff32cc7e6f0577f3ccc1 Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: Fix for broken prototypes in templatesThomas Hartmann2020-07-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a band-aid fix. plugins.qmltypes can contain "duplicated" cpp type declarations, some without export, similar to a forward declaration. This is the case for QQuickItem in templates for example. The prototype for QQuickItem in this case is not assoicated with QtQuick.Item, which we expect. Task-number: QTCREATORBUG-24283 Change-Id: I3377760e29f1af5c8e948aaa1ae7883448116872 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | AutoTest: Align file and line information of sub-itemsChristian Stenger2020-07-071-18/+9
| | | | | | | | | | | | | | | | Avoid displaying the file and line information inverse-cascaded and fix initialization of the internal layout positions. Change-Id: Ic9493741c58ece6074f659de110c9cabadafe7d6 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Python: Fix highlighting of parenthesesChristian Stenger2020-07-074-1/+27
| | | | | | | | | | | | | | | | This enables the PythonEditor to handle (un)matching parentheses correctly. Change-Id: I31516a5fee922de6b3cfc2254b209739bc42c540 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Add Singleton support to BindingModelAleksei German2020-07-062-7/+34
| | | | | | | | | | | | | | Task: QDS-2477 Change-Id: I8aa25325e2f4fe714af26038280ed774aef1216f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Debugger: Support sysroot overrideOrgad Shaneh2020-07-065-3/+54
| | | | | | | | | | | | | | | | Sometimes the same toolchain can be used with different versions of sysroots. Support this in command-line and dialogs. Change-Id: Id49f8e8c50f4856e979eecbbdebc680b57dc69b2 Reviewed-by: hjk <hjk@qt.io>
* | Android: Prevent crash in case there is no Qt version sethjk2020-07-062-2/+2
| | | | | | | | | | | | | | | | For CMake build. Change-Id: I77946a5d7023a9cefc23baf243991949121e49ec Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ClangCodeModel: Remove some unneeded static_cast<int> of intshjk2020-07-062-12/+8
| | | | | | | | | | | | | | Continues 7ab6783e24c6a. Change-Id: I1f80ae5d20163d1d5da79dc26ea3129bd3599066 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ClangCodeModel: Replace nested ClangCodeModel::Utils namespacehjk2020-07-0616-154/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by the customary ::Internal. It adds only noise on the user side and conflicts regularly with the top-level ::Utils namespace. Remove a (now) duplicated definition of setLastSentDocumentRevision(). Plus minor namespace related fixes. There are still minor conflicts between Utils::Text and ClangCodeModel::Text Change-Id: I2e8df6b3c6c3599192774032822ee7e778355bba Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.12' into 4.13" into 4.13The Qt Project2020-07-0622-111/+226
|\ \
| * | Merge remote-tracking branch 'origin/4.12' into 4.13Eike Ziller2020-07-0622-111/+226
| |\| | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/lldbbridge.py Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
| | * Squish: Stabilize tst_HELP02Robert Loehning2020-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Depending on the sizes of the treeview and its contents, the click might hit the scroll bar and result in a script error. Change-Id: Ic3658b1f180d1aa5a792d6664d2d7f56d8d0c353 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * Change log for 4.12.4Eike Ziller2020-07-061-0/+4
| | | | | | | | | | | | | | | Change-Id: I04fb6e04f4690b2370ec7a475491d8e10d3c0139 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Fix debugging C++ on iOS devicesEike Ziller2020-07-061-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert 7f958700a09f09ac124b20d23236ede472b58d87 for 'remote-ios'. The original commit changed the way attaching to a remote server or process works, attempting to make it work with lldb-server on a remote linux device. That breaks connecting to the debugging server on iOS devices. Fixes: QTCREATORBUG-23995 Change-Id: I7a793fa73a564a4ef19cf82e13c2ad50d4247ee3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| | * McuSupport: Change version checking from exact == to >= minimumAlessandro Portale2020-07-063-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, one Qt Creator version supported exactly one Qt for MCUs version, mainly because of incompatibilities in-between Qt for MCUs versions. The compatibility of 1.2 with 1.3 and further is now deemed stable enough to loosen the version checking. This change replaces the exact versions comparison (between Qt for MCUs SDK version and what Qt Creator supports) to a minimum version check of what Qt Creator supports. One limitation that remains is that you can only have one kit per target, across the supported Qt for MCUs versions. To mend this, UI changes are required (in a separate commit). Workaround for now: If you want e.g. Desktop Kits for different Qt for MCUs versions at the same time, you need to work with kit clones. Task-number: QTCREATORBUG-24293 Change-Id: Ifd31cd2eadbc1d7fa02415e1928d0047cf007f7c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * McuSupport: Find default FreeRTOS dir inside pre-installed board SDKAlessandro Portale2020-07-063-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt for MCUs 1.3 ships the board/MCU SDKs, and also adds the subdir to the FreeRTOS component inside the board/MCU SDKs as "boardSdkSubDir" to the .json files (see: UL-2760). Task: Qt Creator needs to lookup that "boardSdkSubDir" value and use it to construct a default path for the FreeRTOS path. Task-number: QTCREATORBUG-24300 Change-Id: Ie3c8186b76443d5fe3640226ea61aa8b14779d54 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| | * Add changes file for 4.12.4Eike Ziller2020-07-031-0/+47
| | | | | | | | | | | | | | | Change-Id: I4f98bdfddfe0ba3a4d9fa9473ae91d026f453b5a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * McuSupport: Adjust license headersAlessandro Portale2020-07-0314-20/+20
| | | | | | | | | | | | | | | Change-Id: I00ce0c63c59f6d20f8244ea9c693259044d0f7b8 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| | * McuSupport: Read *_FREERTOS_DIR values from .jsonAlessandro Portale2020-07-021-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | Instead of from a hard-coded list. Task-number: QTCREATORBUG-24296 Change-Id: Ib74fd854f035d561b8a568987984a2a2cb730175 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| | * McuSupport: Skip Renesas' "RGL" board SDKAlessandro Portale2020-07-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ghs-renesas-rh850-d1m1a.json lists "boardSdk/envVar": "RGL_DIR". However, that dependency is already handled as vendorSdk. This and the other board SDKs differ so much, that we simply keep "RGL" as vendorSdk and skip it when creating board SDKs. Amends c43ef81d4f59c07b580a8c95335ed9cc6fa7955d Task-number: QTCREATORBUG-24201 Change-Id: I052d50f413ecc5f318d4146c207ab690acf1b1f5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>