Commit Graph

50019 Commits

Author SHA1 Message Date
Mahmoud Badri
c2e6dd6958 Allow dragging the playhead by clicking the ruler
- clicking the ruler and dragging drags the playhead instead of showing
the selection rect.
- bound the selection rect to the functional (i.e. not the properties
section) and visible area so that it doesn't select something off
screen and also it looks better.

Task-number: QDS-1069
Change-Id: Icec0592bae028637056cbed24b499ef6b7e1803c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-10-01 11:20:53 +00:00
Miikka Heikkinen
47ee781394 QmlDesigner: Create imported 3D assets initially in temporary directory
Once all assets are created in the temporary diractory, cancel is
disabled and all assets are copied to the final location.

Canceling no longer immediately closes the dialog, so you can see what
happened in the log.

Change-Id: I8c2d261091b0963e0b34a71bc9171e1757da68df
Fixes: QDS-1083
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-10-01 10:06:33 +00:00
Christian Kandeler
736eef24ca Designer: Fix look-up of resources for UI files
Commit 81a643ec99, fixing QTCREATORBUG-22412, was too restrictive: UI
files in applications have access to resources of library dependencies,
so we must consider those. We now only exclude resources from other
applications.
Note that this will potentially list non-applicable resources, e.g.
those from libraries to which our product does not have access. This
cannot be reasonably prevented, because not all build systems provide
this information. It's also not as bad as missing resources.

Fixes: QTCREATORBUG-22909
Fixes: QTCREATORBUG-22962
Change-Id: I51a87402b43c156618982813c408060f300e4e58
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 09:27:10 +00:00
Cristian Adam
b4022f90d5 GccToolchain: Print command line arguments and error message
In case of compiler toolchain defines autodetection print relevant
information needed to find out why it failed.

Change-Id: I03ff5d01c39c06bd4c3a24ad51688a7a701a3c33
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 09:05:54 +00:00
Christian Kandeler
016ad4a978 SSH: Fix for Microsoft-provided sftp.exe
The sftp.exe shipped with Windows 10 does not emit a prompt to stdout
when invoked via QProcess and thus cannot be used to establish an SFTP
session. However, batch mode can be made to work, so we now use that in
our device tester.

Fixes: QTCREATORBUG-22471
Change-Id: Ia55e66c6f342720c9a0f0c1943f6d9d969842bad
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2019-10-01 08:51:33 +00:00
Christian Kandeler
ec15cf23f3 Project Tree: Fix focus issue
Some godawful global focus state was set too late, resulting in weird
behavior after an action in the context menu was activated via the
keyboard. (Namely: If you did that *once*, the "Add New File..." entry
would *forever* be disabled in all subsequent context menus, regardless
of project, session etc.)

Fixes: QTCREATORBUG-22850
Change-Id: I0afed61b65ac5064cb6a229c9bfa45445a3a6c34
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 08:39:04 +00:00
Alessandro Portale
4ce705554a QmlDesigner: Fix forground color for FloatControl in Timeline editor
Task-number: QDS-1095
Change-Id: If55175b41ae16f02d4448a1ea9b630de55bca02c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-01 08:35:31 +00:00
Alessandro Portale
060d47f317 QmlDesigner: Fix colors of +/- icons in TimelineWidget
In non-dark themes, icons outside toolbars requre a color role with
contrast against the background.

Task-number: QDS-1096
Change-Id: I10e1c77a71e77a2935844507c9ebe739065a69ef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-01 08:35:24 +00:00
Alessandro Portale
dea46dd04e Qml tooling: Support Qt 5.14
QtQuick 2.14
QtQuick.Controls 2.14
QtQuick.Window 2.14
QtQuick.VirtualKeyboard 2.14

Change-Id: Ide447cf8f5beae481495e6c7220dfc075d6e859f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-01 08:34:55 +00:00
hjk
fc2e22dad2 Android: Move logic to trigger AndroidManager::updateGradleProperties
Previously, AndroidManager::updateGradleProperties operated always
on a project node found using target->activeRunConfiguration()
which might or might not be the one that will actually be used
after the build.

