Commit Graph

80529 Commits

Author SHA1 Message Date
Miikka Heikkinen
c909e791d6 QmlDesigner: Remove unused variable
Change-Id: Ifaddb79f01887d73cc2d715ba45f41f2dcd30a0a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-23 11:25:26 +00:00
Samuel Ghinet
e46431f7df QDS New Project Dialog: Remove Warning that UserPresets.json was not read
Task-number: QDS-7679
Change-Id: I639a8323b3860f3dfb5f4287267a014aaa95dc63
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-09-23 11:21:03 +00:00
Marcus Tillmanns
d97b2fd6f4 FSEngine: Add tests for reading/writing
Change-Id: If38d27933727d4af0b24758bdf1a58f5ea78fd1b
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 11:19:35 +00:00
David Schulz
1ee370df50 LanguageClient: check capabilities before find usage
Change-Id: I421c2f93c90e6b0b8198fcff5707e8a47e8022f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-23 10:51:11 +00:00
Christian Kandeler
049c2cf6f3 QmakeProjectManager: Work around broken mkspecs
E.g. linux-oe-g++/qmake.conf has this craziness:
    QMAKE_CXX = arm-poky-linux-gnueabi-g++ -mthumb -mfpu=neon
                -mfloat-abi=hard -mcpu=cortex-a9
                -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat
                -Wformat-security -Werror=format-security
Since there seems to be no hope for a fix, we work around it by looking
for compiler options in the alleged executable names and forwarding them
along with the flags from the actual *FLAGS variables.

Fixes: QTCREATORBUG-28201
Change-Id: Id0651677dd7b444a5f443e63d36e8dec52106af7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-23 10:04:06 +00:00
hjk
9f71f8b933 Bazaar: Inline revertdialog.ui
Change-Id: I6cff0f874076b498f07d11ede5d4e099ba179be7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-23 09:39:00 +00:00
hjk
dd585c601c Utils: Make path cleaning platform agnostic
Unfortunately, QDir::cleanPath() only cleans according to the rules
of the host system, which can be wrong in remote setups.

As the implementation is not accessible/tweakable from the outside,
copy the relevant code and remove the platform #ifdef's.

Change-Id: Ife9a925412a12d3cef21ed3721a387c61c152ddf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-23 09:25:05 +00:00
Henning Gruendl
a7c15838e2 QmlDesigner: Add tooltips in StateEditor
Task-number: QDS-7736
Change-Id: I6732043da895e04e6ed70f74d8342ba7ff7354fe
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 09:21:03 +00:00
Henning Gruendl
66ec244cf9 QmlDesigner: Fix TextField context menu
Fix TextField keeping its selection after context menu is opened. Due to
this bug QTBUG-71723 being closed the behavior changed. Also the states
when condition TextField needed to be context menu aware to not set a
new expression when the context menu is opened, otherwise it will
immediately reset the model and the context menu wont show up if the
content was edited.

Task-number: QDS-7730
Change-Id: Ic0e63cd3d244bd7f83bcb0edd3b31c0ca1f0a5df
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 09:20:21 +00:00
Henning Gruendl
a8f46ac852 QmlDesigner: Add Timer specifics
Task-number: QDS-7582
Change-Id: I8254012970cd54e450853e026b421c73258c1346
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-23 09:20:09 +00:00
Christian Kandeler
712311b20c LanguageClient: Optionally use a different default replacement string
... when renaming symbols.
Otherwise, the server might return an empty list of results, as renaming
a symbol to itself is a no-op.

Change-Id: I9ca808c4032458c9a2eec262feadd28212938c23
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-23 08:39:57 +00:00
Eike Ziller
6bc77c7c37 T9n: Fix after changing "Switch To" to book style capitalization
Book style is a specialty of english, no need to break existing
translations.

Amends 7be9d0f567

Change-Id: Ic9a7c4110e38aaace4d93092b706330e9a05f565
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 08:13:50 +00:00
Christian Stenger
9adcd3bdd2 Squish: Improve tool tips
Change-Id: Ia0e63aedabfea781b09a3653d5c0e7ba63bbca4d
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-23 08:02:19 +00:00
Piotr Mućko
df92e79da4 McuSupport: Sync JSON files with QtMCUs repo and related fixes
This synchronizes JSON files used by unit tests with files
in QtMCUs repo. To do that some changes in code were needed.

QtMCUs package is no longer created for each JSON file. Because of
its nature it's created once and passed to each target.

Unit tests now have verifyPackage function to avoid duplication
of checks.

In test creating target QtMCUs package is checked beside toolchain
ones.

