summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update qbs submodule to HEAD of 2.0 branchv10.0.1Christian Kandeler2023-05-031-0/+0
| | | | | Change-Id: I649138237245120f7dd9448dfdb1027375dbb114 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* l10n(zh_TW): Fix translations of 'Sidebar'Haowei Hsu2023-05-031-6/+6
| | | | | | | | | | * Sidebar: 邊欄,邊列 -> 側邊條 Change-Id: I01393615d25f42bd8ca584b3895ab02c2296a3bb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: 林博仁(Buo-ren, Lin) <Buo.Ren.Lin@gmail.com> Reviewed-by: Cheng-Chia Tseng <zerngjia@gmail.com> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* GenericProjectManager: Do not make every subdir an include dirChristian Kandeler2023-05-022-2/+5
| | | | | | | | | | | Large projects can have thousands of subdirectories, only a tiny subset of which are supposed to be include directories. Use the directory name as a heuristic instead. Fixes: QTCREATORBUG-29099 Change-Id: I207ea2b7d2739c4f6c27fa96865dfde2570caf8a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: always return a valid assist interfaceDavid Schulz2023-05-024-18/+16
| | | | | | | | | | | | It is required for updating currently visible proposals. Also guard against potential null assist interfaces. Amends 0bd6d7a69fab1cc622f6e00ee63a15c666967e0d Fixes: QTCREATORBUG-29096 Change-Id: Ic34d70561b471e7e529f2fb7c239b49712aca502 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Fix qbs build for QML testChristian Kandeler2023-05-021-1/+0
| | | | | Change-Id: I8df3988f574cc94c8bb441a54a1b861913029dfa Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Doc: Describe the "Qt Quick Application (compat)" wizard templateLeena Miettinen2023-05-023-4/+8
| | | | | | | Fix descriptions of the "Qt Quick Application" wizard template. Change-Id: I15390252b29f5437d488bb8692787993855d1545 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SquishTests: Further Python3 adaptionRobert Löhning2023-05-024-4/+10
| | | | | | | Fixing tests in suite_editors Change-Id: I4e5e1adc2c4e6606232d76a794aff7a7144d5c9e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Add change log for 10.0.1Eike Ziller2023-05-021-0/+105
| | | | | Change-Id: I992218bd0108d5afc9eb42d01d4a1a776db8a82b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Update qbs submodule to HEAD of 2.0 branchChristian Kandeler2023-04-291-0/+0
| | | | | | | Change-Id: I861f73625162351639b8f1ab61d0442cc061fad3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Wizards: Fix "New Class" with QML_ELEMENT and no QQuickItem includeChristian Kandeler2023-04-281-0/+1
| | | | | | | | | Amends 2f94e93334af366589fb2c5dcbff33a0694b6074. Fixes: QTCREATORBUG-29092 Change-Id: Ic27729a601534f5b4ed98451f637b9d49029a33a Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
* Update qbs submodule to HEAD of 2.0 branchChristian Kandeler2023-04-281-0/+0
| | | | | | Change-Id: I357d5d0b6fdef8e089f4d8ef633e0ef7b1809a01 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/9.0' into 10.0Eike Ziller2023-04-281-35/+32
|\ | | | | | | Change-Id: Ic82c30a479a7ce7eab31b3c18abb3c46a71711cd
| * Coin: Add instructions to install pyenv for qtsdk.gitPatrik Teivonen2023-04-281-35/+32
| | | | | | | | | | | | | | | | | | Make sure that the required Python version for qtsdk can be installed in the future. Change-Id: Ie69cf79a33e4e4529dd34de7729d3014f8631fe2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Core: Fix item flag on locator settingspageChristian Stenger2023-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | Do not make the 'included by default' column editable as this would make the column act strange on double clicks. Instead of providing a non-functional change opportunity for the checkstate's value this is now handled similar to the double click on other columns. Change-Id: Id2851b2bfe2b7cda8c3231f58bf436196a533171 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMakePM: Fix presets condition with a const valueCristian Adam2023-04-271-1/+1
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-29077 Change-Id: If1ebaa22c07eaa39fb8d4f24c33f26249f17d793 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | ClangFormat: Fix autoindentation for QML_ and Q_ macrosArtem Sokolovskii2023-04-272-7/+46
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-29086 Change-Id: Ie23e46baf2c802799818cb724aacd71776480b06 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | CMakePM: Fix presets transitive inheritanceCristian Adam2023-04-271-1/+3
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-29076 Change-Id: Ibe4c3eebb3fcebeabafc485949a19e696ecad2de Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | FileInProjectFinder: Fix path analysisUlf Hermann2023-04-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | The previous code let to all possible paths to be accepted with maximum confidence. Fixes: QTCREATORBUG-29090 Change-Id: I3e0876d2fd1a5636dbe45cf152c8a251316185ff Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | SquishTests: Remove workarounds for closed issuesRobert Loehning2023-04-262-6/+1
| | | | | | | | | | Change-Id: If5f62b0f9013223643f016ce4e04932cca53397c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | SquishTests: Make workaround permanent for Creator 10Robert Löhning2023-04-261-8/+6
| | | | | | | | | | | | | | | | | | The bug is fixed in master branch only. Task-number: QTCREATORBUG-28985 Change-Id: I5b1648e89a2ae61ce651ce6d2061fea58559d145 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | SquishTests: Update tst_CSUP06Robert Löhning2023-04-261-17/+24
| | | | | | | | | | | | Change-Id: Icbe7cae9b282dd125de46f8ba8bd265b9aa1054d Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | CMakePM: Fix boolean cacheVariables parsingCristian Adam2023-04-251-3/+15
| | | | | | | | | | | | Fixes: QTCREATORBUG-29078 Change-Id: I652343d6d688e36b6d5ecc23e91243b4cecbb87d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Utils: Fix line ending conversion in FileReaderMarcus Tillmanns2023-04-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | FilePath::fileContents always uses "binary" mode when reading files. FileReader::fetch previously used QFile with QIODevice::Text mode to read (local) files, which converts \r\n to \n. This patch re-introduces the conversion. Fixes: QTCREATORBUG-29040 Change-Id: I0a16b056bea456512e6526497b725c73b0a1bd11 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge "Merge remote-tracking branch 'origin/9.0' into 10.0" into 10.0The Qt Project2023-04-244-5/+5
|\ \
| * \ Merge remote-tracking branch 'origin/9.0' into 10.0Eike Ziller2023-04-244-5/+5
| |\ \ | | |/ | | | | | | Change-Id: Ifbb14e33104b39de8ca2e1495301a53e71496ef9
| | * Fix dangling references, found by GCC 13Thiago Macieira2023-04-204-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lifetime extension via const-ref only applies to functions that return by value. For those that already return by reference (such as QList::constLast()), no extension happens and we end up with a dangling reference. cmakebuildconfiguration.cpp:1473:25: warning: possibly dangling reference to a temporary [-Wdangling-reference] cmakebuildconfiguration.cpp:1473:61: note: the temporary was destroyed at the end of the full expression ‘ProjectExplorer::BuildStepList::steps() const().QList<ProjectExplorer::BuildStep*>::constLast()’ Change-Id: I3b169860d8bd41e9be6bfffd1757167b7348be9b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | | QMLLS: fix crash on opening non existing qml filesDavid Schulz2023-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The automatic handling of the document inside the language client manager is normally done after a document was opened successfully. Since the QML document registers the document manually on construction before the file was tried to be opened the automatic cleanup inside the manager does not work. Postpone the document registration like in the PythonDocument after the document was opened successfully. Fixes: QTCREATORBUG-29021 Change-Id: I2dd9e2da9c9ed6d38414ad991df3c03b62e9d611 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | German translation: PythonEike Ziller2023-04-241-40/+44
|/ / | | | | | | | | | | | | Change-Id: I86e11626122c88a307134ae352331845fa4b394d Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Resuscitate the "legacy" Qt Quick Application wizardAlessandro Portale2023-04-2111-0/+566
| | | | | | | | | | | | | | | | | | Users still want to create new Qt Quick Application applications targeting Qt 5 and with other build systems than cmake. Fixes: QTCREATORBUG-28964 Change-Id: Ib87b7128f0b34eb4126ec771f324c70a960b2a03 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | l10n(zh_TW): Fix translations of 'Toolchain'Haowei Hsu2023-04-211-30/+30
| | | | | | | | | | | | | | | | | | * Toolchain: 工具鍊 -> 工具鏈 Change-Id: Ia58d3c58ec46169abfc51036131be5572e7c242e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: 林博仁(Buo-ren, Lin) <Buo.Ren.Lin@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SquishTests: Add possible location of cdbRobert Löhning2023-04-211-1/+3
| | | | | | | | | | | | Change-Id: I72c3f1b5bdcceeca2764d4a77229c45655187376 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | qbs build: Fix pluginjson moduleChristian Kandeler2023-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | The "product" qualification was missing for "sourceDirectory". This currently happens to work due to scope pollution in the qbs implementation. Change-Id: I61758023d39d00505c586c1e5ad78185a69c0db1 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | deployqt: Support elfutils from Linux distributionEike Ziller2023-04-201-3/+10
| | | | | | | | | | | | | | | | | | | | | | Which can be in a more complicated directory than just /usr/lib, like /usr/lib/aarch64-linux-gnu . So, recursively look for the elf library to determine the right directory. Change-Id: I58ed8a045fbde50dea8851f63409a5a0863c3b16 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Fix namespace usage in QSR project wizard templateJussi Witick2023-04-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | Consistently use namespaces with different feature if/def's in main.cpp Task-number: QSR-2079 Change-Id: I0609f7eb8cb18d270e59c11025850e6369e5db87 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> (cherry picked from commit f98a03a28d823a1bdffc57009ebef2637811aebb) Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMakePM: Add .h header files to .c source filesCristian Adam2023-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | Utils::mimeTypesForFileName would only return "text/x-c++hdr" for .h files. This is perfectly fine for C++ source files. The ancestor "text/x-chdr" is required for C source files though. Fixes: QTCREATORBUG-28991 Change-Id: I21f038787e48e88b5e4b9e8ca386b3af80d098ea Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: Do not treat a starting run control as finishedChristian Kandeler2023-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | ... when assigning tabs in the app output pane. Task-number: QTCREATORBUG-29044 Change-Id: I49e3d3ac3822692ffacd9821a0dd61377aae02cd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | ClangTools: Do not abort a running build when starting to analyzeChristian Kandeler2023-04-191-1/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-29044 Change-Id: Iec6259d1734f809aba9da00f3f6a63fea2b93967 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Doc: Replace libSM-dev with libsm-devLeena Miettinen2023-04-192-4/+4
| | | | | | | | | | | | | | | | Which is the correct way to write the name of the package. Fixes: QTCREATORBUG-29031 Change-Id: I860051b8e5f94a800d6f7b448daf02ae01611f9d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Editor: skip painting selection path out of clip rectDavid Schulz2023-04-181-0/+4
| | | | | | | | | | Change-Id: Ieec7afbec729708884c24d8de2b4a6c488220a69 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Editor: fix selection path for empty selectionsDavid Schulz2023-04-181-0/+2
| | | | | | | | | | | | | | | | Especially targets the painting of empty snippet replacement placeholder like in the default "if" snippet. Change-Id: I42d9fb901c66cddf4eab9dd7275b42a8f4e81282 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | AutoTest: Improve handling of Qt Quick TestsChristian Stenger2023-04-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qml files must not get declared inside the project files which makes it hard to correctly determine the correct project part they might belong to. The recommended and correct way of using Quick Tests is to have QUICK_TEST_SOURCE_DIR defined which is used internally anyhow to find the respective qml files. Make use of this fact also when determining the correct project part. Fixes: QTCREATORBUG-28716 Change-Id: I45371242ce931ee83b7bfbdd07a0848c7fd86abb Reviewed-by: David Schulz <david.schulz@qt.io>
* | QtSupport: Fix handling of tutorialsChristian Stenger2023-04-181-3/+3
| | | | | | | | | | | | | | Amends ac17e0e2ad47f16c80eb233725c4a603f6053acb. Change-Id: I9c0ffdb01ef446a76bfcbbdb8b5c560dd9f26e8d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ClangFormat: Fix preview updatingArtem Sokolovskii2023-04-184-3/+14
| | | | | | | | | | | | | | | | | | | | Fixed the behavior when the preview does not update when the Override checkbox was not enabled initially. Currently, the preview is updating when Override the checkbox is enabled. Fixes: QTCREATORBUG-29043 Change-Id: I8a2a6f3cd5890b66d4bffd0c84aeafb5a29fba48 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Update qbs submodule to HEAD of 2.0 branchEike Ziller2023-04-181-0/+0
| | | | | | | | | | | | | | | | | | Fixes build with Qt 6.5 Change-Id: I9aaae5ade6b9165e54c248d246d20dd0665967bf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ClangFormat: Fix wrong indentation numbers with separatorArtem Sokolovskii2023-04-181-0/+1
| | | | | | | | | | | | Fixes: QTCREATORBUG-29033 Change-Id: I70ba12828d3805cb8087a797d14e0ee24611418f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Fix compile with Qt6.2Christian Stenger2023-04-181-1/+1
| | | | | | | | | | | | | | | | | | Just removed redundant check. Amends 2d01003c4e37041efc63bd536d1cd06ce4928bf7. Change-Id: Ie7ce3836804199bcb561b8c34a70814856a4033a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
* | CMakePM: sanitize preset initial configuration valuesCristian Adam2023-04-171-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The task-number below has a sample where CMAKE_C|XX_COMPILER was set to "cl.exe" and the CMAKE_PREFIX_PATH was set to "C:/Qt//6.5.0/ msvc2019_64". These values would cause "red" values in the CMake configuration, which is not that nice. This patchset will make sure that everything is nicely configured. Task-number: QTCREATORBUG-28982 Change-Id: I21289d1936ef075ce02364fc675709c52c76c3ed Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | CMakePM: expand macros for all configure cacheVariablesCristian Adam2023-04-174-22/+61
| | | | | | | | | | | | Fixes: QTCREATORBUG-28982 Change-Id: Iabbf39b815ed7477a9d272a320308f320a31adbc Reviewed-by: hjk <hjk@qt.io>
* | ClangTools: Give the tool main windows unique object namesChristian Kandeler2023-04-171-2/+2
| | | | | | | | | | | | | | | | Somewhat surprisingly, the object name is relevant: If we use the same one, then clang-tidy and clazy have the same issues view. Change-Id: I5ce32301780e5ae63c82fdb2ce3b1bca63ef85d5 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Examples: Automatically enable showing categories for Qt >= 6.5.1Eike Ziller2023-04-172-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | Supposedly that is the version that will have a sensible amount of examples sorted into categories to not look weird. It is still possible to force showing the categories with QTC_USE_EXAMPLE_CATEGORIES. Fixes: QTCREATORBUG-28546 Change-Id: Ia1e6afa97d9b1b86763c29209fcf6f674d0844f5 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>