Commit Graph

63094 Commits

Author SHA1 Message Date
Leena Miettinen
757e55d50b Nim: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Iac90517e08ce5182baf810b0ff4b48dc0e40165e
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:54:32 +00:00
Leena Miettinen
0bd2a3d4d4 CppCheck: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I7ad156fd5dca688a05bff3fc394ca67356378eb1
Reviewed-by: Sergey Morozov <dev@gres.biz>
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:54:08 +00:00
Christian Stenger
38cf9047c9 Squish: Adapt to changed tool tip text
Change-Id: I7c86bcce5ee5c58147810243d6b7e7c59df94f21
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-12 11:51:35 +00:00
Friedemann Kleint
b8ad0fdae9 Fix QPainterPath-related compilation errors in Qt 5.15
Some include of QPainterPath was removed in Qt, causing errors like:

easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath'
easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath'
easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int'
to 'const QPainterPath &'
easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath'
easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath'
...

Add the missing include statements.

Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-12 09:47:02 +00:00
Christian Kandeler
1de9e9e402 Android: Add missing reset of state variable
The m_skipBuilding variable in AndroidBuildApkStep needs to be re-
calculated on every call to init().
Also add some debug statements that will help us find out why it becomes
true in the first place.

Task-number: QTCREATORBUG-23572
Change-Id: I058b58cf0e511557d1fad7e5bd03048a7d8b9c69
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-03-12 09:19:18 +00:00
Miikka Heikkinen
2c842453b0 QmlDesigner: Add light meshes to edit 3d view
Change-Id: I996498fde14510fc78c729f56cb8d46b28b233bb
Fixes: QDS-1634
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-12 09:06:48 +00:00
hjk
3d67fbc55f Qmake: Do not delay initial parsing
And add some logging to make the situation debuggable.

There are a lot of reasons that currently trigger (or attempt to
trigger) parsing, including two unconditional ones on build system
construction and fromMap. Some can be avoided, but keeping track of
which one will be the "needed" one gets tricky without additional state.

So turn it around and try to reparse "immediately" until such a parse
finished. The parser itself is robust enough to deflect repeated
runs before the first one finishes.

Change-Id: Ic992b8730fa3a09ca14532cdd9bdbab4c245cb41
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-12 09:01:26 +00:00
Leena Miettinen
9e915ecba0 Doc: Describe Qt Quick Designer 3D editor
- Pull source files from /doc/qtdesignstudio/srcqtquick3d-editor
- Add the necessary defines to link to additional Qt modules
- Use the same structure and files for the Qt Quick Designer parts
  as in Qt Design Studio Manual
- Move some overviews to /doc/qtcreator folder
- Fix the TOC and the navigation links

Change-Id: I2103a8e635e537fd276b3e14feeb8f50beb92cae
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-12 08:40:41 +00:00
Eike Ziller
9c50a783e0 Update 4.12 change log
Change-Id: I74fc541c6a9f78c546311b150c5b3a79557b68f7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-11 12:55:19 +00:00
Thomas Hartmann
c3fec9e79f QmlDesigner: Enable anchoring only in base state
Change-Id: Ief2670951281ed801a183057acfaa7d3cad2b3f4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-11 12:01:56 +00:00
Leena Miettinen
5df9df04be Help: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Ib350a6cb538b12dab24a4dfeb5caf6f779054d83
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-11 12:01:52 +00:00
Thomas Hartmann
ca30e5612d QmlDesigner: Update StatesEditorView model when state property changes
Change-Id: I3e6f259fddfba1cd2ee89b8ee744b914f36dc418
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-11 12:01:43 +00:00
Thomas Hartmann
a78522a800 QmlDesigner: Add states property
Change-Id: I17162c01c9b54a70a726990510368cc363ccfb38
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-11 12:01:29 +00:00
Leena Miettinen
054fcc8785 Clang Tools: Fix UI text capitalization
Task-number: QTCREATORBUG-23683
Change-Id: I81d6a0716fe04dabd6cb80010d5affec96a86ddf
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-11 12:01:25 +00:00
Leena Miettinen
25b438b6f3 Project Explorer: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Idd3a1691c8a2fb46d8289a0de60a39f7020bc5a9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-11 12:01:05 +00:00
Leena Miettinen
9618e57c80 Remote Linux: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Ibf5df6d46d0fcfcd7b91a48a51a3c9413a9f9a3d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-11 12:00:49 +00:00
Leena Miettinen
8bb3102438 qmake: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Id567c21af61c939e177c65b2e1907b13f9b0bb62
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-11 12:00:38 +00:00
Leena Miettinen
5290660932 Qbs: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I33dd13019dfd73912b10abd05e95f257fa52e8e0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-11 12:00:23 +00:00
Christian Stenger
769bd017b9 AutoTest: Remove unreachable code
Change-Id: I98d3d21fe8239f376e0c2619b10bc5b44267cb0e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-11 11:39:31 +00:00
Leena Miettinen
ff8751c576 Git: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I1843de5a9166760bf52632f75dab74507029bf8c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-03-11 10:23:37 +00:00
Leena Miettinen
6d484ec120 QML/JS: Fix punctuation of error message
Task-number: QTCREATORBUG-23683
Change-Id: Idb503e00b4f48dfe9ac20d5cc49f6df01153dd20
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-03-11 10:12:14 +00:00
Leena Miettinen
4354ea8df9 CMake: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I56af56e745fe4237e1bb9df94f8cd423585e63a4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-11 10:06:41 +00:00
Leena Miettinen
1f26c6d1b9 Qt Quick Designer: Fix UI text punctuation and capitalization
According to the guidelines in
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Id1f484855396c16d629b5743bef9710e84ba2cd6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-11 08:38:21 +00:00
Eike Ziller
c0704f51b2 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I7960e0df40458d1052e14c95b5556871b50159c4
2020-03-11 07:20:16 +01:00
Eike Ziller
3992e3c113 macOS: Fix label color in tool buttons
For example the "Ignore Whitespace" button in the diff viewer

