Commit Graph

67787 Commits

Author SHA1 Message Date
Aleksei German
ea20e6c0a8 QmlDesigner: Fix for Rich Text Editor
- Fixed tables style
 - Added border around color selector button

Task: QDS-2634

Change-Id: I5a164fedaefa87f394c7815a5bb416ec7898417e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:04:41 +00:00
Thomas Hartmann
aa055e74dc QmlDesigner: Change default zoom level for transition editor
Change-Id: Ibc120298cdb766e5ff53fa3b7fda40db7d89650b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:03:58 +00:00
Thomas Hartmann
e2e2c46206 QmlDesigner: Avoid visual artefacts
Avoid visual artefacts when changing states.

Change-Id: I00aa1499ff027d060b06699b60ebd2d5162d0e16
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:03:41 +00:00
Thomas Hartmann
acdb971048 QmlDesigner: Add suffux to invalid ids
Instead of replacing them with "element" add a suffix.

Change-Id: Idc72ba9a8a7b4f48d4e325378b975cafeab88bd4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-27 10:03:27 +00:00
Christian Kandeler
151373396f QbsProjectManager: Fix install step
We got the install command name wrong, which caused the installation to
fail. In addition, we forgot to add handling for the "protocol-error"
message from qbs, so the step was hanging, rather than aborting.
Finally, we triggered a number of assertions in
BuildStep::buildConfiguration().
This went all unnoticed for a while, because the install step is not
enabled by default these days.

Change-Id: I906e7e472563d4ad8fc7557bd706a7cb67f9f2ba
Reviewed-by: hjk <hjk@qt.io>
2020-08-27 09:38:55 +00:00
Christian Kandeler
4f2a21541e Debugger: Fix environment passed to inferior by gdb
We must not set variables that the user disabled.

Change-Id: I2f559aefd6aaa43298dd9c4889a614a5130622c0
Reviewed-by: hjk <hjk@qt.io>
2020-08-27 09:38:23 +00:00
Leena Miettinen
ce19b108d1 Doc: Add the folder where the Qt Bridge installers are found
The installers are copied to the QtDesignStudio folder by the
Qt online installer.

Task-number: QDS-2542
Change-Id: Ib5e9bbb3c7a2cf03a4abd3e8b39759173a37ad5a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-27 06:39:58 +00:00
Christian Stenger
b938764820 Utils: Simplify pathchooser validation
Allow to set a default value for the PathChooser which will
be used on the one hand as placeHolderText and on the other
hand for the default validation if the underlying line edit
has no text set.

Change-Id: I49d2f773cf3933cb30b54ee6de82290b480e743d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-27 04:29:47 +00:00
Christian Stenger
0de1668802 Fix qmake build of unittests
This basically continues / amends work done
with e1c88116b3.

Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-27 04:28:52 +00:00
Eike Ziller
666cdd754c Bump version to 4.13.1
Change-Id: I94246bd22b4868f5c99f334d1360c88ea136d24c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-26 13:23:30 +00:00
Eike Ziller
6efb09a86a Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I8b11dad770b37a7f6029ae818c9d92a24818e56d
2020-08-26 13:12:21 +02:00
hjk
8cf1b598fe Android: Inline AndroidDeployStepWidget
BuildStepConfigWidget with manual tweaks is good enough.

Also move AndroidDeployQtStepFactory to the usual place at the
end of the file.

Change-Id: I92af31ef77f986b6fcd84a14ac62b70e2da32ff2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 10:43:07 +00:00
Orgad Shaneh
29ecf16ed3 Dumpers: Fix string+allocator dumper for old GCC versions
Older versions of GCC headers don't have _M_string_length.

Tested against GCC 4.4.4.

Change-Id: Ib3a025edeb26afce7fd54acfb6e965e64200f024
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-08-26 09:23:27 +00:00
hjk
29a9565c89 Meson: Start aspectification of NinjaBuildStep
First step is to inline mesonbuildstepconfigwidget.ui.

As side effect, don't skip row 0 in the form layout and drop the intermediate
QFrame/QVBoxLayout level and insert the searchable wrapper directly.

Change-Id: Ibf2e348b2990ba48126ad7b92e98d0bcd8116196
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 08:52:25 +00:00
hjk
0538e8bfbd Nim: Move NimbleTaskStepWidget closer to NimbleTaskStep
Next step towards NimbleTaskStep aspectification.

Change-Id: Ifdb7d942e29ab99da01c6797d1edddd68afc5e30
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 08:52:11 +00:00
hjk
367624fbf2 Nim: Inline nimbletaskwidget.ui
A step towards NimbleTaskStep aspectification.

Also remove the intermediate QFrame, QListWidget is-a QFrame itself.

Change-Id: I1e37dc28ef2c8a89aff7c4baff0c1bd82ff3306f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-26 08:23:58 +00:00
hjk
070e0932c9 ProjectExplorer: Remove redundant MakeStep::{is,set}Clean()
This was only used for setIgnoreReturnValue(), which can be done
directly and also does not need to be stored in the settings.

