Commit Graph

61529 Commits

Author SHA1 Message Date
Tobias Hunger
200b04f9ca CMake: Simplify setting up a new reader
There is no need to reset a reader when e.g. the build directory changes
when the server-mode reader is *not* used. So the one case where having
separate reparse-options for the case where the reader changes and the
case where it stays the same is bogus.

So unify the flags into one set and simplify the code accordingly.

Change-Id: I9bcfcc6333d574d49513ef1256a9a8597bda4ec7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-09 12:43:14 +00:00
Tobias Hunger
d880f1f771 ProjectExplorer: De-virtualize knowsAllBuildExectuables method on Project
Just use a setter instead.

Change-Id: Id5dff64e9a7fcdf64a245b71432318299a49d9f7
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 12:42:53 +00:00
Tobias Hunger
0c8c08b81b Designer: Fix implicit cast warnings
Change-Id: I33b2c214de9fc517076ef12f9aec32a18adec36a
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 12:42:37 +00:00
hjk
6dcdacb10e RemoteLinux: Remove more unneeded qtsupport include
Change-Id: I7cdfd0a4cfa58424ddf1105c144acaba07f204b3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-09 12:35:02 +00:00
hjk
f9c221eb54 ProjectExplorer: Re-work setup runworker factories
This combines two of the previous three paths to create run workers,
and refers to RunConfigurations by id, not by type where possible
to decrease coupling between the classes.

Only allow "type of run configuration" and "type of device"
as the only possible kind of restriction and require a uniform
RunWorker constructor signature.

Adapt user code to fit that pattern.

Change-Id: I5a6d49c9a144785fd0235d7586f244b56f67b366
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-09 12:34:42 +00:00
hjk
a88970db34 RemoteLinux: Avoid unneded qtsupport #include in deploymenttimeinfo.cpp
And de-noise the file a bit.

Change-Id: I11f0dc83aae87dd397fa8a69ec3b909c4467740c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-09 11:52:39 +00:00
Tobias Hunger
87f496d091 CMake: More logging of cmake parsing flags
Add more logging of cmake parsing flags as cmake runs are requested
in the plugin.

Change-Id: I5231bd29dfeb6521218dc28c26a5b658ccb4059b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-09 11:52:26 +00:00
hjk
39b66f0557 ProjectExplorer: Add a convienience BuildStepList::firstStepWithId
For later use.

Change-Id: I696e3e03e1f8a82c25b29c9cf4b311360d83c12f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-09 11:08:39 +00:00
Eike Ziller
babbb0a9db iOS: Fix simulator listing with Xcode 11
Xcode 11 changes the output of simctl slightly. At some point it
introduced a bool "isAvailable" in addition to the string
"availability". Now the latter has been removed.

To avoid listing all devices as available, we need to adapt our simctl
output parsing.

This already takes effect when installing Xcode 11 Beta, even when not
actually using it, since all Xcode versions share the simulator
infrastructure.

Fixes: QTCREATORBUG-22757
Change-Id: I1ef416f6c544db53d9ee99ccc3b0a2e97dfcc870
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-09 11:08:26 +00:00
hjk
b9c10bb715 QMake: Re-export the qmake buildstep id constant
Will help with iOS later.

Change-Id: Id4d1899e117ae5aa05ed14a42bc80f474b9c659c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-09 11:08:17 +00:00
Tobias Hunger
2fa555bdfd ProjectExplorer: Add another missing activeBuildConfigurationChanged signal
Change-Id: If31157a569f13df6e6dbd09ab8148b325bf6858d
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 10:27:34 +00:00
Tobias Hunger
2d6ec5a287 ProjectExplorer: Fix warning
Change-Id: I091746e494ef2cb92f395a09111c055226827804
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 10:27:25 +00:00
Eike Ziller
bc5e763961 Python: Remove unneeded dependency to QtSupport
Change-Id: I080c9316068eb1ac4738aaffae57c913ea63176f
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 09:29:36 +00:00
Tobias Hunger
afc1b854eb CMake: Remove useless code
Change-Id: I2e4e5f834f99e2c14e0f81c106abec2c1e0a3a87
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 09:24:34 +00:00
Tobias Hunger
1e9ee0ce1d CMakeLists: Allow for internal plugin registration
add_qtc_plugin now takes a flag "INTERNAL_ONLY". These internal plugins
will not show up in the project configuration nor in the feature summary.

This flag is used by the tests that build plugins.

Change-Id: I1912dd62221b2624ed7326df381fbbceccefbdac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-09 09:05:54 +00:00
Thomas Hartmann
45c580b91a QmlDesigner: Add icon for curve editor
Change-Id: I36990c6a5a7b8fda8e8d7b99244dddafe8319665
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-09 08:56:23 +00:00
Aleksei German
76cf08a886 QmlJSEditor Exporting AutoCompleter
One more change for the new Binding Editor