Change-Id: I5dea470daf184b45facfaaa793c359310ac22fc1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-23 07:48:14 +00:00
Thomas Hartmann
c3f5a9bf0d QmlDesigner: Add timer to library
Task-number: QDS-7582
Change-Id: I048b08cae236bbce39d83c6881abad21592fcb8b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-09-23 07:35:53 +00:00
hjk
5dcfbe6c52 Autotest: Use more FilePath
Change-Id: I15de1121305f245274d74b4116786f6f07ffa3c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-23 07:25:16 +00:00
Alessandro Portale
9e9c0630ee Welcome: Convert to using Tr::tr
Change-Id: Ibcef6dab32894d3032b44965bdcd92fa4f6f780a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 06:40:43 +00:00
hjk
686bcb3ef5 TextEditor: Proliferate FilePath use to FontSettings and ColorScheme
Change-Id: I3fd2e57b9b922d7bf6269b608da48f4a2e13dfb2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-23 06:22:22 +00:00
hjk
dc09779044 TextEditor: FilePathify CodeStylePool
Change-Id: I1ae0706237c7b50d5faf3e069d7bb238e237f331
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-23 06:22:11 +00:00
David Schulz
d83f9d71cc Utils: use native path in FilePath::displayName
Change-Id: Idf82f963cbdee648c53038af478963044b3aa631
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 06:18:57 +00:00
hjk
270e162139 TextEditor: Use FilePath in FormatTask
Change-Id: Iedab9373273271fb21ce5064f0963b24cf7ea4d9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-23 06:16:02 +00:00
Christian Stenger
dbc56dc004 Squish: Limit auto continue after setting break points
Do not continue dumb after setting break points. If the location
we are located at while setting the break points is a break point
we have to stay there interrupted.

Change-Id: Ic0496ea3f2d8ea1d4eab6f3cdbd04c9dbf17bb72
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-23 05:44:32 +00:00
Christian Stenger
1166717248 QmlDesigner: Fix compile with Qbs
Change-Id: I70bd85139294bebba20fa4c8ec969503cbac95fb
Reviewed-by: hjk <hjk@qt.io>
2022-09-23 05:43:55 +00:00
hjk
815f3e87b8 Utils: Don't create FSEngineImpl::m_tempStorage on close()
It's too late, and apparently "close-without-open" is triggered:

QDEBUG: tst_fsengine::testRootPathContainsFakeDir() SOFT ASSERT: "m_tempStorage" in /data/dev/creator/src/libs/utils/fsengine/fsengine_impl.cpp:64
QDEBUG: tst_fsengine::testListDir() SOFT ASSERT: "m_tempStorage" in /data/dev/creator/src/libs/utils/fsengine/fsengine_impl.cpp:64

Change-Id: Ic7100d7abddfffca909b412ea7ea19e295c86729
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-23 05:37:59 +00:00
Henning Gruendl
3d3290424a QmlDesigner: Make easing curve button non checkable
Change-Id: Ia25e710f6cc978645144beaf05a8f53fd0de989f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 20:26:47 +00:00
Henning Gruendl
ff33f7b7cc QmlDesigner: Fix state drop in same position
Avoid calling executeDrop() if the state is drop at the same index.

Task-number: QDS-7731
Change-Id: I91a2be11ce4f1c34c55ecb6dcc0c75f07114703a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 20:26:26 +00:00
Henning Gruendl
c5020c91ce QmlDesigner: Reset default state when removed
Reset the default state to base state when a state is removed that is
currently the default.

Task-number: QDS-7743
Change-Id: Id60549ee0a61b2d3caf05ef2f00e25b74774e7d9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 20:25:53 +00:00
Henning Gruendl
40b159a1eb QmlDesigner: Add output to DebugView currentStateChanged
Change-Id: I6513a98665da1b85ba153edc0d0cfb6d01235406
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-22 20:25:19 +00:00
Henning Gruendl
754be28e36 QmlDesigner: Fix state shown after reordering
Fix an issue which caused the wrong state to be shown in the form editor
after reordering the states in the state editor.

Task-number: QDS-7753
Change-Id: I220bb5b11beb4f9bfc6a85069a688c9ff2984d8f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 20:24:56 +00:00
Marco Bubke
3a102f433d QmlDesigner: Move view manager to components core
The view manager has dependencies on many components so it should be
part of the componets core.

Change-Id: I68d233ca51625f38ed6c30601ec630782dcdf487
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-22 19:27:35 +00:00
Marco Bubke
0be4de69d8 QmlDesigner: Remove parent from abstract view
We apply not very often the parent to views. So it can lead to dangling
pointer if the parent is used by other objects and does not handle the
null pointer case. It can lead to double deletion if the parent is
deleted before the object when it is on the stack or handled by smart
pointer.

If you really want to use it there is still setParent.

Change-Id: I1fc6b145a50f037a0e9d415fb36e7970ea7296ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-22 19:08:12 +00:00
Marco Bubke
4bb4e07ad8 QmlDesigner: Inline SynchronizeCommand
Change-Id: Id030fb6aba7f1ba61ce97ebebb5e91a809ab6d8d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-22 19:06:21 +00:00
Tim Jenssen
1518a74dff qmldesigner: fix crash
Change-Id: I0b141fc707f9db686144c7d19572771e83ca5f55
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-09-22 18:31:18 +00:00
Marco Bubke
68f27f3f04 QmlDesigner: break dependency to Core::IContext
Move the dependency from the abstract view into the plugin class. The
abstract view is now only returning the id.