This here still does not address the problem that the activeRunConfiguration
may change but introduces a way to specify the relevant node, and tries
to use the right one when available.

At some time, this could be developed into a real solution, e.g.
by invalidating the cache on build key changes.

Change-Id: I37a3d73e9ad3615025e4def2493f683d11add3c6
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-10-01 08:15:55 +00:00
David Schulz
9afc5305d6 TextEditor: more FileName -> FilePath renaming
Change-Id: Ia61868806db47561e7bf7ae9b3cfb1e62a085a7a
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:54:11 +00:00
Eike Ziller
d3b4f06ada Help/litehtml: Fix that invisible text was found via text search
We need to explicitly restrict the index to the html body, otherwise
e.g. the title tag will be included.

Change-Id: Ic7d177deb9cc1c5ce072265669f4d921c9cb4bb1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:41:26 +00:00
Tobias Hunger
e90081cd88 Fix white space
Change-Id: I1743eadb01149ebcc705aafbe7cc3374489e65e8
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:38:12 +00:00
Tobias Hunger
d6d05abccc BaseQtVersion: Return FilePath from frameworkInstallPath
Rename the method to frameworkPath to be more in line with the rest.

Change-Id: I3e018ca91e027a95d1ef4993705781957bc68144
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:37:41 +00:00
Tobias Hunger
a542f5075f BaseQtVersion: Deduplicate documentation related methods
Use docsPath() over documentationPath() since that fits better into
the naming scheme of the rest and already returns a FilePath.

Change hasDocumentation() to hasDocs() accordingly.

Change-Id: I619d7c68e612c4e25a830e4dce128d9a1e84c2e2
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:37:29 +00:00
Tobias Hunger
67934ccaaa BaseQtVersion: Use FilePath for demosPath()
Change-Id: I83bcbf64a37faf0f88c6b1f655ff3d5c5d7e623c
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:37:10 +00:00
Tobias Hunger
3404a44ee1 BaseQtVersion: Have examplesPath() return a FilePath
Change-Id: I6b37345022d7cdba4aef0af0ca2a825c8606062c
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:36:59 +00:00
Tobias Hunger
9c84c6b271 QtSupport: Replace 0 with nullptr
... and let clang-format clean up the indentation.

Change-Id: I56401804899628813e54c5b573806ab149885e67
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:36:46 +00:00
Tobias Hunger
17f7b8e957 QtSupport: Simplify detection of embedded linux Qt versions
The temporary Qt version never has a qmake path set, so it always
returns an empty list of qtAbis.

Make that explicit:-)

Change-Id: I74b65897e5a9daddae638a99c38fa1a95f8a3086
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 07:36:37 +00:00
Elvis Angelaccio
85fcd10f90 Show application icon in Plasma Wayland sessions
kwin_wayland fetches application icons from .desktop files, so we
need to set the desktop filename on the QGuiApplication instance
(otherwise kwin will set a generic wayland icon as fallback).

Change-Id: I89921ace4a5a4ff2a2387111e51a8914f58e44a8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-01 07:02:35 +00:00
Milian Wolff
be61acffe7 Don't link against QtSupport in CTF Visualizer plugin
Change-Id: I03e4e3d4a2c687ba5841987318eee569c3fa15c4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-09-30 20:23:52 +00:00
Thomas Hartmann
da0601e470 QmlDesigner: Add ItemFilterModel
This exposes a model to QML that allows
to get a list of all ids of items of a specific type.
This allows implementing a combobox that can e.g. set
the id of any image element in the file.

Change-Id: Ibc825cb5a66c951d29df12676f9433c9232fd8af
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-09-30 15:21:37 +00:00
Thomas Hartmann
2509dd4c32 QmlDesigner: Add supported Qt Quick version
Change-Id: If4e40fafe2270dcdd76cefe5d3a03f11984e466a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-30 15:21:18 +00:00
hjk
b0ea4311e8 Short live McuSupport
Medium term to be merged with BareMetal/RemoteLinux/...