Change-Id: I7419efe66d164b223463e19c3daf2350b4a2bae4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-26 04:51:47 +00:00
hjk
6c785c05ab ProjectExplorer: Remove ProcessParameters::resolveAll()
On all code paths, this was implicit in a ProcessParameters::setCommandLine()
which was on all code paths either called directly immediately before, or as
part of ProcessStep::setupProcessParameters().

With ProcessParameters::setCommandLine() as only user, this could be
inlined there. The effectiveWorkingDirectory() turned out to be out of
place and rather accidentally working there and was moved to
ProcessParameters::setWorkingDirectory().

Change-Id: I634f6086c2324e3cbecd3e5d50e22afc722abd3f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-25 14:19:04 +00:00
hjk
4b98cadb3a Qbs: Continue QbsInstallStep aspectification
Special QbsInstallStepWidget can be dropped.

Change-Id: I9040bbaa59c9da201c66a60a6ce9285cd53cf607
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-25 14:08:22 +00:00
Christian Kandeler
a2db85b11e C++: Fix indentation of doxygen comment continuations
Align also after the leading asterisk.

Fixes: QTCREATORBUG-11749
Change-Id: Ic054598c80206bf38b74345aed20d88486f57cad
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-25 12:51:10 +00:00
Eike Ziller
00ced26f47 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
2020-08-25 12:42:04 +02:00
hjk
fff3b41833 QmlDesigner: Fix UB in QmlPreviewPlugin::getPreviewPlugin()
Each call to PluginManager::plugins() creates a new QVector object,
iterators are only comparable for iterators from the same vector.

It worked in practice because the underlying storage was the same
here as the QVector objects were only shallow copies.

Change-Id: I2e276535942bd949acf91e12873c7bdf9d5c34d6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.13.0
2020-08-25 09:48:03 +00:00
Eike Ziller
5cece408de Update change log for 4.13
Change-Id: I45ee7f7498fc3ed087bd2054d15f75c001c5f504
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-25 09:40:14 +00:00
Marco Bubke
7962dbb413 QmlDesigner: Fix CapturedDataCommand
Change-Id: I7dbbce3c071440924550140002d81128befa3404
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-25 08:22:08 +00:00
Leena Miettinen
1bfd3bd8f2 Doc: Generalize info about sharing project settings
...to apply also to CMake projects

Change-Id: I5e42c15c273724c04ec9474a85cc36df8fb3069a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-25 07:57:38 +00:00
Leena Miettinen
2d12e6b119 Doc: Update Qt Quick Designer overview
Update screenshot.

Change-Id: I5be9abd2e741e738718b7dcbb589ad4425e54e67
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-25 06:59:41 +00:00
Leena Miettinen
470278dfe7 Doc: Fix some typos
Change-Id: Ice19099cb58acaef81cec5e34c62e61f54c0d13e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-24 15:18:46 +00:00
Leena Miettinen
048d6164cc Doc: Describe exporting and importing workspace settings
There are Import and Export buttons in View > Workspaces > Manage.
Update screenshots and add one of New Workspace Name dialog.

Change-Id: I679b7952e498576a58ebb4134d08c21fe2555fc7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-24 15:00:37 +00:00
Christian Kandeler
d65ef60ea2 clang: Fix include/resource dir confusion
The getClangResourceDirAndVersion() function in ClangTools could return
the actual resource dir or the include dir, depending on the input. This
mistake happened because of misleading names spread all around the code.
Now the function returns what it says, and the other names are accurate
as well.

Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-24 10:18:30 +00:00
Christian Kandeler
643c9405bd qbs build: Add cmake project files
... so they show up in the project tree and search results.

Change-Id: I42ae1f0c2f96ea07952c7b23bd809cddd938c69f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-24 10:18:08 +00:00
Christian Kandeler
a40d2ea705 CppTools: Do not ignore "built-in" compiler macros for custom toolchains
Built-in compiler macros are normally not passed to the code model,
because of potential conflicts with clang. However, in the case of custom
toolchains, these macros are provided by the user for the explicit
purpose of making them known to the code model.
Another exception are the bare metal toolchains, for which we now make
sure we won't get out of sync when new ones are added.

Fixes: QTCREATORBUG-24367
Change-Id: I2a0458d9132fdff15eb9adfcb2c06d7ef72508bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-24 10:02:20 +00:00
Leena Miettinen
493000e211 Doc: Describe debugger general and CDB settings
Task-number: QTCREATORBUG-24500
Change-Id: I9085dfdca1b59796a1ccba6db379eaa8559e724c
Reviewed-by: hjk <hjk@qt.io>
2020-08-24 09:18:36 +00:00
Ivan Komissarov
5de29d1212 Update qbs submodule
To the head of 1.17 branch

