Commit Graph

80529 Commits

Author SHA1 Message Date
Alessandro Portale
7cb309a2db Coco: Tr::tr()
Change-Id: I130fbc62eb839548a7667aace8287be3e6ef6254
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 14:22:54 +00:00
Knut Petter Svendsen
dbe411ca4c GenericProjectManager: Fix outdated comment
Change-Id: I9295380515c64da90a23f4fd95eae67273924d19
Reviewed-by: hjk <hjk@qt.io>
2023-02-08 13:51:36 +00:00
hjk
3f8240a7de TextEditor: Some fileName -> filePath renaming
Change-Id: Id0751f936666fa658226d62a1906b82e3bac1660
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-08 13:48:30 +00:00
hjk
a7bf65c288 Bookmarks: Use more FilePath
Change-Id: I8d4337f9dccaf26b37583eb87f364c9d995f94fd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-08 13:48:17 +00:00
Alessandro Portale
a86299d573 Squish: Tr::tr()
Change-Id: I04d8d7c68c6b40e63e8e3de6690df8a051ef625f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 13:12:34 +00:00
Alessandro Portale
dbf017c11e Marketplace: Tr::tr()
Change-Id: Idbba28fd3057d634b5c5fb56f405c33d13d35332
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 13:12:26 +00:00
Alessandro Portale
74bf8fd5f7 GitLab: Tr::tr()
Change-Id: I1f51fbada9d18b6e6e2dae90801de472b3e086d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 13:12:18 +00:00
Christian Kandeler
bd2ca236e1 CPlusPlus: Check maximum include depth in lexer
We use a value of 200, which is also GCC's default.

Fixes: QTCREATORBUG-28770
Change-Id: Id02b324cd2ffa81a709441a5d93856bcd06501c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 12:53:31 +00:00
Christian Stenger
06b579a75b McuSupport: Fix handling of FilePath
..when expanding variables and macros.
Fixes the plugin unit test on Windows.

Fixes: QTCREATORBUG-28744
Change-Id: I8a047854d6d43e901b01b10660e29b7d6544d0b7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 12:21:40 +00:00
Leena Miettinen
ac252c2d49 Doc: Make the locator more visible in the other parts of the docs
Change-Id: Icdefa64f5874f14c6a9c6a24e4d73837c12b457f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-08 12:12:26 +00:00
hjk
85bed557f3 Utils: Use more FilePath in TerminalCommand
Change-Id: Ide9a09f61f3b2c10378d90a4a907e1e37d7407df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-08 11:59:09 +00:00
Fabian Kosmale
49561eaeb8 qtquickapplication wizard: Adapt to CMake API change
During API review, it was decided (and implemented) that REQUIRES is the
better/more descriptive keyword than MIN_VERSION.

Change Creator's wizard accordingly.

Change-Id: I831cdc956204b1e379c3815104698d3f881abf6c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 11:58:22 +00:00
Eike Ziller
075f39e543 CMake: Fix editing of CMAKE_PREFIX_PATH
When editing e.g. CMAKE_PREFIX_PATH in the initial configuration
settings it was resolving the path(s) in there, thinking that it was
relative to the project directory.

Fix that after editing the resolved file path was set as the new value,
instead of the raw unexpanded data.

Fixes: QTCREATORBUG-28779
Change-Id: I14d097e3a3a51b78006dd30a67b08477cfe0f2d8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-02-08 11:39:21 +00:00
Alessandro Portale
997655e669 ClangFormat: Fix build
Change-Id: I6197429ddd0aa10631d1ecbecd25154045a7004f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 11:33:17 +00:00
hjk
239f79fbec CMake: Use FilePath functionality to extract qml module files
Shorter and remote-capable.

Change-Id: If6b3a419eb78da2c2763bc45f4d1e33be7dbed17
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-02-08 11:22:57 +00:00
Alessandro Portale
389b9503d7 ClangFormat: Tr::tr()
Change-Id: Iabbe39bfdd3ae24d65610a00d792e16591a1b6ee
Reviewed-by: hjk <hjk@qt.io>
2023-02-08 11:09:12 +00:00
Alessandro Portale
48affa1889 Translations: Remove header includes of *tr.h in .h files
The wrong Tr::tr could be executed by code indirectly including a *tr.h
file from another module.
To Translate in a header file, use QCoreApplication::tr().

Change-Id: I30e67245991d2c2f0eeb01ab356555bdb9841af0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 11:08:48 +00:00
Ulf Hermann
ccbee9bf42 qmldir parser: Handle internal types with versions
There is no reason why internal types cannot have versions.