Change-Id: I17c9eb02212a29abcc4ef568e7d85cffc14c023d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-09 08:29:12 +00:00
Eike Ziller
a81c1aab2c Merge remote-tracking branch 'origin/4.10'
Change-Id: I273a1e8f5f9e54756befbc398c2c2754534ff128
2019-08-09 09:43:16 +02:00
Eike Ziller
98d454d58b Fix CMake build
Change-Id: Ib0f90b9051c631751a1181dc30e58affd90feffb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-08-09 07:42:11 +00:00
Christian Stenger
ca32a47122 Squish: Use parameters for mouseClick
Another partial revert for e8727fcae2.

Change-Id: Ieba9b7ea75421858698e0da0133278408e2b5ee1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-08-09 06:13:12 +00:00
Christian Kandeler
61046e848a QmlDesigner: Fix qbs build
Change-Id: I3b114db5f51f47a2e5635858f5587eefec7393c0
Reviewed-by: hjk <hjk@qt.io>
2019-08-09 04:45:22 +00:00
Tasuku Suzuki
c54db06a50 Improve layout of qrc editor
Replace the toplevel horizontal layout with vertical splitter

Change-Id: Ia02cb0fb23ff4cb9775ea68e70d7b6e0edfcd7f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-09 03:19:00 +00:00
Knud Dollereder
6e241d6eac Improve scaling of the graphicsscene in y direction
Change-Id: I2e4f07cb39222094fdbb26e45d4385510c8992d4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-08 15:26:09 +00:00
hjk
c6f00e1dd2 Unification of desktop run configurations, step 6
Move special CMake environment modification to CMakeBuildConfiguration.

Change-Id: I27f886db48d8c036f2f77f5ae8f239b405cb5721
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-08 15:20:21 +00:00
hjk
e6d09f7c68 Unification of desktop run configurations, step 5
Use a single RunWorkerFactory for all cases.

Change-Id: I41d39d330ed69082d75ea891b11247eab01a5d19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-08 14:33:24 +00:00
Knud Dollereder
4a673896a6 Connect CurveEditor edits to the timeline module
Change-Id: Ic00e0840da34bdbb8627b2fe2d8546a867b24966
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-08 14:30:44 +00:00
Aleksei German
735cdf88df QMLJSEditor Exporting few classes
These changes are required for the new Binding Editor

Change-Id: Ic1e833819c69831aa1a930ab668a644ae4ccdd6f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-08 12:18:06 +00:00
Christian Kandeler
2feb3e5585 Qt wizards: Include translation file, if requested
Provide all wizards for Qt-based projects with the ability to set up a
skeleton .ts file and add it to the generated project.

Task-number: QTCREATORBUG-7453
Change-Id: I4dfb34c0101062edd0209173f83737e69063e27a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-08 08:56:38 +00:00
Eike Ziller
a96095a2bf CMake build: Adapt to removed file
Fix-up of c9b91e7e6b

Change-Id: I6b2e4a03f2834020d76d3534cdb7cfbb82c77b8c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-08-08 07:29:53 +00:00
Marius Sincovici
a96ed0d4a0 Add option to configure file line ending for an open document
Add into the text editor toolbar a combo box which allows to change
the line endings for an open document.
The supported line endings are LF and CRLF.

Change-Id: I029ba7867e0087b162edba7aba1bd1d1e966fd69
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-07 20:07:16 +00:00
Tim Jenssen
c9b91e7e6b QmlDesigner: reduce enumeration to header only
It is used in some other external qmldesigner plugin and
these are built against current dev packages, which
are not contain this cpp file.
Different solution would be to add:
  r"^share/qtcreator/qml/qmlpuppet/types/enumeration.cpp$",
to scripts/createDevPackage.py which feels not that clean.


Change-Id: Ia1fb5c02f457d98474218689ebf6483706265dde
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-07 14:48:04 +00:00
Henning Gruendl
6ab4d69440 QmlDesigner: Fix TextField context menu closing
Change-Id: I596e5cee2e3c058b1fe5b0f0f1f976a60784d88b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-07 13:58:37 +00:00
Thomas Hartmann
db2120c451 QmlDesigner: Fix empty lines in annoation block
The annotation block on the bottom aggregated empty lines.

Task-number: QDS-377
Change-Id: I29806ce224717348b50258850bdc4a7bc6140eb8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-07 13:28:10 +00:00
Christian Kandeler
5edb390bac ProjectExplorer: Fix qbs build
Amends 399f8d2dff.