Change-Id: I4254418c746303c8a340a93f42128f34d4fa69b9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-24 09:18:15 +00:00
Christian Kandeler
a8b208bfae Revert "BuildDirectoryAspect: Print non-existing directories in red"
It's not an error that a build directory does not exist.
This reverts commit 2e4915bdb9.

Fixes: QTCREATORBUG-24503
Change-Id: I6138917885b6adbfaef6c49e54a3ea9900ed6b2e
Reviewed-by: hjk <hjk@qt.io>
2020-08-24 09:05:25 +00:00
hjk
61c8a93522 ProjectExplorer: Use new AspectContainer and TextDisplay
... as replacement for OverrideMakeflagsAspect.

Change-Id: Id8a3ccde7bf3b7c62679e927a82ce7d6acd37e66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-24 08:23:00 +00:00
Thomas Hartmann
1d53e37b6d QmlDesigner: Remove unused custom notification
This notification is only for debugging and breaks encapsulation.

Change-Id: I20faeb76d24cc42417b3cc2e289041c70edd6157
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-24 08:03:13 +00:00
Leena Miettinen
52622a036b Doc: Add info about supported property types
Also describe that custom properties are visible in the
Properties view, where their values can be set.

Change-Id: Ie82975116ae4de0ebb92050e7e2190315521ff8b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-24 08:01:47 +00:00
Miikka Heikkinen
4d3b34b4b0 QmlDesigner: Blacklist some quick3d property names as ids
Quick3D has some properties that are named same as default ids for
some other types, causing conflicts. Blacklist offending properties as
ids.

Task-number: QDS-2636
Change-Id: I988c69f61608ad7d80726dd74747917360827b84
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-24 07:17:39 +00:00
Christian Stenger
e6c750bd13 PE: Use InfoLabel for TextDisplay
This restores using an additional icon for the
label, but limits it to common ones.

Change-Id: Ic9b1a419525d1fefb071b9f612e910b56a600edf
Reviewed-by: hjk <hjk@qt.io>
2020-08-24 05:33:54 +00:00
Robert Loehning
70a1c6ccf5 Squish: Remove workaround for fixed bug
Change-Id: I1d8d104b9c97c26997a7e4867a51609c84471fa8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-21 15:16:47 +00:00
Thomas Hartmann
9fee8a6bc0 QmlDesigner: By default item frame should be invisible
Change-Id: I60b4fbd3c6c4b74845dad783fc264072627a432c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-21 14:55:26 +00:00
Leena Miettinen
de5858a5a8 Doc: Update information about developing for Bare Metal devices
Change-Id: I6bfbf01c5204f3bcf53375d84cb4604f91c0c7a2
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-21 14:34:01 +00:00
Leena Miettinen
daea5358c8 Doc: Link to the new platform topics from the front page
Change-Id: I3d7bb548a9edb3eca6f6a4bf8c7e9e1bd77f4f7e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-08-21 14:15:22 +00:00
Christian Kandeler
f852cfe284 CppEditor: Skip over access specifier when inserting a doxygen comment
That is, also do function-specific magic on typing "/**<return>" in front
of a function if there is an access specifier such as "public:" in
between.
This use case is rather weird, but it's also pretty easy to support and
it should not hurt anyone.
Note that depending on the indentation of the access specifier, the
indentation of the inserted comment will probably not be what the user
expects, but this is not easily fixable.

Fixes: QTCREATORBUG-20311
Change-Id: Ie32a71eede91ef64a19381c8e379a183a91fd27d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-21 12:23:18 +00:00
Alessandro Portale
2555627b25 CMake build system: Avoid duplicated include paths
Clean the paths before adding them to targets.

This prevents the code completion from showing multiple identical
entries when completing an #include.

It also removes ~2MB from build.ninja.

Task-number: QTCREATORBUG-24514
Change-Id: I19f3df400e65d8dfc4747415a8e14dae05d4b88c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-21 10:39:08 +00:00
Eike Ziller
2a05186194 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	CMakeLists.txt

Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
Michael Winkelmann
c78f9352d2 QmlPuppet: Fix build error for ChangeLanguageCommand on MinGW
Change-Id: I190097871e1abf6932fdbb93293e189af7809793
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-21 07:15:49 +00:00
Miklos Marton
3299239095 C++ Refactoring: Fix the include macros in header files after renaming
Fixes: QTCREATORBUG-4686
Change-Id: If22078bb183910941d8e2a94b0e8629baa2fa8de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-21 06:50:42 +00:00
Wojciech Smigaj
795ccfbffc CMake: Register CMake tools detected while scanning build directories
Fixes: QTCREATORBUG-24502
Change-Id: Idf96e666e783edbf8b0fbe4216affb80b0464104
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-20 21:11:33 +00:00
Tim Jenssen
d011e7df25 add some qmlpuppet cpp files to dev package
Since external plugins are interacting with the puppet
we need them in the dev package.

Change-Id: I871629ad80583a09b842bb60cd5b6fab5b512fae
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-20 17:08:28 +00:00