Commit Graph

47434 Commits

Author SHA1 Message Date
Assam Boudjelthia
d1a42414c5 Android: fix misleading warning when creating an AVD
When no system images are installed in the used SDK path,
the warning should point to install a system image because
none are installed instead of blaming the SDK.

Task-number: QTCREATORBUG-24754
Change-Id: Ic3dc6cb25f014f4216fd63636b3b312b14f76e6d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-10-08 18:18:21 +00:00
hjk
ce2c18dd68 Help: Some Qt 6
Change-Id: I30553e491e5dfc119ac1527c8a2419b6d18647fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 15:39:10 +00:00
hjk
a27b162407 PerfProfiler: Compile fix for Qt5
Amends 67c800af6e.

Change-Id: Ia0bb003d3e83027d060c97a1bcf8758db00d9281
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-10-08 13:57:46 +00:00
hjk
fe0ee642b5 QmlDesigner: Compile with Qt 6
Qt 6 does cannot handle forward-declared types in signal declarations.

Change-Id: Iad4a810841df3d077750ad76c892bdb7eecc0a80
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 13:39:16 +00:00
hjk
852985b2ca Help: Sprinkle some QLatin1String
Change-Id: I395742c2255b50c0a9017f86c7e7dca5a8535542
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 13:32:21 +00:00
hjk
67c800af6e PerfProfiler: Some Qt6 compilation
Remaining issues operator<<(DataStream &...), the timeline dependency
and qmlRegisterType.

Change-Id: I51556e67cd93cb8bdced569ca509929705da80b4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-10-08 12:51:48 +00:00
hjk
41a51a63f5 ClangCodeModel, Puppet, CrashHandler: Compile with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ic65e7a5dce0a512f48fb70915b9443ef7df2b787
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-08 11:16:09 +00:00
Eike Ziller
3ee70780b4 Qt6: Sprinkle QLatin1Strings for QStringView comparisons
Task-number: QTCREATORBUG-24098
Change-Id: I2fb79bcfd0537a6704a1ee8db840401d6beca7a0
Reviewed-by: hjk <hjk@qt.io>
2020-10-08 10:38:47 +00:00
Orgad Shaneh
d02c69d1bc DiffEditor: Improve initial size of description widget
Fixes: QTCREATORBUG-24286
Change-Id: I8844b30d287fcdc5333906d00d92e00d05f5560a
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-08 10:18:03 +00:00
Eike Ziller
9828e6887e Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Ie53b4c2516d80a653d51bc6b666040c586ce44ab
2020-10-08 12:04:06 +02:00
The Qt Project
e61152bf56 Merge "Merge remote-tracking branch 'origin/4.13' into 4.14" into 4.14 2020-10-08 09:58:48 +00:00
Alessandro Portale
c68f49fefa Remove unused private functions
As found by Cppcheck.

Change-Id: I697ea69992425ff41e35990ad00be312b35ba70a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-08 09:06:02 +00:00
hjk
35bab3a021 Autotools: Also read _HEADERS variable
Change-Id: If081d9ec00a87d8e7989720a351531e94d02e28c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-08 08:34:13 +00:00
Aleksei German
65ca1301de QmlDesigner: MCU Metadata improvements
- Introduced allowChildren switch

Task: QDS-2794

Change-Id: Ie992fb173e8eacb27b10679d5ff28238277aa346
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-08 08:01:16 +00:00
Eike Ziller
5ab8cc61fc Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: Ia20a937786be651a5fe9daefb856f7779905ef68
2020-10-08 09:46:09 +02:00
hjk
35932385bc FakeVim: Allow AltGr as modifier to produce normal key values
Task-number: QTCREATORBUG-24673
Change-Id: I6d1aa5badd3077f0885d5b2470527c006096809d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-08 06:24:46 +00:00
Tim Jenssen
bfc04ed53d qmlpreview: enable adding multiple testlanguages
Task-number: QDS-2531
Change-Id: I558f6d1040148ff4a392f5c5cfc6af4da54fef70
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-07 14:55:31 +00:00
Tim Jenssen
9dda8af0b0 qmlprieview: fix that init language is the chosen one
* removes language feature from preview service
* it is handled by an extra DebugTranslationService until now
* Qt versions without that extra service can not preview
  languages anymore
* Introduce the use of QmlPreviewRunnerSetting. It makes it
  easier to add more properties in the future
* Language needs an extra handling because it needs
  the loadUrl to find existing languages. So we save
  the language to a m_scheduledInitLanguage and emit
  this after the loadFile call happend.