Change-Id: I9882b9d2f3e22635bfbb047904ef284dd515db9f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-11 06:10:04 +00:00
Thomas Hartmann
4ce49bbfde QmlDesigner: Add toolbar back to ConnectionView
Setting the fusion style only on the stack widget to keep the toolbar style.

Change-Id: I33b8256f894fa417a8729b8cdebb19a3128f1fde
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-10 16:56:32 +00:00
Thomas Hartmann
97112f3e4d QmlDesigner: Add back toolbar to NavigatorView
Change-Id: I9e8c0372a85ec40b795f8d8fc68bb22959f73513
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-10 16:56:10 +00:00
Thomas Hartmann
af8e153077 QmlDesigner: Create NavigatorWidget lazily
Change-Id: I12ebee0867de01af77c37ff97ad9bd4772f06b05
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-10 16:55:52 +00:00
Robert Loehning
aac77eecb9 Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 15:59:08 +00:00
Alessandro Portale
4e4b8965a9 McuSupport: Introduce a separate status label
The status label will notify about missing CMake, etc.

The Kit Creation info label should only inform about the kit options for
the currently selected target.

Change-Id: I8786fe287f5fa28b46bb0e6d2d88517ec2593e05
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-10 15:23:34 +00:00
Aleksei German
0702f65a52 QmlDesigner: Add Default State button
Added functionality to change default state from UI

TASK: QDS-1747
Change-Id: I78c0a5e8f5abfc18b4dbce9e283ceb1307a537ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-10 14:41:01 +00:00
Mahmoud Badri
4a11975956 QmlDesigner: Update cullingMode API to QtQuick3D 5.15 specs
Change-Id: Ic4fc6bbd4d2bb7e9968c337eb5775a04c1a6f59c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-03-10 14:01:38 +00:00
Christian Kandeler
8914d8565e ProjectExplorer: Fix memory leak in "New File" dialog
Change-Id: I729392c04d2bb9e02f882d62e371e5fbc286afc4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-10 11:03:25 +00:00
Eike Ziller
7c7c5d5a4f Add changes file for 4.11.2
Change-Id: I6bd6bc3e682c13ca562bcf33f458444e8f74b353
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-10 09:16:06 +00:00
Christian Kandeler
233c438a2d QbsProjectManager: Consider cpp.platformDefines for the code model
Fixes: QTCREATORBUG-19537
Change-Id: Ia51441491913da0f7b31c2ff02e2552ff58147f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 08:47:11 +00:00
Alessandro Portale
8652188ac9 McuSupport: Restructure UI to reflect the data hierarchy
1) User selects the Qt for MCUs sdk dir
2) User chooses which board to configure
3) User provides paths for dependencies
4) User creates Kit

