Commit Graph

67787 Commits

Author SHA1 Message Date
Leander Schulten
7e526d9b05 QmlJs: Fix reformatter for arrow functions
Fixes: QTCREATORBUG-23019
Change-Id: I6c6bee7092cb12f225ad744df2b3834dfd4bbc8f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-12-17 12:17:20 +00:00
Eike Ziller
5572bc7220 Merge remote-tracking branch 'origin/4.14'
Change-Id: Ie52e046f8e280e8c39f0cc5e9e710b4f885010a6
2020-12-17 13:10:44 +01:00
Thomas Hartmann
1ae893de26 StudioWelcome: Do not start with .ui.qml file
Opening the design mode while a project is still loaded
can become incredbly slow.

Change-Id: I692c736269fb130dc33461dcb8a5f6e6e6765b88
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-17 11:53:43 +00:00
Eike Ziller
6a2a07d516 Qbs: Avoid popping up general messages pane
Except on direct user action. Use more evocative message manager API.

Task-number: QTCREATORBUG-24430
Change-Id: I44c6088904b2018baccb72cd3651e2ab62dc1358
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-17 11:22:54 +00:00
Jarek Kobus
265ee14c89 Make buildDerivedTypeHierarchy() a static method
Drop CppTools namespace when being in this namespace.
Move a call to filesDependingOn() into buildDerived().
Make filesDependingOn() a static method.

Change-Id: I6139f87597286bddf8298b06f8cf492066c8bedd
Reviewed-by: hjk <hjk@qt.io>
2020-12-17 11:07:06 +00:00
Tim Jenssen
8d9c39fa30 qmldesigner: on exit crash fix
Change-Id: I11d4e6b6b7bb2d8d862015718ae432b1eaaa8b57
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-17 11:05:27 +00:00
Christian Kandeler
5797b355a7 ProjectExplorer: Fix "open terminal with run env" action
If we trigger this on a project node that corresponds to a runnable
product, then we want *this* product's run environment, not the one of
the project's active run configuration.

Change-Id: I0bdd4c0e983bee5c7c591a948f82dfae79a05a4e
Reviewed-by: hjk <hjk@qt.io>
2020-12-17 10:21:33 +00:00
hjk
c723db7129 ProjectExplorer: Make ContainerAspect emit when subaspect changed
This fixes updating the -j part of the command when job count overriding
is enabled.

Task-number: QTCREATORBUG-25088
Change-Id: Id5af007fe8de463f761136da0f1109bf902b766f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-17 10:17:46 +00:00
Christian Kandeler
44778c490a ProjectExplorer: Add "Open Terminal Here" actions also for project nodes
There is no apparent reason why these actions should only be available
for file and folder nodes.

Fixes: QTCREATORBUG-25107
Change-Id: Ia6a9e5d0be983ceabe5a0abee63d8527daa16f61
Reviewed-by: hjk <hjk@qt.io>
2020-12-17 09:57:35 +00:00
Eike Ziller
9f8a48b245 Python: Be less disrupting with the messages pane
Only pop it open directly after explicit interaction

Task-number: QTCREATORBUG-24430
Change-Id: I55025a901cb3d694994614bae21204ab9da49fc0
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-12-17 08:59:24 +00:00
Eike Ziller
ac2a7bac4b Update changelog for 4.14
Change-Id: Ifb8cd68eab9abfb861c06586e1ca0ca5a43e3d27
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-12-17 07:46:07 +00:00
Alessandro Portale
6ac319b94d QmlDesigner: Remove unused curve editor icon pngs
eye, lock, unlock, pin and unpin are now provided via font icons.

Amends: 8ca3b557da

Change-Id: I435594d3be46ce64dd0c6b178767c899d76c3233
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-16 16:40:04 +00:00
Alessandro Portale
4e81025136 QmlDesigner: Add curveeditor.qrc to Qbs build system
Change-Id: Ib3041f81c6644f65e12e618b747f25a9dc3386ee
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-16 16:39:22 +00:00
Eike Ziller
a052f1f715 ProjectTreeWidget: Use constants and get rid of QLatin1
Change-Id: Iaf155cf01ab502d411b0b5467abe4eff65c798ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-16 16:22:20 +00:00
Eike Ziller
909f74dc56 Fix deployment of clang tools on Windows
Amends ca016bfb2e

Change-Id: I529f7f37b86f086167774e3c8d03761d4cc654a9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
v4.14.0
2020-12-16 12:31:42 +00:00
Eike Ziller
eaefcbd8f0 Use new, more evocative MessageManager API
At various places where semantics doesn't change.

Change-Id: Ib4d4a5c9f067e109126c6de88257f9e198a71447
Reviewed-by: hjk <hjk@qt.io>
2020-12-16 09:30:44 +00:00
Eike Ziller
c898047880 ProjectExplorer: Don't save defaults to settings
Writes less settings and makes it possible to change defaults in the
future.

Task-number: QTCREATORBUG-24762
Change-Id: I73873b3684827b4fe27cfa5ea2f62a76003f9750
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-16 08:40:24 +00:00
Eike Ziller
d68603481d Revert "Help: Update to head of litehtml"
Breaks build on MSVC.
This reverts commit e0661e0630.