Change-Id: I7f4aec97f7b61d6b290f225282169da594eb9160
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-07 14:55:17 +00:00
Leena Miettinen
1fcac114a3 Doc: Describe new refactoring actions (quick fixes)
Fix capitalization of action names.

Task-number: QTCREATORBUG-24529
Change-Id: I021717bbae237dd293bdbd56d5e10407ee12f224
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-07 12:54:25 +00:00
hjk
54417569a9 ProjectExplorer: Documentation for some run configuration aspects
Change-Id: I27568facbe0fa992b33c9d3b5b2588b486a85c63
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-07 11:50:28 +00:00
hjk
3d308d7195 ProjectExplorer: Simplify BuildStepWidget updating
Change-Id: I189ca0aa3b88227feae881df026f8578079e1c55
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-07 11:50:05 +00:00
Alessandro Portale
323f353c6c Android: Replace AVD partition-size spinbox with emulator args input
The android emulator supports many more command-line startup options
than "-partition-size". Let's allow the user to take advantage of the
full functionalty, by providing a free-text input field for the options.

A link to the online documentation is also provided.

As a side-effect, the issue that an overridden parition size can cause
the "Cold Boot: different AVD configuration" warning is solved by not
having -partition-size by default.

Task-number: QTCREATORBUG-24735
Change-Id: I41d7b826133708c7ff447c1e257f62368745dea1
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-10-07 11:25:28 +00:00
Christian Stenger
ac0ae2f1eb AutoTest: Fix summary part III
Amends 479f6c8.

Change-Id: I3bd7a789eef8d53610f87ccaafa43c921ff1e23f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-07 08:44:55 +00:00
hjk
cc5ac00d19 ProjectExplorer: Make ArgumentsAspect's label text configurable
To be used in QmakeStep.

Change-Id: I5cc95de6b54c40a5dcc5f92768455a69a1d2869c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 15:26:51 +00:00
Thomas Hartmann
ebb4755753 QmlDesigner: Add customComponentSource to ItemLibraryEntry
Change-Id: Ief7555b321ae3bdc790b2e747d367347031a4a56
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-10-06 15:19:53 +00:00
Aleksei German
00c07ca53e QmlDesigner: MCU configurations metadata
-Removed c++ hardcoded info about QDS MCU restrictions
 -Instead replaced it with dynamically loaded qml files
 -Replaced QLists with QSet/QHash to improve performance

Task: QDS-2794

Change-Id: Ifc23d1299155001b6573dc0ed789dda5d2cfaf24
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-06 14:10:04 +00:00
hjk
ab76991286 QmakeProjectManager: Use LayoutBuilder for QmakeStep config widget
Towards aspectification.

This intentionally also removes the extra inner margin in the
widget as a side effect, increasing the similiarity with other
step widgets.

Change-Id: Ic315369479275a317441ff2c5abbec53695102f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 12:59:26 +00:00
Eike Ziller
c3d461d494 CMake build: Add missing PROPERTIES to add_qtc_plugin
And use it for QmlDesigner

Change-Id: Id7221ee2288159ff2faaf4ac483570034927f1b4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-06 10:16:39 +00:00
Eike Ziller
d323eeec52 Merge remote-tracking branch 'origin/master' into 4.14
Change-Id: I4b37b89cc1dd2c53217579ea554af0fb7994fa7e
2020-10-06 10:24:41 +02:00
hjk
a99127d73b QMakeProjectManager: Do not ask to rebuild too often
Due to the incomplete aspectification here, some of the connections
are set up in createConfigWidget(). Config widgets are created
and destroyed when the build configuration changes, and connections
that did not directly depend on the widget or subwidgets accumulated.

Use the the created widget as guard object to ensure connections
live only as long as the widget.

Task-number: QTCREATORBUG-24725
Change-Id: I4581f98e684ac92fd43ceba598d391c4dc8dbebe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 08:21:00 +00:00
hjk
97c6c13dcb ProjectExplorer: Remove BuildStepConfigWidget
After the previous changes it was only an empty wrapper around QWidget.

