Commit Graph

61529 Commits

Author SHA1 Message Date
David Schulz
c76161e802 TextEditor: make it obvious that formats are consumed by setExtraFormats
... by transforming the parameter to an r value and pass the argument by
std::move.

Change-Id: I6949ee6bbac7d8675fdbbcb62bb4f4c394bb395f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-19 11:57:24 +00:00
David Schulz
cea75f3ac4 TextEditor: add convenience function to clear additional highlights
Change-Id: Ie3cf6e7f9fb37f3e2270abaf5fca412e7a4a40da
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-19 11:57:12 +00:00
David Schulz
aa94b6f0c8 TextEditor: modernize SyntaxHighlighter::setExtraFormats
Change-Id: Iaebf30d56702ef90b610d2db03c7abb40d1d2bab
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-19 11:56:49 +00:00
Nikolai Kosjar
9dac99eac0 README: Update clang instructions for mono repository
Change-Id: I0b817e4f245613cbae7c36cd5c36712a2cf1396d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-06-19 11:46:42 +00:00
hjk
514e3776a1 iOS: Inline createIosToolChain()
Plan is to only let the (base) factory create toolchains, having
the 'new' is a separate function complicates the process.

Change-Id: I1faff3e2ce4a19a2947ba4ac4e156ed56e5d18e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-19 11:19:17 +00:00
Tobias Hunger
97392daaf3 CMake: Allow cancellation of CMake process
Allow cancellation of cmake runs in tea-leaf and fileapi modes.

At least in those modes cmake can now get stopped when it goes into
an infinite loop.

Change-Id: I4e9bd769292325b9837904cd391ff61dbc477898
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-19 10:14:40 +00:00
David Schulz
e9858abc43 Debugger: Use DebugBreak() to interrupt in simple test
Change-Id: Ia15fc8c780b53f1b84af16a172af79b3145e9c39
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-06-19 09:45:35 +00:00
Knud Dollereder
376c6b9d59 Add curve editor
Moved qmldesignerextension into component

Updated build systems

Change-Id: I8d2d0757a1639a472d426b66c0c8ae6fb84cc3d2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-19 09:22:31 +00:00
hjk
fa57e933a9 ProjectExplorer: Remove MsvcToolChainFactory::create()
This was doing effectively the same as the base constructor with
all code paths overriding the values set here.

Change-Id: I41e29bc5ae5ef7d99ff4adc7beed738c49a3139f
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-19 09:01:40 +00:00
Nikolai Kosjar
a0852cf62b README: Update "Prebuilt LLVM/Clang packages" section
Fixes: QTCREATORBUG-22563
Change-Id: I651d0308bd5ac7efcb22f30488e08b3f3ffa16a6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-06-19 08:49:31 +00:00
Nikolai Kosjar
c22e9cea13 CppTools: Stop printing "Skipping file X"
We already put it into "General Messages".

Change-Id: I9756fbe5c5f641cd83ab39c8ef0fff83ad63a85d
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-19 08:33:48 +00:00
hjk
2101c2b992 QmlDesiger: Avoid a QTime deprecation warning
Change-Id: I468ffc231eb7dd4d4957cab5009d35425304a04d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-19 08:21:05 +00:00
Thomas Hartmann
9da6c2f43b QmlDesigner: Add alias export to QtObject
Change-Id: If1a78463d4f1625105ab1fad7e179e645be08c9e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-19 07:19:15 +00:00
Thomas Hartmann
25e5dfe53f QmlDesigner: Do nothing if new and old index are the same
Change-Id: If552fad81479a4cd404d2d2966905eb9da8d479d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-19 07:18:53 +00:00
Thomas Hartmann
1dae4593cc QmlDesigner: Use MenuItem instead of Action
This avoids conflicts with shortcuts.

Task-number: QDS-803
Change-Id: I9269729cf2cb4a6bba9493d768c595748af3392d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-19 07:18:42 +00:00
Leena Miettinen
75a2cae723 Doc: Describe adding existing projects as subprojects
Task-number: QTCREATORBUG-5837
Change-Id: Idf2de084b6e53e48fdc919d05b209b39ae0a8e8e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-19 07:01:17 +00:00
Leena Miettinen
02fd678cfe Doc: Describe options for running qmake when building projects
Task-number: QTCREATORBUG-20888
Change-Id: I7096730880505c63b1ff581c2e1b5626d3af68f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-19 07:00:57 +00:00
Eike Ziller
ad6dd3fa76 Fix restoring Android build steps from ealier Qt Creator versions
Revert the IDs back to what they were.
Amends 26463a2219