Fixes: QTCREATORBUG-28755
Change-Id: I419f2e052634b603dfc5b2bfff155167cf6f9304
Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-02-08 09:50:00 +00:00
hjk
37488c69b8 Utils: Remove 4.8 compatibility code for reading terminal settings
4.8 was released end of 2018 and the setting is not critical.

Change-Id: I02856e98303debd3a1adc28d49b28c5d728ad553
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-02-08 09:25:59 +00:00
hjk
0bd52ea275 ADS: Fix SPDX-License-Identifier in advanceddockingsystemtr.h
Align with the rest.

Change-Id: I48ac1cae738b909d90fd123128c1959f3635278e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 08:58:38 +00:00
Alessandro Portale
4d8a18c07d ProjectExplorer: Fix build
Change-Id: I0f74162cf52173b26e06082ace4b55e68e18ea49
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-08 08:43:30 +00:00
Marco Bubke
ff3d4b44f1 QmlDesigner: Use Qt6_VERSION instead of Qt5_VERSION
Change-Id: I346f5d256468696076299f964022c0a2ec2d190d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-08 08:42:47 +00:00
David Schulz
c651a1e290 ClangTools: remove arrow from analyze current file button
This is now in line with the other menu buttons in the editor toolbar
like the language client button or the python interpreter and repl
buttons.

Change-Id: If22d3e9c87274eee2fefe8e30f6b0648be5d60c9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 08:40:35 +00:00
Alessandro Portale
9db70d8810 Translations: Fix stray QApplication::translate() calls
For references to the module-own context, use Tr::tr().
For references to other modules, use the right context name (with "::"
prefix).

Change-Id: I6dce8f1ceccb23c44d93f1826402cd3be8e98e5a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-08 08:32:42 +00:00
Alessandro Portale
2356f28647 Translations: Add missing "::" prefixes to QT_TRANSLATE_NOOP
Change-Id: I7589a2d4003394e38e58c095b510f8eff33263b8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-08 08:32:31 +00:00
hjk
8a8b50e8b5 ProjectExplorer: Proliferate Utils::FilePath use
Move the .toString() uses into  DeploymentData::addFilesFromDeploymentFile

Change-Id: Ic9ef22da1918ca105c92f0231960dab27b0d80bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-08 08:21:29 +00:00
Eike Ziller
5728f09fac Editors: Fix message box when opening broken code style file
The file name is not supposed to be the button label.

Fixes: QTCREATORBUG-28746
Change-Id: I45ee2a860da8f7ffefc6d72c0d85b7f6a261489c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-08 08:06:02 +00:00
hjk
432d918329 TextEditor: Use FilePath in Command
Change-Id: I0916204eefb49713f241dd43da662f258f8c99f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-08 07:34:30 +00:00
Eike Ziller
012a2a6cd8 Fix build on Windows / MSVC 2019
Change-Id: I265cd316426c76c76bfe18a62a9e5f35fbca3da9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 07:28:59 +00:00
Orgad Shaneh
f94b41313b Utils: Fix MSVC size_t -> int warning
Change-Id: I2732f7b9ad3c7ae96d2d213822f05f37dfcac0aa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-08 06:46:30 +00:00
Marco Bubke
d2bb27731d QmlDesigner: Add direct dependency on QmlDomPrivate
It adds an indirect dipendency to QmlCompilerPrivate too. We stick to Qt
6.5 because the private API changed.

Task-number: QDS-9049
Change-Id: Icb0b406fc47759763384e167c0cabbffc1c9e186
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-02-07 17:43:57 +00:00
Marco Bubke
befb49bbce QmlDesigner: Fix missing adaption
Change-Id: I307c9f236ee8ebd36d62b3fe9b0d4bbaea5699e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-02-07 17:43:43 +00:00
Marco Bubke
ef3e45da8d QmlDesigner: Share QmlPuppetPaths
It removes the workaround in QmlProjectRunConfiguration.

Task-number: QDS-8915
Change-Id: I319cdf976980b616eb28cabb40dd63416d7e27fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-07 17:43:34 +00:00
Marco Bubke
3a1bbd51eb QmlDesigner: Move DesignerSettings to DesignerBase
To share code with other plugins we add a support plugin.

