Commit Graph

67787 Commits

Author SHA1 Message Date
Henning Gruendl
e3e62d852f ADS: Fix workspace dialog on removal
- Fix an issue where the list of workspaces is not correctly updated
  after removal of a workspace in the dialog
- Fix initial sorting of the workspace model

Change-Id: I0c16aabc1fdcc2690fcb83e40b0d5d16cb6c72ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 14:34:53 +00:00
Henning Gruendl
5803448ea0 ADS: Add workspace switcher ComboBox to Toolbar
Change-Id: Ice2e38ac8fd7a0a4ef174d443b9f7e308239aa40
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 14:34:44 +00:00
Eike Ziller
038e8491ee litehtml: Fix selection artifacts with scaled view
If you zoom into a page (Ctrl-+) and then select, artifacts could be
left behind when dragging or removing the selection again.
Fiddle around with coordinate transformations (with regard to rounding)
to fix that.

Change-Id: I68c29d8e3559b90dbb3b93550338e483d14731bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-13 14:17:16 +00:00
Mahmoud Badri
11bd2f8deb Enable Copy, Cut, and Paste in the Editor 3D
Task-number: QDS-1563
Change-Id: I22c3017b8c158d8bc084f050baef89fa8fffd365
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 13:25:58 +00:00
Christian Stenger
38458c3e40 Squish: Fix tst_qml_locals
The content of the locals and expressions had
changed as it nowadays provides information
on the qml engine as well.
Adapt the test accordingly.

Change-Id: Ib5fa96e3150206a374ac5e115e789cc3b983497b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-13 12:35:45 +00:00
Henning Gruendl
0b7970feb4 ADS: Fix repeatedly dropping in same area crash
6c687d28def5c24f3eeb67c9e13d5cfab40cebd0
1c2383f8eb94bc8570e554efa5f842a8ab1461ea

Task-number: QDS-1751
Change-Id: I933b1f53da8ce423cd5d38ff2863f58606006596
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 12:29:51 +00:00
hjk
2c79196ab5 AutoTest: Tie framework settings explicitly to ITestFramework instance
This leaves no doubts regarding lifetime and type.

Change-Id: I1fdd60427a469f32236ea0fa923ec9fa308c338e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-13 11:12:36 +00:00
Miikka Heikkinen
206e7d3e70 QmlDesigner: Fix crash at project open when 3d edit view is undocked
Task-number: QDS-1739
Change-Id: I7a97fb8e22acca22744443b2a664ec230465905d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-13 10:43:03 +00:00
Miikka Heikkinen
83d590950b QmlDesigner: Edit 3D view icon update
Added icon for spot light gizmo and updated directional light icon.
Removed icons that are no longer needed on puppet side.

Change-Id: Id1e72c80e122250f7edc8a69a0e5720e755b96fc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-13 10:08:14 +00:00
Leena Miettinen
83a60f10ce Doc: Update info about managing workspaces
Change-Id: I1cd79ac60641d99b86b246cb540cb6a9e70d1f30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 09:37:58 +00:00
Christian Kandeler
ea8efe58c6 QtOutputFormatter: Use cursor object from base class
There does not seem to be a reason for the duplication.

Change-Id: I7c9b016c76a9aa93ccd93af0aea931fa5b148300
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-13 09:04:48 +00:00
Leena Miettinen
0e71463b91 Doc: Describe Qt Quick Designer annotation editor
Fixes: QDS-1485
Change-Id: Iabb3c6efa738df028f94e14810f9b4cfaad7b2dc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-12 15:09:10 +00:00
Federico Guerinoni
f6cfcc4411 QrcEditor: Add action for ordering resource list
Change-Id: I8c2d53649af420b324d6a0f57b09d1cd4ccd5e25
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Andrea Ricchi <aricchi95@gmail.com>
2020-03-12 14:26:51 +00:00
Miikka Heikkinen
644493fa59 QmlDesigner: Delay camera frustum geometry update in edit 3D view
Calculating camera frustum geometry requires linked camera spatial
node to be up-to-date. However, we can't control the order in which
the spatial nodes of cameras and geometries are updated, so geometry
update will often happen first. Therefore we need to defer geometry
update to the next frame when we detect camera change.

Change-Id: I056eb1bf95db357a73511a6bb7ef0c55c6f4befa
Fixes: QDS-1649
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-12 13:37:53 +00:00
Denis Shienkov
818d79b655 BareMetal: Add support for peripheral registers view using UVSC provider
Now it is possible to use the SVD files to read or write the peripheral
registers of a target device.

By default a paths to the SVD files automatically comes from the installed
"Device Software Pack" database and don't need to be changed by the user.
But, if a user needs to change the SVD file, then it can be done via the
provider's device selection options.

Tested on Windows with Keil MDK-ARM v5.23 using the STM32 NUCLEO-F767ZI
board.

Change-Id: Ia39e8d9a25cd24461804d47830ee9e8f01486108
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 12:46:15 +00:00
Assam Boudjelthia
be8cdeafd6 Android: Allow adding OpenSSL libs directly from project settings
This serves as a convenience addition to allow users to directly
include OpenSSL prebuilt libs for Android. The path of the OpenSSL
would be defined once in the Android options page, and always used
to include the libs when needed by the user.

How this works:
1- A download button is provided, it first tries to automatically
git clone the OpenSSL repo to the defined path. If the cloning fails,
the repo URL is opened externally for maunual download.

2- If SDK tools auto download is used (like for first time setup),
the OpenSSL download will start after SDK eseentials are installed.

3- Once the libs path is set, it can be used by AndroidBuildApkWidget
to include() function to the project (qmake/cmake). It also, should
detect if the include() part already exists in the project file.

Task-number: QTBUG-80625
Change-Id: I338e916f03f4ff55db25a118f1ea08f1da5dd103
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 12:09:54 +00:00
Ville Voutilainen
a92156b08f Android: fix a logical thinko in manifest editor's icon handling
Change-Id: I9b9a4b602c8b01f4c9bc9c11fd0f029d6eff9596
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-12 12:04:59 +00:00
Robert Loehning
810538c281 Squish: Adjust expectations in suite_CSUP
Task-number: QTCREATORBUG-22728
Task-number: QTCREATORBUG-22729
Task-number: QTCREATORBUG-23159
Change-Id: Iad21fa8e82f314bc7bde42dc184cf72553eab3a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-12 12:04:20 +00:00
Christian Kandeler
1b9804693d CompilationDb: Make use of BuildSystem base class parsing infrastructure
Change-Id: I928e173b35b87c0fcb8fc97785ddfa4a2414740d
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:57:55 +00:00
Christian Kandeler
c679a3ac72 QbsProjectManager: Make more use of base class infrastructure
No need to duplicate the timer. Now BuildSystem::isWaitingForParse()
returns the correct result.

Change-Id: Iab754b2c488c48302039988bd36e51f00e0f1196
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:57:38 +00:00
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
Christian Stenger
effb6133fd AutoTest: Fix debugging of QuickTests
Fixes: QTCREATORBUG-23709
Change-Id: Ib728fe0c4ec4eb99759fcc324e987e3866be42f6
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-11 11:39:11 +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
95d41fa23e Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I94a94a15df433d6caa8922fccaa69918b5e4e365
2020-03-11 07:29:47 +01: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