Change-Id: I444c65bcfa8e3cf8642ff64e964459720814860a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-30 15:04:32 +00:00
David Schulz
a30b936760 Python: add task for pyls installation
Change-Id: I0a85a3ae9fe4e8b327b3b90732556bf940215b7a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-30 12:50:45 +00:00
David Schulz
94f717bd3c Python: make pyls install kill timer a member
Change-Id: I62515673ef65e87b2f23345aa52a22a86a2be763
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-30 12:40:36 +00:00
Cristian Adam
17270366f3 CppTools: Do not use PCH when build PCH artifacts exist closeby
Clang cannot handle gcc pch files which are close to the forced
include header.

Fixes: QTCREATORBUG-22888
Change-Id: I0d678a889d1fb62bf3c6850277e13271efb91eea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-30 12:13:25 +00:00
hjk
0c45372896 Debugger: Remove QML port settings in run configs
Obsolete since the invention of PortGatherers.

Change-Id: I34c80b2408213c2d6bd0d893763be4dffc2db7ea
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-09-30 12:00:49 +00:00
hjk
a574706d29 Debugger: Add a per-runconfig way to add debugger startup command
Task-number: QTCREATORBUG-22979
Change-Id: I225b6cd1ee1dd3195bda3de4de72880d76e8cd37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-30 12:00:39 +00:00
Eike Ziller
aad6ad8c10 Help: Replace annoying URL syncing by explicit Open in Edit Mode
Qt Creator was syncing the current page in Help mode to the page shown
in the side-by-side view in edit mode.
This doesn't really make sense because context is completely lost.
Instead provide the explicit option to open a help page in edit mode,
also from the external help window.

Fixes: QTCREATORBUG-19198
Change-Id: I00698bb431d5c116dd1e0e1cbdc5fbd7421ac267
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-30 11:19:54 +00:00
Eike Ziller
d34aee4d53 Help: Fix missing page switching keyboard shortcuts for external window
Which are relevant now that external windows support multiple pages.

Change-Id: Ibc748e9e0582c8d54264af535c32aa2702f91631
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-30 11:19:21 +00:00
Eike Ziller
6123580767 Help: Make note about changing viewer backend more visible
Change-Id: Ib68db15a3c081202305f61ede4d4414d09fc3c20
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-30 11:19:03 +00:00
Ulf Hermann
0d6feefb53 Update perfparser submodule
Change-Id: I051ec59afe30f5ae57d45b08d2f8bcfef55a641c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-30 11:09:26 +00:00
Alessandro Portale
28b99dafc6 sdktool: Document WebAssembly types
Task-number: QTBUG-74923
Task-number: QTBUG-72884
Change-Id: I4fef49123bc1f66f94d374572537cfa2b5ad9a3b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-09-30 09:22:55 +00:00
Christian Kandeler
9c8400d961 Output windows: Skip filter function if no filter is set
Running the filter function is (too?) expensive, so make sure that's
only done when there actually is a filter.

Task-number: QTCREATORBUG-22914
Change-Id: Ie96a4e20ebb10c08d83e75641e70b42b13377b22
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-30 09:17:39 +00:00
Christian Kandeler
9ca17da5bb Target setup page: Fix default build directories for cmake projects
BuildInfo: :buildType is not necessarily unique.
Change-Id: I6667e5183db7a0f57081a74a7ca92491ead73d52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-30 09:09:31 +00:00
Eike Ziller
f8c8c01096 Merge remote-tracking branch 'origin/4.10' into 4.11
Change-Id: Ic05bd53ea060d42c2013884972c05de08ed63f10
2019-09-30 10:36:00 +02:00
Ulf Hermann
b5b1367b0b Accept arrays as enum descriptions in qmltypes files
We don't use the values at all and they are hard to determine
statically. Qt >= 5.15 will generated arrays instead of objects.