Change-Id: Ia30ca7e245e2500c7650d12ea6768ab6e60d99c7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-09 18:51:05 +00:00
Henning Gruendl
9d4a6092d2 ADS: Fix Preset sync failure if directory missing
Change-Id: I23ed2a12753058b36a708c9aff64291782b73809
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 14:28:21 +00:00
Henning Gruendl
74eaa8f883 ADS: Integrate newest base repository commits
f3c5d5138024acfb0991fa1794da70a19240c820
fe10b570d3c17eaaf7c4c67e4cf7d56550e6e9e4
4cb1931acec0ce21e0ebc38742b3d4f1c066e368
59c783831ad23238e41205a5da854a9eb39ce777

- Fix reception of escape key press events
- Fix display of container dock overlay
- Fix comments

Change-Id: I34387046335b3d57434decd5714da7ae307bcc05
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 14:28:08 +00:00
Christian Kandeler
7f1c1baf8c ProjectExplorer: Register the "QtKeywordsEnabled" macro in time
It was used in the header template before we made it known to the
wizard.

Fixes: QTCREATORBUG-23603
Change-Id: I4b0f77c199aa22cc1b9853657695cdb10b96faad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-09 13:26:13 +00:00
Henning Gruendl
aaa9a51511 ADS: Fix QHash unite warning for 5.15
Change-Id: I384f810bd15ec0c0b191dcdd0654f089de9e8ecb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 12:17:33 +00:00
Christian Stenger
5db38c5937 AutoTest: Fix enabled state of framework root
Do not evaluate the invisible root as it is not a
real test tree item.

Change-Id: I944c1ac2f8ed3ff47cd8036ebf8fd8319e05e1ab
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-09 11:59:26 +00:00
Miikka Heikkinen
9abd96e38f QmlDesigner: Fix edit 3D view tool state initialization
Edit 3D view tool state is now always initialized to a stored
"no scene" state if one exists to ensure further scene changes
properly inherit the tool state in all cases.

Change-Id: Ifee5fe58255b51d9dbed57abb2020ea00d94af2c
Fixes: QDS-1750
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-09 11:58:42 +00:00
Henning Gruendl
73aaa2a381 ADS: Hide detached window if not in design mode
Task-number: QDS-1672
Change-Id: Ia20113cb9025c19194d87920cf060d2b9791e52a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 11:40:19 +00:00
Aleksei German
6de4e49646 QmlDesigner: Fix Add State Button spacing
Task: QDS-300
Change-Id: I3c69e9b3871a8879137d25c92cbef3c1a4ae9e8b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 11:38:21 +00:00
Henning Gruendl
dc2abffe60 QmlDesigner: Fix crash on shutdown
Task-number: QDS-1749
Change-Id: I0ddfcc98080de0bdf2f620fdad387b3a4a582c4e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 11:37:42 +00:00
Christian Kandeler
ce3103194f CppTools: Fix code model with clang and precompiled headers
Amends a1d22fd2f7.

Fixes: QTCREATORBUG-22897
Change-Id: Iaadf72d78e11279c8dd553860e00be9d29135752
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-09 11:31:42 +00:00
Henning Gruendl
4f6ef7b698 ADS: Disable workspace menu if not in design mode
Task-number: QDS-1741
Change-Id: I8ab9f9f130d74c1dd426077d1b8b9500534b380f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 11:23:11 +00:00
David Schulz
df2efd7df6 Dumper: raise exception in gdbbridge callHelper on Windows
Gdb from MinGW 7.3.0 and 5.3.0 crashes on Windows when we try to
evaluate expressions that result in a function call. At least prevent
evaluating such expressions from within the dumper.

Task-number: QTCREATORBUG-23477
Change-Id: Ic14148a43b95aa1b52c1d4488958fa66eccdc0b5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-09 09:20:06 +00:00
Miikka Heikkinen
efa11e690b QmlDesigner: Remove remaining separate edit 3D window code
Change-Id: I3d745b54ae3aa5c3c05c859239934125b9ca828d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-09 08:41:55 +00:00
Miikka Heikkinen
e8f76f0050 QmlDesigner: Store 3D edit tool states per document
This way we avoid interference from scenes in other documents.

3D Edit view content is also cleared whenever a model is detached,
and puppet resize is automatically triggered if incorrectly sized
image is received to keep edit 3D view content up to date.

Change-Id: Ic7a71f1d89f0ebfe5a62b49ea62570242b8f5b1d
Fixes: QDS-1734
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 08:41:42 +00:00