Task-number: QDS-8915
Change-Id: I3d5b892a93145e04c90d3a3f07db41b55c041ae9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-07 17:43:16 +00:00
Alessandro Portale
3a87b45831 Fossil: Tr::Tr()
Change-Id: Ifdfe75dc916b6d87cae985bbe5682f1e72541864
Reviewed-by: hjk <hjk@qt.io>
2023-02-07 16:21:19 +00:00
Alessandro Portale
521a23df6e Fossil: Inline revertdialog.ui
Change-Id: I2585c705fce03e3278ec344b0078b50144485d22
Reviewed-by: hjk <hjk@qt.io>
2023-02-07 16:21:13 +00:00
Alessandro Portale
d14c561cf6 Fossil: Inline pullorpushdialog.ui
Change-Id: Idd279a2ed2cc2b14e573aae588a309ae808b008f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-07 16:21:07 +00:00
Brook Cronin
8127f9d2d5 QmlDesigner: Add medium size 3d primatives to icon font
Change-Id: Ia421e47a3b98e2d83a1bdb0b529f22ec93dc4dce
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-07 15:52:26 +00:00
Mahmoud Badri
23c6698b15 QmlDesigner: Add "Show in explorer" option to assets context menu
Fixes: QDS-9061
Change-Id: Id91336819f6836a98c8fd34562c0f8672c11a288
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-02-07 15:37:31 +00:00
Thomas Hartmann
830ea50334 QmlDesigner: Add basic install command to application template
Task-number: QDS-9047
Change-Id: I6bf0c3cf68148eeef3b8debd942180e05fd2d1a5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-07 15:35:08 +00:00
Miikka Heikkinen
a5949543b6 QmlDesigner: Fix condition chains in 3D import options
When an import option conditionally depends on another option that
depends on a third option, toggling the third option needs to change
the enabled state of the first option controls as well as the second
option controls.

For example, consider this set of options (actual case with options
for generating mesh levels of detail in Qt 6.5):

optA
  optB, enabled when optA is true
    optC, enabled when optB is true
    optD, enabled when optB is true

If optA is false, optC and optD controls need to be disabled even if
optB is true, because of the chained conditions.

Fixes: QDS-9055
Change-Id: I10aeb7596cf9c8a9053c7d08ec9ebb7a46db2cd2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-07 14:55:18 +00:00
Thomas Hartmann
980a9044f9 QmlDesigner: Add 'the' to feedback dialog
Task-number: QDS-8870
Change-Id: Ic5aab691d4ed1714ebc078fc5c985e39640d2ba8
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
2023-02-07 14:32:15 +00:00
Pranta Dastider
21649188ca QmlDesigner: Fix the user feedback dialog
This patch changes the user feedback dialog box.
It update messages.

Fixes: QDS-8870
Change-Id: I16b98f1cec1c7cd2c84172bb39d2ede2d4f966e2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-02-07 14:12:04 +00:00
hjk
89880907f2 Debugger: Simplify paramenter setup on Windows
Change-Id: Iec44dd33287ac23d2b51ef32483eae831d2ce4bd
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-07 14:07:52 +00:00
hjk
cbf2b23787 QmlDesigner: Remove unused global static
Building CXX object src/plugins/qmlde...dir/components/componentcore/designericons.cpp.o
/data/dev/creator-out/src/plugins/qmldesigner/components/componentcore/designericons.cpp:84:21: warning: ‘const QStringList& {anonymous}::iconFontMandatoryKeys()’ defined but not used [-Wunused-function]
   84 | const QStringList & iconFontMandatoryKeys()
      |                     ^~~~~~~~~~~~~~~~~~~~~

Change-Id: I978d6a52cf4030fe07352d6ee89c2db3d0433c05
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-07 14:01:42 +00:00
Christian Stenger
d2656c60e6 AutoTest: Widen scope for run under cursor
..and debug under cursor for QtTest and GTest.

Depending on the information coming from the code model
we may be able to get a correct scope even when standing
inside the function that is defining the test.
This makes more sense than the original behavior which
made it a hard requirement to stand on a literal to
run or debug a test under cursor.
But as the codemodel does not provide usable information
for all frameworks keep the original behavior as fallback.

Task-number: QTCREATORBUG-28752
Change-Id: I13ea7b0ad1e8207da6cb884d212667c4c657957c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-07 13:56:07 +00:00
Christian Stenger
9277bb5111 AutoTest: Extract function to get active frameworks
For later re-use.

Change-Id: I87cf6db4de861b626e4669351df3f5119952328f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-07 13:56:01 +00:00
Marcus Tillmanns
96185ca4f1 Utils: Use QtcProcess in FilePath::fileContents
Change-Id: Ia7236632c6d9b887d054a3254762b7e3592e73e1
Reviewed-by: hjk <hjk@qt.io>
2023-02-07 13:55:31 +00:00
Christian Kandeler
8096b9f524 Update qbs submodule to HEAD of 2.0 branch
Change-Id: If53431a0cf8bf412a28e606b0712e0acb26e07f5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-07 13:48:59 +00:00
Mahmoud Badri
435dfda150 QmlDesigner: Fix assets view wrong scrolling after drag-n-drop
Change-Id: I3904beb63441d1cf9a0d577fc6c96bbecc8e2ebf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-02-07 13:34:49 +00:00