Change-Id: Id6e6c1b83ad1dbbe6cad8b555d66fea2e76e9c7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
qds/v2.0.0
2020-12-16 08:35:09 +00:00
Björn Schäpers
8987996500 clang-tidy: Suppress clang warnings
Those warnings should be printed via the clang code model, which can be
fine tuned to (de-)activate warnings. The clang-diagnostic-* warnings
from clang-tidy are not shown in the dialog an thus can not be
selectivly activated by the user.

Change-Id: I80b2cad227a9fd8fa0de253c73c40abfa8076be6
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-15 19:38:30 +00:00
Raphaël Cotty
e8e2aa8c7f Android: fix debugging with qbs
If the default libs path doesn't exist (which is the case for qbs) then
try to get the abis using the current project node data method using
the Android::Constants::ANDROID_ABIS flag.

Because in multiplex (multi arch) mode dynamic libraries are compiled in
different products, library paths must be gathered from those
sibling products using the "dependencies" json array.

Change-Id: I9409a6a12fd9f304f427ed7868a7060c8f985a0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-15 15:39:44 +00:00
Christian Kandeler
3e2d224722 clang: Support user-provided llvm-config
... in the qmake and qbs builds. (The look-up mechanism in the cmake
build is completely different.)

Fixes: QTCREATORBUG-20592
Change-Id: I049740795108060aeada62dd030e82390e07fe48
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-15 14:56:07 +00:00
Eike Ziller
f239fa8676 Fix build-time location of QLiteHtml
QtCreatorAPI sets the output location relative to the project
which makes sense for external projects, but not so much for
internal sub-projects.

In this specific case it cannot be built as a standalone project
at all anymore, since we use add_qtc_library but don't force
inclusion of QtCreatorAPI, so just remove the project() and related
setup.
When QLiteHtml is moved to an actual separate project and repository
this must be reworked anyhow.

Change-Id: I182de09619c2073aa3e1c9809c2251fd88b6bbd7
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-15 14:48:24 +00:00
Eike Ziller
f17bf14533 Help: Use settings->setValueWithDefault
Task-number: QTCREATORBUG-24762
Change-Id: Ia2f7c0834758097814dd6234a6f4fd656a3821b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-15 14:43:17 +00:00
Alessandro Portale
070afbbe4a QmlDesigner: Fix timelineView palette for the flat theme
QmlDesigner's timeline view needs a few tweaks to work well with Qt
Creator's default "Flat" theme. The onboarding text, as-well as the
timeline editor view are concerned.

The These tweaks are supposed to have no visual inpact on the "Design"
theme (thus in Qt Design Studio).

Task-number: QTCREATORBUG-24402
Change-Id: I5848b9f4109d4c37a4c7fd904c715a0e1a99fea8
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-15 13:11:30 +00:00
Eike Ziller
dc297f09b0 cmake build: Fix configuration for BUILD_LIBRARIES_BY_DEFAULT=OFF
Or BUILD_LIBRARY_YAML-CPP=OFF.
In that case the add_qtc_library does not result in a target, so
we must check before accessing it, and should not claim that yaml-cpp
is available if it isn't.

Change-Id: I710ce726d65f7a1c036fd94ebeb18ead290a45f2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-15 12:59:04 +00:00
Thomas Hartmann
7dd067979a QmlPreview: Add missing shader suffixes
Change-Id: I78f8ddea5de5fa01fb69de62d47587254b9daae8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-12-15 12:39:53 +00:00
Thomas Hartmann
663827478a QmlDesigner: Remove invisible char
Change-Id: I559076ccfdcb7fb3767f6767310a84cc113b6c46
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-12-15 12:25:32 +00:00
hjk
093111dbc6 QtSupport: Some code cosmetics in qtkitinformation.cpp
Indentation, final, namespaces, ranged for, ...

Change-Id: I444db5b64025f09c4d79dc901c85f764becff51a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-15 11:43:31 +00:00
Eike Ziller
e0661e0630 Help: Update to head of litehtml
This adds support for ordered lists.

Change-Id: I6ede0cc170e25c410ec440690f1f873fb24c490e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-15 11:22:30 +00:00
David Schulz
b309bdc69d Editor: Fix searching in blockselections
BaseTextFind::findOne relies on calling inFindScope via
QMetaObject::invokeMethod.

broken by a4e23025f0

Fixes: QTCREATORBUG-25006
Change-Id: Iac061b1ecf2bbc3063494a324ad554e5cf749b15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-15 09:11:20 +00:00
hjk
27fe442f4f ProjectExplorer: Consolidate adding Qt host binaries to path
Change-Id: Ia301ae016d1d79e55040003280360aba095f2c03
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-12-15 07:52:24 +00:00
Björn Schäpers
ec0135f517 qml2puppet: Fix build with MinGW
Which was broken in 5daee38e.

