Commit Graph

67787 Commits

Author SHA1 Message Date
Jacek Nijaki
c3641b02e4 McuSupport: Update wizard entry point generation
Use app_target_default_main() macro and default entry points that come
with Qul instead providing own main.cpp templates.

Qt for MCUs has own default entry points implementations that may vary
for release to release. OS cmake variable is also removed in Qul 1.4.

Change-Id: I729b28250671c1a873d30d8c6c4f8d12306435d2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 14:32:01 +00:00
Jacek Nijaki
8c227dea1d McuSupport: Update json kit processing to match Qt for MCUs 1.4
FreeRTOS backend is now a separate platform and requires dedicated json
kit file. Starting form Qul 1.4 there is no option to produce BareMetal
and FreeRTOS kits out of one json file.

This change is backward compatible with Qul 1.3.

Change-Id: Ic50b566a7f1a01fad4b00c07e723dfe1343fc2b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 14:31:49 +00:00
Michael Winkelmann
888cbe7f8a QmlPuppet: Refactor ChangeAuxiliaryCommand
Change-Id: I32eb04db96322883aa908e22724756f5e25ded09
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-18 13:25:59 +00:00
Robert Loehning
f830a21bf8 Squish: Update tst_git_local
This doesn't run into QTCREATORBUG-11074 anymore, because
Creator now uses "git add --intent-to-add" when adding files.

Change-Id: I125ff29f9974efad5d22fed220f6155cc5c6804b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 13:09:08 +00:00
Eike Ziller
d3c31917aa Fix build of sdktool against older Qt
Use wrapper for SkipEmptyParts, since Qt::SkipEmptyParts is only
available since Qt 5.14.

Change-Id: I26e26aaafd91c8eb002e73124d07306f21365bef
Reviewed-by: hjk <hjk@qt.io>
2020-08-18 12:46:34 +00:00
Eike Ziller
9df06af9bd CMake: Fix comparison of source paths when importing
We need to check canonical paths with canonical paths.
Otherwise we get a mismatch when using e.g. a linked directory for the
source path on the command line and then try to import the build in Qt
Creator.

Change-Id: I153be74b6cfdf5070e023780604ce64c92df0e6d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-18 12:24:15 +00:00
Marco Bubke
22fcfb0d6f QmlDesigner: Fix compilation of coretests
This reverts commit 7856c2c2f0. There were files
compiled which are not used in the tests but have external dependencies.
So instead of using the preprocessor we simply don't link the source
files in the project.

Change-Id: Ibba4a1dace1868b016af7135262c795bb29af204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-18 12:14:06 +00:00
Robert Loehning
2bb89a0fb2 Squish: Adjust expectations in tst_CSUP06
Task-number: QTCREATORBUG-22729
Change-Id: If945eaf188358a69e32e659a4bfa97a6a5e20083
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 11:34:59 +00:00
hjk
6db2631ff3 Nim: Use new AbstractProcessStep convenience functions
Change-Id: I48828392012e6a3a794473d4d32f0d2de2b52345
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 11:34:48 +00:00
hjk
89e7e5ff7f Meson: Use new AbstractProcessStep convenience functions
Change-Id: I6583a4b83f638d30cab72f395a1300aead1e38e7
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 11:33:53 +00:00
David Schulz
2dddc8520b Debugger: use additional cdb arguments
amends 2942ae876c

Change-Id: Ie1c2eb75300382ff8f350c8a66b893c6bfa21996
Reviewed-by: hjk <hjk@qt.io>
2020-08-18 11:24:03 +00:00
hjk
f0d0591015 Qbs: Start using aspects for some bool items in install step
Change-Id: If5e702ba6cf9727fe209c96988701d76f373a78d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-18 10:37:18 +00:00
Eike Ziller
f0f1775fd5 macOS: Zoom action should "unmaximize" if already maximized
Task-number: QTCREATORBUG-24495
Change-Id: I94273f6aa9b425b57e328cfdb052dc171718a97e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 09:43:32 +00:00
Robert Loehning
0a3f193d1e Update German translation
Change-Id: Ib719b350b97b9df5d6178e61a39b77293c52613c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 09:13:53 +00:00
Eike Ziller
119994c62d qmake build: Add alias for C++17 that is available in older Qt versions
We use Qt 5.9 to build a separate sdktool, for platform compatibility,
but that doesn't have 'c++17' yet.

Change-Id: Id6602e95d418d7d93b19e2b1ad60f13e1acf7280
Reviewed-by: hjk <hjk@qt.io>
2020-08-18 07:45:10 +00:00
Leena Miettinen
d425710587 Doc: Update mobile app tutorial
- Use Qt Quick Application - Empty wizard template to create
  a simpler project
- Use Add New Assets button to add the Bluebubble.svg file to
  the project and QRC