Change-Id: I3b3bbd427c49e649ca3f9cef51c89b32e830eb66
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-09-30 08:24:30 +00:00
Miikka Heikkinen
1bf23a6c74 QmlDesigner: When adding 3D asset import, also add missing QtQuick3D
When adding 3D asset import via a flow tag, check if QtQuick3D import
is missing. If it is, add it automatically.

Change-Id: Ia2e67180faa88e10b185a42a7ce426dc29d9ce23
Fixes: QDS-1067
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-09-30 07:39:28 +00:00
David Schulz
90963249a4 Python: Add info bar to install python language server
If the detected python for the current document does not have an
installed language server, check whether pip is installed, try to
install the language server and if that was successful set it up.

Change-Id: Ib6cf3bacdcf3489728990cace5417862b7c78be5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-30 07:26:12 +00:00
Joerg Bornemann
24dd7be6db Update qbs submodule
To HEAD of 1.14 branch.

Change-Id: I16a799316afe1d1be3410ef3084c0724de931c42
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-30 06:45:49 +00:00
Christian Stenger
716ec39ae0 Debugger: Fix automatic raising of Expressions
When adding a new expression automatically raise the
Expressions widget if it is not shown already.

Change-Id: If89e4e4fbf8cbe57e0f08478cd2d3b9f4797f5ad
Reviewed-by: hjk <hjk@qt.io>
2019-09-30 04:33:58 +00:00
Denis Shienkov
38292de68a BareMetal: Fix auto detection of SDCC toolchain on Windows
The SDCC toolchain package can be provided as 32-bit
or as 64-bit installer. If the SDCC 64-bit package
will be installed on the 32-bit Windows, then it will
not be found in the system registry, because we use
the QSettings::NativeFormat. So, we need to check the
data for the 32-bit and 64-bit registry sequentially.

Change-Id: I1e7711bdde173eff21a7ba84f221d505a21709ca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-09-27 14:40:47 +00:00
The Qt Project
094d20bde9 Merge "Merge remote-tracking branch 'origin/master' into 4.11" into 4.11 2019-09-27 12:48:38 +00:00
Miikka Heikkinen
76dea6c61f QmlDesigner: Support importing 3D assets into Quick3D components
Added import dialog for importing 3D assets. Generated Quick3D
components are placed into a hardcoded path under an existing
import directory, preferring an import path that ends with
"asset_imports" folder.

Import statements for imported assets are not automatically added to
the current document. Instead, flow tags are generated for the
available imports. If QtQuick3D import is missing, a flow tag for
that is also generated.

Item library entries for imported assets are created and grouped
in their own group.

Task-number: QDS-1051
Task-number: QDS-1053
Change-Id: I89cef9c0dc8b5a71a5cf25a6a184cef49c1090dc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-09-27 12:31:22 +00:00
Christian Kandeler
d5f3335c5e RemoteLinux: Use the "install to local dir" step in derived plugins
That is, Boot2Qt and Qnx.

Task-number: QTCREATORBUG-22822
Change-Id: Id48069c6ee2bc857a94be173b6c1de9bc69404a8
Reviewed-by: hjk <hjk@qt.io>
2019-09-27 12:29:40 +00:00
Eike Ziller
68d08c162a Merge remote-tracking branch 'origin/4.11'
Change-Id: I3fd1723e8c097bf6df8933c122fcc006ad0af9e7
2019-09-27 14:22:41 +02:00
Eike Ziller
d4c0f9e510 Merge remote-tracking branch 'origin/4.10' into 4.11
Change-Id: I57c2c6b5736c1aa3e1831eea0ae0a0638feacc39
2019-09-27 14:20:05 +02:00
Nikolai Kosjar
d29d747839 ClangTools: Fix comment
Change-Id: Ibf530af9d60cce45957c7a0b9c5b4e9f82407086
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-27 12:05:09 +00:00
Nikolai Kosjar
d5bae3c1eb ClangTools: Merge ClangTidyClazyTool into ClangTool
Change-Id: Ieb6c4994ddcff9339a9cfb25c82e23dd2d2e8912
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-27 11:56:42 +00:00