Fixes: QTCREATORBUG-22564
Change-Id: I220e362793d525ee8f01ff9649feb2cdfc37bba3
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-06-19 06:46:29 +00:00
hjk
0b46371ca5 ProjectExplorer: Dissolve ClangClToolChain::resetMsvcToolChain
The context defined which branch to take, just inline the repective
branch, and use a new convenience method for the clear() case.

Change-Id: Ib5aef375e27d3600dea787c2f8fa4c0b788da194
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-19 06:35:37 +00:00
hjk
0096b8a3db Remove ClangToolCHainFactory::create()
The create() reimplementation is not needed anymore as the base
ToolChainFactory::create() had identical effect.

Change-Id: I94512937e2257da9affb522908c20d9250c34d3b
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-19 06:10:24 +00:00
Nikolai Kosjar
bd74dc220f README: Remove outdated bullet point about clang code model
Change-Id: I0f7a94d276d9b32ba00ae43d574cc6f18fdd2d63
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-06-19 06:08:10 +00:00
David Schulz
2bca6847ba Utils: reserve result container size in partition
Change-Id: I0f5bf8d7c4ee0d4eec23ba63d73522d2be7f2711
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-19 05:45:47 +00:00
hjk
d118331241 ProjectExplorer: Move setDisplayName code out of *ToolChain::create()
This sets the display name in the constructor now. In quite a few
places this will be directly overridden afterwards (either in
derived c'tor or in detectToolChains(), but this will help with
further changes:

The idea is to only leave  { return new ... } in the create()
implementation such the method can be de-virtualized as the base
ToolChainFactory::create is enough.

Change-Id: I1b15c015b6f3e2bbff682bee3fac626ed1bde312
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-19 05:45:14 +00:00
hjk
6bd25ff689 ProjectExplorer: Don't repeat setting in ClangClToolChain::create
The value is initializes in the constructor.

Change-Id: I1c36a4ccecf2fb9bde9257df729831965ab7fea2
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-19 05:45:03 +00:00
Leena Miettinen
85603cd84f Doc: Adjust \previouspage command value
... because a topic was added to the Qt Design Studio Manual

Change-Id: Ib974724ff38248ad90aab72a34ee0c4a80d5ed4f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-18 14:28:06 +00:00
Eike Ziller
9a2bc34776 Fix wrong default value for "Automatically manage signing"
In iOS build configurations.
When setting the default value after creating the "BoolAspect", also the
value must be changed to that default.
The original code only used the default value when restoring the aspect
from settings.

Task-number: QTCREATORBUG-22529
Change-Id: Icee0887e02d2b6d83273492a45f20c0263bb68cc
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-06-18 13:06:48 +00:00
The Qt Project
2148803c3a Merge "Merge remote-tracking branch 'origin/4.10'" 2019-06-18 12:36:10 +00:00
Christian Kandeler
26ca8f0849 Utils: Fix default argument of ConsoleProcess::Start
The default meta character mode needs to be "Abort" to retain previous
behavior.
Amends acfe45c434.

Change-Id: I1e0c752eddccb0d4821203573241308e56dfb2d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-18 12:23:59 +00:00
Eike Ziller
4fd7cff51e Change log 4.10
Change-Id: Iae913e670946bb7db0553a6cdb4929b2ca64cf13
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-06-18 12:14:03 +00:00
Eike Ziller
f841a9e462 Avoid overloading superclass method
IOutputPane has an updateFilter method now, so rename the one in the
TODO output pane.

Change-Id: I0e6291372c83373b82d0d9911feffe032df8af5e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-18 12:11:56 +00:00
David Schulz
09b9aa98a8 TextEditor: fix low contrast of hovered folding markers
When using the 'windowsvista' style the folding markers are blue when
hovered. This color is almost invisible on the default folding range
background color. Use the tested folding markers of the fusion style,
because it is already used when device pixel ratio != 1.0

Change-Id: I23659cce71a2eb101692597a1d256d43f6426920
Fixes: QTCREATORBUG-21702
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 11:45:26 +00:00
Robert Loehning
a5821ae06d Squish: Fix crash in tst_default_settings
On Windows, compilers of type "Clang" display a QComboBox instead of a QLabel

Change-Id: I68537259d8d5b38b288308675139c92395f6df62
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 11:32:21 +00:00
Christian Stenger
b278d2a2fd PE: Avoid possible nullptr access
Change-Id: Ib96ce9763dd9710cc4365978241d5d1d3ac1c0db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-18 11:31:22 +00:00
Marco Bubke
4abe476a4b ClangPchManager: Workaround MSVC bug
MSVC creates copy constructors and operators with a non copyable member.

Change-Id: I4cd9d05dc8d72e249d6c95a48da89c783c6550ca
Fixes: QTCREATORBUG-22578
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-18 11:06:03 +00:00
Eike Ziller
917636b88b Merge remote-tracking branch 'origin/4.10'
Conflicts:
        src/libs/utils/consoleprocess.h
        src/libs/utils/consoleprocess_unix.cpp
        src/libs/utils/consoleprocess_win.cpp
        src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
        src/tools/clangrefactoringbackend/source/symbolscollector.cpp
        tests/unit/mockup/projectexplorer/project.h

Change-Id: I8d10f26b9bcb54829ba31cdc2272885691df1e16
2019-06-18 12:30:55 +02:00
Leena Miettinen
4d073fb67d Doc: Describe adding the import path
Also add the import path to the example main.cpp file.

Task-number: QDS-805
Change-Id: I990e5dc364d610a4cef5697b3355147f9e5fcde1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-18 10:24:42 +00:00
Robert Loehning
29668d633e Squish: Update tst_HELP02
Change-Id: Ia45e06bbf6df2e8b80f42824bc1b8bff34843538
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 10:15:57 +00:00
hjk
93d2e3352c Debugger: Improve QObject dumper
Don't use two lookups for parent types and act on known null pointers.

While the machinery is robust enough to handle the result it's a
needless deviation in regular code path.

Change-Id: I6e50629cf554870a3ffb9f488f654e6ae557e5b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 09:55:07 +00:00
hjk
f0e790d4b8 ProjectExplorer: Replace unusual ClangClToolChain constructor
Change-Id: I0c36a4ccecf2fb9bde9257df729831965ab7fea2
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-18 09:54:46 +00:00
Christian Kandeler
d504277901 Fix qbs build
Cleaning up after 4bae5de36b.

Change-Id: Ia03e2699aa1be26df152ed06a295301ac804b696
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-18 09:53:19 +00:00
hjk
aef8255ba0 ProjectExplorer: Replace unusual MsvcToolChain constructor
... by default plus a separate function.

Change-Id: Ib9507a3ecf6073ab4231218a3f2d3a532f6c680f
Reviewed-by: hjk <hjk@qt.io>
2019-06-18 09:51:23 +00:00
Eike Ziller
b02f4ae615 Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: I6f1bc9381dc8c0ce8abc5a6c006087076d8fc1bc
2019-06-18 11:48:32 +02:00
Eike Ziller
a2cfa43468 Fix expansion of %DATE% in license template
If the format contains '/', that must be escaped to avoid the expander
to interpret that as regexp style replacement.

Task-number: QTCREATORBUG-22440
Change-Id: Iaa6c0ae0aa74a055a30b3c0413e325c497f9310f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-18 09:45:06 +00:00
Eike Ziller
174b6f7e65 CMake build: Adapt to changes
Change-Id: Ia9cccd8068248ceacb2e4b1d4e182dc009d65497
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-18 09:41:18 +00:00
hjk
be55253f6f ProjectExplorer: Remove the display argument
... from the special MsvcToolChain constructor.

There's a generic way to set that in the base already.

Change-Id: Idd9f44672fec16ff8e3b08ad0f9809b1e7e066f0
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-18 09:41:09 +00:00
Michl Voznesensky
5bcc70b34d Fix bug for with redirect to general landing page Qt bug tracker. Now the redirection goes to the page creating the bug
Fixes: QTCREATORBUG-18734
Change-Id: I49847edce7da6a993ded3a9538334279965b6eb4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-18 07:41:25 +00:00
Eike Ziller
7d46060af0 Fix disabled close button in designer editor tool bar
It was never actually updating when switching the editor.
An update was just accidentally triggered when the designer plugin
updated the editor XML when switching modes, which triggered
an intermediate document change signal.

Get rid of the separate code paths for setting the current editor
for "standalone" editor tool bars and the tool bars in editor views,
which implicitly corrects the update behavior in the former case.

Fixes: QTCREATORBUG-22553
Change-Id: Ieb9f4b53600e1e1b66695ec86164628025df73f8
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-18 07:38:22 +00:00
Leena Miettinen
7c8ba7bb51 Doc: Remove the info about language client plugin being experimental
It is now a standard part of Qt Creator and enabled by default.

Change-Id: Ifcd4a2138c4a96e73efe97e5075414875773add4
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-18 07:14:33 +00:00
Cristian Adam
61fcdd0459 Clang build: Fix compilation with MSVC2017
Change-Id: I677614dc8f9de503131d8ac490a723c9fc5f7beb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.10.0-beta1
2019-06-17 15:40:39 +00:00
Tobias Hunger
295a0c5593 Make: Fake progress when running cmake
Neither tea-leaf nor fileapi provides progress information on cmake's
configure/generate runs. So fake it.

Change-Id: I0e336b4ba145793df6674f4847be1dddad7508cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-17 15:06:46 +00:00