- Use Connections View Properties tab to add custom properties
- Use Properties view and Binding Editor to specify values for
  the custom properties
- Add screenshots

Fixes: QTCREATORBUG-24478
Change-Id: Ic165684141b06dc1870054c8faa2f27f33162c20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 07:03:33 +00:00
Christian Stenger
cf9cdd2a36 Squish: Update tst_cmake_speedcrunch
Server mode has been dropped.

Change-Id: I356f814bb4b0084cfcecd3b92ede1a0c27daf2b4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-08-17 17:52:55 +00:00
Thomas Hartmann
95e0b71b88 QmlDesigner: Do not assume MCU as the default
Fixes the sympton of QDS-2554, but not the real issue.

Task-number: QDS-2554
Change-Id: I8e0aca0b843bcb2befdc2d9a85b2dbfdb468ffb2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-17 16:07:54 +00:00
Marco Bubke
fcabab7b5f QmlDesigner: Extend captured data
Change-Id: I780815e6f42be4f3aceb1d784a685cc330572832
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-17 14:45:22 +00:00
hjk
0cfe11a960 Ios: Use new AbstractProcessStep convenience functions
Change-Id: I8a20690b679a4f2205295be48e4e5e99dee94d79
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-17 14:39:42 +00:00
hjk
e1d0b4cf48 CMake: Use new AbstractProcessStep convenience functions
This is actually a slight change in behavior insofar as
the summary now uses the same environment as the build
itself. This should not matter, or even be more correct.

Change-Id: I48e5be6cb7b97606f80f563ba399c4b6ff61c3bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-17 12:21:04 +00:00
Thomas Hartmann
96f0d2517f QmlDesigner: Add missing include
Change-Id: Ib521eab639f416fcacece6d396bc90c2fa473235
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-17 11:10:21 +00:00
hjk
1d6779f185 AutoTools: Use new AbstractProcessStep convenience functions
Change-Id: I994343d3d5cccf7ced6f2e576bd1c1cd5055fc47
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-17 10:54:30 +00:00
hjk
69ff17aa2d Android: Use new AbstractProcessStep convenience functions
Change-Id: I3fa4dcdd210f4c5d492217f2e3f1ceca353a4161
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-17 10:28:50 +00:00
Thomas Hartmann
7856c2c2f0 QmlDesigner: Fix compilation of coretests
Change-Id: Idd0c717078ac8d4fed9a8d4dfe000091ee2384c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-17 09:33:55 +00:00
Leena Miettinen
3d68fa647c Doc: Update info on using Custom Button wizard template
...to create buttons in Qt Design Studio

Update some of the tutorial source files accordingly.

Change-Id: Id8afc9bf66c30129701bf7951cbc48068137e145
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-17 08:53:10 +00:00
The Qt Project
3416357f2e Merge "Merge remote-tracking branch 'origin/4.13' into master" 2020-08-17 08:47:56 +00:00
Eike Ziller
1e447e133e Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Icfff925574d735f371dde4f554736865fb4af27f
2020-08-17 09:26:45 +02:00
Miikka Heikkinen
7adc062cf9 QmlDesigner: Allow plain expressions to be set with LineEdit control
Task-number: QDS-2603
Change-Id: I10a1b513bc21b8736683d4ddc2e290c29b39696d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-17 07:17:26 +00:00
Eike Ziller
d7a38f161d Add branches to some submodules
This is to make COIN actually checkout the submodules.
Submodules are still checked out with the registered SHA1.

Task-number: COIN-566
Change-Id: I1ababe97b6504fcf3b3220d19dd3f035f4517867
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-17 07:14:17 +00:00
hjk
9e54e1776e ProjectExplorer: Introduce TextDisplay for simple display tasks
That's effectively a beefed-up TextDisplay previously used only in
Incredibuild.

Change-Id: I0cedef24cede8b8513e80b64f589abe62a68814e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-14 16:06:56 +00:00
Antonio Di Monaco
6e4ca8b6af MainWindow: ask confirmation before closing Qt Creator
When working with multiple windows, pressing the close button multiple
times can close Qt Creator too.

This patch adds a system option, asking for a confirmation before
closing the IDE. By default it's not enabled.

Fixes: QTCREATORBUG-7637
Change-Id: Ifc5e8c97511f9227ce0634c8a7064d95775c76c2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 14:19:45 +00:00
hjk
70b226144f ProjectExplorer: Start to consolidate AbstractProcessStep setup
Add some convenience functions to the base class to avoid repetition
in the derived classes.

Will be used immediately it in some derived classes.

Change-Id: I8fd6aa4f8351720cdc8f63f7fa5f506e32a8143b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-14 14:15:23 +00:00
hjk
53abd750bf ProjectExplorer: Introduce an AspectContainer class
For further use in conglomerates like OverrideMakeFlagAspect.