Change-Id: Ic43ed4528cb5e2c831e07b17a2ee118583b54526
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-14 19:42:10 +00:00
Thomas Hartmann
aa4b9b88da QmlPreview: Restart if a shader is modified
If a shader is modified we have to restart the preview.

Task-number: QDS-3179
Change-Id: I7d1fbde4a0db0ecd9ac1f2c7eb60d2e919935c73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-14 18:39:42 +00:00
Thomas Hartmann
c9638bf5ea QmlDesigner: Also react to ModelManagerInterface::projectInfoUpdated
If a new file is added to the project we have to react to
projectInfoUpdated. Since the signal cannot be queued we
use an indirection.

Task-number: QDS-3113
Change-Id: I13e6a9623e3c51384435ee9dfd10576a77df3e35
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-14 18:38:04 +00:00
Jarek Kobus
12810caea1 Don't repeat the same code
Change-Id: Ied1d816481bef760a49a4572e9fda1f6ac538daa
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-14 14:51:59 +00:00
Bernhard Beschow
365ae293fc Nim: Fix include path
Change-Id: Iff5ecf8a006f76c35ee1ae8bc3f6f16a71daff58
Reviewed-by: hjk <hjk@qt.io>
2020-12-14 14:49:39 +00:00
Eike Ziller
4bc2b4741d Merge remote-tracking branch 'origin/4.14'
Change-Id: I842a7c7358fd0ff6d85c151806e440043914e09a
2020-12-14 14:19:15 +01:00
David Schulz
30397fd2d4 CMake: add _d filename suffix to python.zip for the cdbextension
... for debug builds

Change-Id: Ia5279aff3658518b946cee3c910b885c5376bfe1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-14 12:36:04 +00:00
Jarek Kobus
cf010911f7 Don't allocate unneeded temporary containers
Fix clazy warnings: allocating an unneeded temporary container
[clazy-container-anti-pattern]

Change-Id: I4b4c2c634eea650bbdf3c12d982a17f899fc94ec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-12-14 12:35:47 +00:00
David Schulz
93dd966ce2 CMake: add missing Utils dependency to extensionsystem test
Change-Id: I95a518e3ecb098bd39a06f921bfbeb1b6fb0126f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-14 12:35:22 +00:00
Oswald Buddenhagen
a55b7c6094 clean up output printing in dumpBacktrace()
the first call to readAllStandardOutput() made no sense, as the buffer
would be empty at that time anyway.

Change-Id: Ie306745a94f98ce358e4af373169d0a5b0a82d23
Reviewed-by: hjk <hjk@qt.io>
2020-12-14 12:27:23 +00:00
Eike Ziller
e2a2af5d18 Update and overhaul README
Our binaries no longer support Ubuntu 16.
Update LLVM requirements.
Move build instructions to use CMake and overhaul the complicated
Windows instructions.

Change-Id: Idf139fd76b0cfb91dbce11f7b814ec8abd9b21f6
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-14 12:26:58 +00:00
Richard Weickelt
064740e1b7 Update Qbs submodule to head of 1.18 branch
Change-Id: I9b94a53c3e378c370a1723cd163181b1d3d21471
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-14 11:42:56 +00:00
Christian Kandeler
521745856f Fix warnings about unused lambda captures
This is the subset of clang complaints that MSVC does not disagree with.

Change-Id: I0bc38b0c847d1c54f1ac9cca95d93577d39ddfcd
Reviewed-by: hjk <hjk@qt.io>
2020-12-14 10:00:16 +00:00
Ivan Komissarov
962918629b qbs: fix installing doc dependenices on macOS and Windows
python still aliases to python 2.7 on macOS, so we need a smarter way to
find python3.

Change-Id: I229d8c1e124fb599119991b44c0f6d88d39b1684
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-14 09:42:40 +00:00
Eike Ziller
4b33979bcd Update change log for 4.14
Change-Id: I3c94cd5241fb79518f84d14409e0c709f4c1a1f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-12-14 09:39:08 +00:00
Assam Boudjelthia
f167811fb1 Android: fix Android SDK default path on macOS
Fixes ec68b4e96c.

Change-Id: I07b3a627c77d363c1e7e3b2ecc1222e211792959
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-14 09:34:47 +00:00
hjk
c6ae5ab506 Debugger: Relax RValueReference test
Exact output depends on too many factors, just make sure the
base type is there.

Make LLDB+GCC on Linux pass.

Change-Id: I520a8367ab00ee95f87b5d4fb935f3ae21efd820
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-14 09:25:41 +00:00
hjk
50b2eb934f Debugger: Disable some static member tests for LLDB
LLDB does not report anything in that case nowadays. Which is actually fine.
Makes StaticMembersInLib and UndefinedStaticMembers pass.

Change-Id: I302ab702e5eacf89fcd08ea1935dbf43e5e56fa8
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-14 09:25:32 +00:00
Christian Kandeler
9c2ad087da Fix some warnings about unused parameters
Change-Id: I4cd941beec8a8b2d35a5b1fce48dd12facae7154
Reviewed-by: hjk <hjk@qt.io>
2020-12-14 09:23:58 +00:00