Commit Graph

47434 Commits

Author SHA1 Message Date
Cristian Adam
db42525e19 CMakeProjectManager: Filter out the utility targets
Do now show _autogen or _qml _deps utility targets in the target
dialog via "cmo <target>".

Fixes: QTCREATORBUG-24718
Change-Id: I26651669c3ab54f5bd4ba3f5ddb4409524be00ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-22 16:02:07 +00:00
Eike Ziller
121e563052 Update litehtml to latest master
Adds support for ordered lists.

Change-Id: I467689cdad08df297b20fbffe02d217d117ed56f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-22 14:19:49 +00:00
Alessandro Portale
267309b254 ProjectExplorer: Native dir in separators FolderNavigationWidget tooltip
Change-Id: I9abc43e407b70377fe398ded87518c1a5e5ccb19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-22 11:08:18 +00:00
Eike Ziller
37a0ef29c0 QML: Use new message manager API
That is more evocative. Also avoid some instances of popping up the
general messages pane, which should preferably only happen on direct
user interaction.

Task-number: QTCREATORBUG-24430
Change-Id: I69bb49f84c1486fd32b2a048ca4d76dceb6a0b2b
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-22 08:09:10 +00:00
Kama Wójcik
03274561e9 Add label with event id list to transition flow
Change-Id: Ica6ce4424b22a91c348aab5866b4e978bf9c6173
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-21 11:47:22 +00:00
Knud Dollereder
3724878043 Prevent access of invalid parent properties
when retrieving the parent ids of a ModelNode

Change-Id: Ic754786e2bd3744b7a4bd67b9db385be368e5925
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-21 11:09:01 +00:00
Miikka Heikkinen
c2911ab7f1 QmlDesigner: Show font, audio, and shader files in assets tab
Icon for font files is a short text using the font in the file.
Audio and shader files use system default icons for those types
for now.

Task-number: QDS-3326
Change-Id: Id3d416857b8abe5d803997956dcf450ac115b179
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-21 10:38:54 +00:00
hjk
f2f139e90e Debugger: Remove DebuggerEngine::stateAcceptsBreakpointChanges()
Dead code since 3b5ecac238 (the end of the hybrid engine).

Change-Id: Ibb169ff657c8a88fdc52783a6a1f5b79fa0b29e5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-18 16:16:58 +00:00
Eike Ziller
f74b317598 Fix compilation of ClangFormat plugin against LLVM with clang-cpp
The ClangFormat plugin needs to link against clang-cpp in that
case as well.

Fixes: QTCREATORBUG-25138
Change-Id: I84b1784b291d8944a9dee66ec14db32ad72ff8b5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-18 15:29:45 +00:00
hjk
0edebcfa9c Utils: Pimpl BaseAspect
Change-Id: I70a7d49010c24a44dc64d20c5548c249964b78bd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-18 14:31:45 +00:00
Christian Kandeler
74b773e68f ProjectExplorer: Improve issues pane behavior
... when the user clicks a link. Apparently, the (unintended?) default
item view behavior is to move the scrollbar so that the top of the
current item becomes visible, which we don't want here.

Fixes: QTCREATORBUG-25101
Change-Id: I4c99ff09ba762b7b375b0bdefd8cebfbda69b0ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-18 13:12:30 +00:00
Eike Ziller
305ca7e434 cmake build: Fix handling of test dependencies
Test dependencies are not "real" code dependencies, they just
declare that for testing the plugin the other plugin has to
be loaded, even though it is _not_ a code dependency.

Add PLUGIN_TEST_DEPENDS to add_qtc_plugin. We cannot assume
that the target exists at that point, so adapt the usual pattern.

Fixes: QTCREATORBUG-25024
Change-Id: I4165ff8df762309e0be0bfe9e8bedef796a3bf17
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-18 08:24:46 +00:00
Jarek Kobus
4654550ff4 Store path as FilePath instead of QString
This avoids conversions from FilePath to QString and
vice versa.

Change-Id: Ic0f610a9e90c206ff9557df6f46854e4805ce42f
Reviewed-by: hjk <hjk@qt.io>
2020-12-18 07:38:29 +00:00
Jarek Kobus
c732014821 A - (A - (B + 1)) = B + 1
Change-Id: I6ce320c0fd3958c1fef98b322bec8dbded2232cf
Reviewed-by: hjk <hjk@qt.io>
2020-12-18 07:35:18 +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
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
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
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
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>
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
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
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
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
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
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
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
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
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
Cristian Adam
4ae5516453 CMakeProjectManager: Use canonical paths for compiler match import
On Linux (Ubuntu 20.04) Qt Creator would use /usr/bin/g++ as
compiler for C++. CMake would pick /usr/bin/c++ as C++ compiler.
Both of them are symlinks to /usr/bin/x86_64-linux-gnu-g++-9

There is no need to create imported kits for something which
is the same compiler.

Fixes: QTCREATORBUG-25069
Change-Id: I90e0f7b1977ace3f7995ce09f4b3fcfa64d02b72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-11 16:17:30 +00:00
Christian Kandeler
29ddb3bcdb ProjectExplorer: Allow to schedule a build/run during a project parse
Once we parsed the project initially, subsequent parses typically do not
change things in a major way, so we can expect e.g. run configurations to
stay intact.
It therefore makes sense to allow users to schedule an
application run not only during a build (see 4b92b7ac60), but also
during a parse. Arguably, this is even more relevant, as parsing is
usually not triggered directly by the user, but happens as a side effect
of editing a document or switching a branch. It is then annoying for
users to have to wait until the respective buttons get enabled again.

Fixes: QTCREATORBUG-24986
Change-Id: I1081ccde668eee794c39b96cd0bad5c3aaa580bc
Reviewed-by: hjk <hjk@qt.io>
2020-12-11 15:17:05 +00:00