Change-Id: I4f508c907bcdc8f717817fd40ef9c933e5fe2211
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>
2022-09-22 17:00:32 +00:00
Marco Bubke
1669f3996c QmlDesigner: Add showException callback
Breaks the dependency of the exception to the messagebox.

Change-Id: I836f87704f68c9dc98dfb5cdf9eafe86b42892d6
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>
2022-09-22 16:52:39 +00:00
Marco Bubke
6822b2f04a QmlDesigner: Use new validation approach in 3D editor
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I447e106d1b5deb3af92046c6ee8907341c7d5220
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 16:45:09 +00:00
Alessandro Portale
0a6523e7f1 QmlJSEditor: Convert to using Tr::tr
Change-Id: I7e6bc774cdac0ead8ef944a46db120d290419f18
Reviewed-by: hjk <hjk@qt.io>
2022-09-22 16:37:56 +00:00
Marco Bubke
016fb66c96 QmlDesigner: Cleanup QmlTimelineKeyframeGroup
Many checks are not anymore need so we can just remove the code and make
it clean what we want. Use the filtered algorithm to remove some loops.
We add Utils::filteredCast to algorithm.h to return a different result
container and let it be cast in std::copy_if.

Change-Id: I114c17cd2d5a69c9ebbfbd804805c4d2fa0599e1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 15:26:00 +00:00
Brook Cronin
e28810b50c QmlDesigner: Fix Scrollbar size and colors
Task-number: QDS-7741
Change-Id: I013fcfe1c80ef637388af190d27c4954be650d86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 15:19:31 +00:00
Marco Bubke
8e0c09a35e QmlDesigner: Fix merge conflicts
Task-number: QDS-7672
Change-Id: Iec15fc216c046aebeb5134d1393edb10ea7c19d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-09-22 14:35:59 +00:00
Marco Bubke
57983a97a2 QmlDesigner: Add more node metainfos
Added font, texture and vectors to node metainfo and model. Extend
isBasedOn to 7 parameters too.

Task-number: QDS-7672
Change-Id: I3272fab48a8172c533c9cec0559eb412c3eddbe1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 14:35:54 +00:00
Marco Bubke
828119e308 QmlDesigner: Use new validation approach in material editor
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I9c93498b96c1f1facd72a98d58751d3ad031c483
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 14:34:15 +00:00
Marco Bubke
7b7b3b3833 QmlDesigner: Use new validation approach in components plugin
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I93fa7cf36f1764cd857770ae4dcaac28b06445ac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 14:14:41 +00:00
Marco Bubke
2d1d263bad QmlDesigner: Use new validation approach in navigator
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: Icfdf53cbf02a08e8922258b4bd93ebb4cf3d2e64
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:13:27 +00:00
Marco Bubke
441cc6de08 QmlDesigner: Use new validation approach in item library
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I84d5330d2666968eec757f70eceb73b45ce72383
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:12:11 +00:00
Marco Bubke
bc42c618e1 QmlDesigner: Use new validation approach in integration
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: I04a800edab774604d825d53a368d05b8520f9e22
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:11:39 +00:00
Marco Bubke
578c6483b7 QmlDesigner: Use new validation approach in NodeInstanceView
Many validation tests can now be skipped.

Task-number: QDS-7454
Change-Id: Idb93b565415ea715db143b292988679c221b2a5a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-22 14:10:35 +00:00
Marco Bubke
e6a74d8d13 QmlDesigner: Make variables compile time constant
Change-Id: I5ef7a3cc1f3d070482311993a9ac9e9e68faa905
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-09-22 14:09:03 +00:00
Marco Bubke
96f0a7ae1b QmlDesigner: Remove static keyword for for internal linking
From cppreference:

internal linkage

The name can be referred to from all scopes in the current translation
unit.

Any of the following names declared at namespace scope have internal
linkage:

* variables, variable templates (since C++14), functions, or function
  templates declared static;
* non-volatile non-template (since C++14) non-inline (since C++17) non-
  exported (since C++20) const-qualified variables (including constexpr)
  (since C++11) that aren't declared extern and aren't previously
  declared to have external linkage;
* data members of anonymous unions.

Change-Id: Ibbd7c3925ead59879039d4b266ebfda548c68744
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-22 14:08:39 +00:00
Mahmoud Badri
1664a5f4e2 QmlDesigner: Remove "Material" word from the bundle material instances
TO save space and make material names clearer.

Change-Id: I1cea8787ca03a37adca6e4a0f352732d50bc1b40
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-09-22 13:43:45 +00:00