Change-Id: I845ff085d15779e43431ab3858c5c1b55824f694
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-14 13:53:39 +00:00
hjk
a0067e9444 Autotools: Fix initial build configuration setup
Trade a duplicated 'make' for a 'make clean' step.

Amends 571fb04d.

Change-Id: I06dca803715a5c0a1a0917e4a4d5bac5704e8a43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-14 13:29:27 +00:00
Christian Kandeler
414561e4cc CppTools: More consistent fuzzy matching behavior
There were annoying inconsistencies, for instance:
    - A not fully matching declaration was found from the definition,
      but not vice versa.
    - An implementation MyClass::foo(int) would fall back to a
      declaration foo(), but an implementation MyClass::foo() would
      not fall back to a declaration foo(int).
These cases behave consistently now. To this end, the clang code model
now forwards to the built-in code model if a function lookup has failed.

Fuzzy matching for free functions has been limited, as the cons appear
to outweigh the pros. For instance:
    void foo(int);
    void foo(double) {}
Following the definition would lead to the non-matching declaration,
which the user most likely does not want.

As a side effect, redundant code has been removed in the SymbolFinder
class.

Fixes: QTCREATORBUG-20279
Change-Id: Ib97d6710c7e12fb0fdbc30b51a0067e09bfc2190
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-14 13:21:36 +00:00
Eike Ziller
84e2814ef0 Do not propagate dark theme to widget designer
Fixes: QTCREATORBUG-23981
Change-Id: I63c362b2ec87e02e7d6828ee4c143f54d113bef2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-14 12:54:36 +00:00
Eike Ziller
5183994a30 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ibb60b8a7ac531b239bb9c490da843d5cc1a6300a
2020-08-14 13:31:05 +02:00
Eike Ziller
e9f74df8cf Bump version to 4.13.0
Change-Id: Id1d2ebca1c2bca86683a3172bfe2f95123e1b897
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 10:06:21 +00:00
David Schulz
462a0f5b5d Editor: add log for printing
Task-number: QTCREATORBUG-24110
Change-Id: Ic4fef2e268cf3adf852a3ce7b229cb98356bbc5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 10:05:50 +00:00
David Schulz
6bed13db89 Editor: Validate trigger from snippets xml
Fixes: QTCREATORBUG-24415
Change-Id: Ic99355220bf1948af8a17d6ce017924eba3fc3ba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-14 09:17:52 +00:00
Leena Miettinen
e6c063f877 Doc: Update the Transitions example to use Transition Editor
- Use the Qt Quick Application - Empty wizard template
- Change Window type to Rectangle type to be able to add
  states in States view
- Set State1 as default state
- Use Transition Editor to add transitions between states
- Use Easing Curve Editor to add easing curves

Change-Id: Ie68fc6fdd2e0cf3704692885209abf9027da8319
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-14 08:49:27 +00:00
Leena Miettinen
9347c23487 Doc: Update info about adding assets to projects
You can use the Add New Assets button.

Change-Id: I8e406061e456d761fca0fec5f5e74d999dc06bd8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-14 08:48:25 +00:00
Ivan Komissarov
d4e8d4e955 Update Qbs submodule to head of 1.17 branch
Change-Id: I92f5f8af60487c9aa71022dad26d348ceef1b181
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-14 08:09:03 +00:00
Christian Kandeler
b19c5969d8 QmlJS: Fix crash
Fixes: QTCREATORBUG-24477
Change-Id: I45ab28fd11d8c9e51fb3b537a677620ecee5985b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-08-14 08:01:07 +00:00
Christian Stenger
30cdae912f Prepare for QDesktopWidget removal
Change-Id: I9aa2eadea16b5795ee2c4e7b21a24f356cfd3b03
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-08-14 08:00:20 +00:00
Eike Ziller
bd6161e2b2 ExtensionSystem: Add option to skip startup crash check
It can lead to problems, especially in automated environments, so
provide an option to skip it.

Task-number: QTCREATORBUG-24294
Change-Id: Ided0d12a87dc60fcaee6ad7e2747982cb0806a8f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-14 07:45:43 +00:00
Eike Ziller
a71dbd4b33 Fix different UI aggregation styles for widget project wizard
This got lost during the transition to JSON.
Amends 241efa353d

Fixes: QTCREATORBUG-24422
Change-Id: I51dec2e84adb3c5944ecaf83697f3e776bd3d7f1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-14 07:37:24 +00:00
Christian Kandeler
1e09b01d0e QmlDesigner: Fix qbs build
Change-Id: I60e4ab4ce71a88c9443a81866c81a454fa50b183
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 07:37:16 +00:00
hjk
51e7bce109 ProjectExplorer: Rename Base*Aspect to *Aspect
In most cases they are used directly, so there's not much Base* in that.

Added the old name as alias as porting help for a while.

Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-14 07:35:43 +00:00