Change-Id: I58dcd82d8342c7de5e2df537044f6cf3de878a67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-06 08:06:39 +00:00
Eike Ziller
2092ebd074 Merge remote-tracking branch 'origin/4.14' into master
Change-Id: I4ea98cc1c14808afe44030a057f9ff289a57ccfe
2020-10-06 10:05:47 +02:00
David Schulz
3c281aa483 Editor: Select moved text after drag and drop
Fixes: QTCREATORBUG-24245
Change-Id: I9da52424128825f729d5d20e2c7fd095120477c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-06 07:54:27 +00:00
The Qt Project
ab9efa7ec3 Merge "Merge remote-tracking branch 'origin/4.13' into 4.14" into 4.14 2020-10-06 07:50:30 +00:00
Christian Kandeler
90c757d9cc ProjectExplorer: Make build and run widget width persistent
... by storing the splitter state in the session.

Task-number: QTCREATORBUG-24690
Change-Id: Ifd27382cc61825f96de4fa5d4691b4f615448182
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-06 07:50:28 +00:00
Eike Ziller
87ad222cb6 Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I3b48c76bbb456c487cec33383e7332b6a0a6752a
2020-10-06 09:49:57 +02:00
hjk
f08c3d150a Debugger: Fix parsing of octal-encoded gdb escapes
Fixes: QTCREATORBUG-24462
Change-Id: I89153a04eeef6a2e20fefef45e0efa3712ec0997
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-06 07:01:04 +00:00
Christian Stenger
33c3fe2c67 Designer: Fix test
Amends 142c47bdc2.

Change-Id: I30ff356687d4daef93d35744fd8c108eafed0c68
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-06 04:03:47 +00:00
Assam Boudjelthia
ee3a0ecb75 Android: add qmake variables to completion assistant
Add Android specific qmake variables to profile completion
assistant.

Change-Id: I1c4c25bfa7481fed511f48360e93fb5996b42401
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-05 19:37:17 +00:00
Thomas Hartmann
3e4cb2ba2f QmlDesigner: Show selection in DebugView
Change-Id: Ica85a227e6976464480a3b3dd91d4d42f1ed1528
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-05 17:27:52 +00:00
Thomas Hartmann
b9cc9c9bfa QmlDesigner: Fix crash
We have to check if the view is actually detached.

Change-Id: I160c1a15f921092ef66999ed6a27ffcdbbe205d9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-05 17:27:45 +00:00
hjk
b2b35eeddc ProjectExplorer: ProcessParameters code cosmetics
Change-Id: I050cb30222642911b582b9936186719cb4f09fa1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-05 15:04:23 +00:00
hjk
ee5feb4939 Conan: Use Utils::Aspects in build step implementation
Task-number: QTCREATORBUG-21785
Change-Id: I5b2dbcc16a2504efe9fdc9e31fa2ef14bba7c33c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-10-05 14:36:55 +00:00
Thomas Hartmann
aeb30c0840 QmlDesigner: Delete existing node when property does not allow list
Some properties can only contain a single QML element. In this case
we should delete the old existing element.

This can be checked using NodeMetainfo::propertyIsListProperty.

Change-Id: I1782a38b7bfdb8a6f1078b0fa39654a4653dab59
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 12:32:26 +00:00
hjk
2a5c5d118b AutoTools: Build step code cosmetics
Change-Id: I5281bfaaa54ade80bbf46cfd16f629a2d1c81a9b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-05 11:26:44 +00:00
hjk
c3833406cc iOS: Remove unnecessary check in IosBuildStep::init()
A buildstep always belongs to a build configuration.

Change-Id: Ia24e571fbaf47c97797661774e87d583bddb1d76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 10:22:58 +00:00
Thomas Hartmann
fe7d928f3b QmlDesigner: Do not keep separate selection state
When nodes are deleted the selection can changes without a notifier.
There is no reason to keep the selection separately.

Change-Id: I166d3695762e3d5cd6ff4808586384fd26bafef4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 09:37:11 +00:00
Thomas Hartmann
634bb8afb4 QmlDesigner: Add const to selectedModelNodes()
Otherwise we have to use qAsConst when using ranged for.

Change-Id: I6bb166be1525b0b75939c9a134b507e561f7bbd0
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-05 09:32:34 +00:00
hjk
5d889a4d33 QmakeProjectManager: Add a soft assert
Task-number: QTCREATORBUG-24683
Change-Id: I6c4780a3200eff7c371dd90bb0b441ce84d4b9cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 09:15:31 +00:00
Jochen Seemann
3a4ede2e1b Add support for Conan package manager
Task-number: QTCREATORBUG-21785
Change-Id: I4b2dbcc16a2504efe9fdc9e31fa2ef14bba7c33c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-05 09:10:53 +00:00