Change-Id: I1e2fc0c70843ce85d99e85f51d48dbde6b7165ae
Reviewed-by: hjk <hjk@qt.io>
2019-08-07 11:52:46 +00:00
hjk
71dad9645a ProjectExplorer: RunControl header cleanup
Change-Id: I6f3a838ef6ed72827c3db582414b92d355e9320d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-07 11:51:27 +00:00
hjk
a79957038a ProjectExplorer: Replace RunControl::buildTargetInfo
... by two accessors to the only used field. General idea here
is to make the presence of a RunConfiguration in a RunControl
less prominent to be able to remove it at some time completely,
as the configuration's data might change while the control is
running.

Change-Id: I752540fadd135d6904fc9bf4e3506be074b0c003
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-07 11:51:04 +00:00
hjk
ebc2b9ed6f Unification of desktop run configurations, step 4
Use a "Add build library search path to (DY)LD_LIBARY_PATH" aspect
in all cases.

This was missing for CMake, and still not functional there.

Change-Id: I932bd712c7035af47cf0d60d8f9e10b8ed6608d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-07 10:59:06 +00:00
hjk
399f8d2dff WebAssembly: Drop run config inheritance from CustomExecutable
Also, auto-detect free port.

Change-Id: I377956ef20a928f1877d702162792e7cae75a202
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-08-07 10:53:21 +00:00
hjk
b6a5de1bb0 Unification of desktop run configurations, step 3
Use a QtSupport::QtOutputFormatter unconditionally.

CMake previously only added one when there was a Qt version selected
in the kit at RunConfiguration construction time, which is an odd
moment for such a decision.

Arguably, the adding of output formatters should not be done
unconditionally either, but deferred to RunControl runtime
in principle. But that'd be an indpendent global change.

Change-Id: I8365ccf194a896d4cba5d9148cc0b21d83de2f3f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-07 10:45:55 +00:00
hjk
5a2aba2be4 Unification of desktop run configurations, step 2
Create a DesktopRunConfiguration base class for QmakeDesktop/Qbs/CMake
and move all of the code there. Unify in obvious cases.

Change-Id: Ib2439fe6a636a4a79e849af49cd74aeacf76e747
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-07 10:44:42 +00:00
hjk
07a918c89a Unification of desktop run configurations, step 1
First step, move {DesktopQt,Qbs,CMake}RunConfiguration{,Factory}
into the same new files.

This only moves down to QtSupport, not ProjectExplorer, as there
are in all three cases direct dependencies on QtSupport. Long term
I would expect them to move further down.

Change-Id: Ib16b19df7f3f642ed7f7db89a1f6904601d976ba
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-07 10:35:41 +00:00
Andre Hartmann
932819fe0a QtOutputFormatter: Add alternate QTest failure pattern
The QTest failure output was modeled after the compiler error
pattern, which contains file name and line number to point to
the precise error position.

Unfortunately, some compilers (MSVC) separate the line number
from the file name with "(line)", while others use ":line".

Let's handle both when parsing the application or test output,
as it was before 9a0ef8ac64, which explicitly separated both
parts in the regexp pattern.

This amends commit 9a0ef8ac64

Fixes: QTCREATORBUG-22800
Change-Id: I58154111612bbb452af19b34f7217afc6dd098df
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
2019-08-07 10:03:04 +00:00
Eike Ziller
2521023627 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I7d9ecd6d8518699d848ac72a62e5c35c2cc2751f
2019-08-07 08:09:45 +02:00
hjk
a19c714cb4 ProjectExplorer: Sanitize some #includes
Change-Id: I791c6ff37d0adfa6b1a25f33f0803090c5b64204
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-06 14:32:02 +00:00
Thomas Hartmann
185bdcaad8 QmlDesigner: Remove radius for consistency
Change-Id: I7868265706fff25a32700870841b512d3f3f8a44
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 13:32:39 +00:00
Thomas Hartmann
be3c34221c QmlDesigner: Hide action indicator background
This is now a global option in the constants.

Change-Id: I29c5a7bc78ca1256f4d4cb3ff3319498143d34be
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 13:29:47 +00:00
Thomas Hartmann
fceb229652 QmlDesigner: Move labels to left in FontSection
Change-Id: Id8bc92dcb8342c99e5c458cca0fe026b7ae61164
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 13:25:41 +00:00
Thomas Hartmann
1b1d5b953a QmlDesigner: Add slider button to alpha spin box
Change-Id: I20deab5d884aa93a1bb541dab8f00c63fbf30954
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 13:24:56 +00:00
Thomas Hartmann
8fb289f54b QmlDesigner: Add tooltips to item library
Task-number: QDS-342
Change-Id: I75530d5a05111ed66129f87e3fb716715b564001
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 13:24:32 +00:00
Henning Gruendl
f10adce9c8 QmlDesigner: Change CheckBox label position
Change-Id: I491f32ff97ed540def95ea30ebdaa729b5d68c4f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-06 13:21:22 +00:00