Commit Graph

63610 Commits

Author SHA1 Message Date
Miikka Heikkinen
efa11e690b QmlDesigner: Remove remaining separate edit 3D window code
Change-Id: I3d745b54ae3aa5c3c05c859239934125b9ca828d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-09 08:41:55 +00:00
Miikka Heikkinen
e8f76f0050 QmlDesigner: Store 3D edit tool states per document
This way we avoid interference from scenes in other documents.

3D Edit view content is also cleared whenever a model is detached,
and puppet resize is automatically triggered if incorrectly sized
image is received to keep edit 3D view content up to date.

Change-Id: Ic7a71f1d89f0ebfe5a62b49ea62570242b8f5b1d
Fixes: QDS-1734
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-09 08:41:42 +00:00
David Schulz
42f34c8a55 Dumper: Do not test fortran string on windows
Which doesn't exist on windows and will fail the test

Change-Id: I0dd005ccfcbf54faa716c642c5441c2086b3a32a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-09 07:10:57 +00:00
Christian Stenger
3568b6bea1 Android: Fix build with namespaced Qt
Amends 1fbc8a7f68.

Change-Id: Idb76c31c2ab0bf93a49c255bae5b2c428f4961c7
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-09 06:38:29 +00:00
Denis Shienkov
fdf383cf37 BareMetal: Choose peripheral description file on debug provider page
... instead of device page.

Reason is that a path to the peripheral description file comes from the
inside of the provider for some providers (e.g. for the UVSC provider at
parsing the selected "Software Device Pack" file).

This complicates a code for assigning of the selected peripheral
description file path to the device configuration page.

So, it is makes sense to make it possible to choose a peripheral
description file from the debug server provider page. In this case we
will pass a path to the selected peripheral description file via the
runnable's extra data variable.

Tested with STM32 NUCLEO-F767ZI board on Windows.

Change-Id: Iec4d738dd236449969fd669e7fbe58da3a660938
Reviewed-by: hjk <hjk@qt.io>
2020-03-06 18:20:15 +00:00
Eike Ziller
4894afee52 Bump version -> 4.12 beta2
Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-06 14:19:52 +00:00
Tim Jenssen
8573623c6e QmlJS: remove unused QtQuick2 check
Change-Id: I7d613ba825a5ce3d4d8302adff9c98f751bc7ab1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-03-06 14:06:54 +00:00
Eike Ziller
a6d52a6e28 Move some actions to a "View" menu
A "View" menu seems to be what many users are looking for when they want
to show or hide panes/views, so move corresponding actions there.
Window management / split actions stay in the "Window" menu.

Fixes: QTCREATORBUG-23610
Change-Id: Id683addc681de99abb35697a735fdbc9dc0d00cd
Reviewed-by: hjk <hjk@qt.io>
2020-03-06 14:01:23 +00:00
Leena Miettinen
712766b7b1 Doc: Update docs on Build menu commands
Task-number: QTCREATORBUG-23686
Change-Id: I46a94564d96ad7a5172414c62aa2abbbc965bbba
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-06 13:31:46 +00:00
Miikka Heikkinen
0fa7581b18 QmlDesigner: Fix 3D edit view refresh issues
Change-Id: Iddcd54b29376a6a31a0290b234ade63ed2bb898b
Fixes: QDS-1746
Fixes: QDS-1738
Fixes: QDS-1742
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-06 13:30:23 +00:00
Miikka Heikkinen
3ca7fdeb8a QmlDesigner: Update edit 3D camera icons
Change-Id: I637a37577a6c8d1b96b347041757066dd9c58071
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-06 13:28:19 +00:00
Miikka Heikkinen
887b137348 QmlDesigner: Fix various Edit 3D view tool state issues
Edit 3D view tool state is now inherited from the current tool state
of the 3D view for newly added scenes. If there is a stored tool state
for the scene id, then that is used instead.

Change-Id: I4360d034cf946b1951642f4c2e09344b34825dc2
Fixes: QDS-1730
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-06 13:28:04 +00:00
Leena Miettinen
32bf75c50e Doc: Move environment settings to a separate section
They are available from three different places in the Projects mode,
with slightly different use cases.

Task-number: QTCREATORBUG-23686
Change-Id: I678b3ab4762d7da8d0fcc060eef7d0146bfcd0ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-06 13:00:03 +00:00
Leena Miettinen
89a9790ca9 Doc: Describe new ways to customize the build process
You can select what to stop before building and what to
build before running.

Task-number: QTCREATORBUG-23686
Change-Id: I7d20b2ece09227f0f2ef54788efc3b83807d1a32
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-06 12:54:39 +00:00
Ville Voutilainen
1fbc8a7f68 Android: turn manifest editor application icons into widgets
Change-Id: If192b1b4809cd68ebd214f3fd82e26c7818df32f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-03-06 11:00:04 +00:00
hjk
a7c05e5e11 Debugger: Invalidate disassembler cache index after using it
Not before. Amends b3812bf94f.

Change-Id: I3f8dd9f23adbbd56bb0d5d76a80a90fd9b7030b5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-06 10:58:24 +00:00
Eike Ziller
d6c95ef365 Take compatibility version into account for user plugins
When loading user-local plugins, do not load plugins for all patch
versions starting from .0 unconditionally. Take the compatibility
version into account.

That fixes that prereleases x.y.82 etc should not try loading plugins
for any actual x.y.z release.

Change-Id: Ide0931bbdef4f48e08dcc3213f7c193c8889fb0f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-06 09:49:05 +00:00
Eike Ziller
8f89c9a846 Merge remote-tracking branch 'origin/4.12'
Change-Id: I04d9cc69a07d4d07b1bf1df57681d6a68587d7ba
2020-03-06 09:44:11 +01:00
BogDan Vatra
8bb3b3c4f1 Disable androidMinSdkVersion & androidTargetSdkVersion editing if needed
Starting with Qt 5.15 we moved sdk min & target versions from
AndroidManifest.xml file to build.gradle (the change was needed by
android gradle plugin).

Fixes: QTBUG-70817
Change-Id: I3b493d88da1a4a98f1a6d8ebadc26aebfc601090
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-06 07:18:04 +00:00
Christian Stenger
afffbe01aa AutoTest: Fix leaking of project settings
Make sure project settings will be destructed
correctly.

Change-Id: I633bf744eb2e0835fe89e3a9f3c2f7293c5f5275
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-05 14:32:55 +00:00
Leena Miettinen
74f04c17d1 Doc: Update info about build settings
QML debugging and profiling, separate debug info, and
Qt Quick Compiler are now enabled in the general build
settings. Default values can be set in Build & Run options.

Task-number: QTCREATORBUG-23686
Change-Id: I6eef8f270ab42cc563c3c95cfddf22243a5ef017
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-05 13:43:24 +00:00
Christian Kandeler
cb2f5520d9 QbsProjectManager: Fix default install root
We forgot to append the "/install-root" directory at the end.

Change-Id: I1ad0d547f097a6b9c954603d394a5182368633a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-05 13:35:33 +00:00
Leena Miettinen
cd00122fcd Doc: Update info about Qbs support
Fixes: QTCREATORBUG-23691
Change-Id: Ic1d9b23720a305c39792948aec8f15ee52c1a778
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-05 13:15:55 +00:00
Henning Gruendl
447171400b ADS: Adapt Essentials preset layout
Adapt Essentials preset layout so it will look like before ADS was
introduced.

Change-Id: I08ea0cbac41f2de53a3c62c032494e219963bada
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 13:08:12 +00:00
Tobias Hunger
e5f4cfbeb8 CMake: Do not default to CodeBlocks extra generator
Now that CMake without server-mode or file-api are no longer
supported in Qt Creator, there is no more need to push for the
CodeBlocks extra generator which was required for the
"tealeaf" reader only.

Change-Id: Iec280d960b9f50ee6f9b954ecc532745a62213f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-05 12:50:18 +00:00
Christian Kandeler
ae0d2bd1ac QmakeProjectManager: Try harder not to access nodes of in-parse project
For extra safety, do not touch the project nodes if any build system of
any build configuration is currently parsing.
This is a bit of a stab in the dark, as I cannot reproduce the crash
described in the linked bug report.

Task-number: QTCREATORBUG-23597
Change-Id: Ie62a94232e89d8fba5866ea3572535e2ab209924
Reviewed-by: hjk <hjk@qt.io>
2020-03-05 12:40:47 +00:00
Henning Gruendl
5683f2df85 ADS: Cleanup workspace manager workflow
- Add workspace presets
- Add reset button to workspace manager
- Fix last workspace settings save/restore
- Move functionality from DesignModeWidget to DockManager
- Remove factory default workspace
- Cleanup a few if statements

Task-number: QDS-1699
Change-Id: I282dd6162a5a36041f8cd2aacd7407750d54cc22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 11:12:51 +00:00
Mahmoud Badri
fb843d3442 QmlDesigner: Remove the standalone view3D window implementation
Task-number: QDS-1692
Change-Id: I6c04aaee9ab6a119cfcc22ee2e19b808bb95ae0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-03-05 11:00:11 +00:00
Aleksei German
5b8fe22337 QmlDesigner: ColorEditor Fix and Tooltips
- Fixed an issue with not-clickable recent color button
 - Added tooltips with color hexes for recent and original colors

Change-Id: I21c2e4c98005b473a3450606eb27428977578bdc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 10:33:16 +00:00
Miikka Heikkinen
eadbce7b80 QmlDesigner: Fix 5.15 build
QtQuick3D Type API changes broke build.

Change-Id: Ibbd7fc3f699875b24f6345dfca66c5f442915544
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 09:51:41 +00:00
Orgad Shaneh
4dcc480865 Merge remote-tracking branch 'origin/4.12'
Change-Id: I5de0b3e1940998d4aca79b1698ef408ae4d43e69
2020-03-05 11:32:27 +02:00
Leena Miettinen
eea835eab0 Doc: Add a section about finding and filtering output
The standard "find in file" functionality is now used, so
link to it. For filtering, describe the options.

Change-Id: I379d23fbc35ebfbbfef1d6fa3007af5b9d7f23b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-05 09:14:34 +00:00
Leena Miettinen
ae1a4250e1 Doc: Describe integration with Qt Marketplace
There is now a Marketplace tab in the Welcome mode.

Task-number: QTCREATORBUG-23452
Change-Id: I8043adb3104d542b63d5963261e92d7044222204
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-05 09:05:00 +00:00
Eike Ziller
abd4d68696 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I00ccdc2c79176799fe9d20ecfe42c260796d7d97
2020-03-05 09:36:40 +01:00
Tobias Hunger
8e47fc18a6 CMake: Pick Ninja generator when installer added ninja
Pick the Ninja CMake generator when the installer has installed
the ninja binary.

Task-number: QTCREATORBUG-23650
Change-Id: I966b369513e7d489161b210819832f1bbbb5a0fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-05 08:31:46 +00:00
Eike Ziller
d2759075de TextEditor: Do not overwrite existing indenters
In 6959618d7b a default indenter was set
on all text editor factories.
Unfortunately some editors, like the C++ editor, set their indenter in
the text document constructor, which would then be overridden by this
default indenter.
For now remove the default indenter again until this is better thought
through.

Partially reverts 6959618d7b.

Change-Id: I8f32e92438883edb6be853fa838b75297347a937
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v4.12.0-beta1
2020-03-05 07:14:40 +00:00
Eike Ziller
7a3f5edfaf Locator: Use QJSEngine for script locator filter
QJSEngine is interruptible since Qt 5.14. Make that the requirement for
the script locator filter and remove (optional) dependency on QtScript.

Change-Id: I3d6df04571441ddf152a213f0053c46e3cb317fa
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-04 14:04:41 +00:00
Christian Kandeler
103ab51f70 CompilationDatabaseProjectManager: Fix autotest
Amends 45d42d4518.

Change-Id: I7404bbc782278d09b419906a0d74f29d66c3867b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-04 13:59:37 +00:00
Christian Stenger
a82f707ee5 QmlJS: Fix up compile fix
Amends 33b091bd40.

Change-Id: I26d98bae8a074f7c3515b46994afd5548e2ca82f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-03-04 10:15:16 +00:00
Aleksei German
103a602f8d QmlDesigner: Auxiliary data auto-fold
- Made TextEditorWidget::restoreState() virtual
 - Added function to fold qml Auxiliary Data
 - Extended settings page to fit the new option

Task: QDS-1667
Change-Id: Id1256fcc72a67ac822888d5fd2e23d6076349573
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-04 08:43:46 +00:00
Christian Stenger
33b091bd40 QmlJS: Fix compile
..in general, with tests, and when using a namespaced Qt.
Amends b09a48599e.

Change-Id: I99e275e10df5eed741d021911a360457f0d0d2e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 08:22:12 +00:00
Orgad Shaneh
37abf3beb5 GitEditor: Fix order of arguments
Oops!

Amends commit b52ffa2501.

Change-Id: Icec6b569c69ae4baf227f6510b45d596c5969ce8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-03-04 07:25:26 +00:00
Eike Ziller
995ba78fae Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/tealeafreader.cpp
	src/plugins/cmakeprojectmanager/tealeafreader.h
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I88d85be3903f57a55fddb7901e771a4822db1b85
2020-03-04 08:15:50 +01:00
Eike Ziller
6959618d7b TextEditor: Use simple text indentation as default
Simple indentation based on the previous line was already available in
the NormalIndenter class. Merge that up the hierarchy chain into
TextIndenter which is the base for other text-based indenters, and make
that the default indenter for text editor factories.

Text editor factories that don't have a special indenter get at least
basic indentation support for free that way.

Change-Id: Ib977a990f10a99bead82bc8a8348c02a106665f1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-04 06:55:37 +00:00
Miikka Heikkinen
a77ef4ca7f QmlDesigner: Port Edit 3D View to 5.15
Qt 5.15.0 is now the minimum version to enable Edit 3D view.

Change-Id: I15cee59e6a7665477825caa0ae412fc6ac7b570a
Fixes: QDS-1694
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-04 06:27:45 +00:00
Robert Loehning
59560fb817 Core: Translate "on" and "off"
Change-Id: Idcd1e1c16c188eeff1f6d43a69d2c31b3300a652
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-03-03 18:36:55 +00:00
Orgad Shaneh
e4dab6b83e QmlJS: Fix compiler warning and add a missing include
qmljsdiagnosticmessage_p.h: In static member function ‘static QmlJS::Severity::Enum QmlJS::DiagnosticMessage::qtMsgTypeToKind(QtMsgType)’:
qmljsdiagnosticmessage_p.h:72:5: warning: control reaches end of non-void function [-Wreturn-type]
   72 |     }
      |     ^

Change-Id: I2183199bf257453e0af2998b739fae8c90f5c098
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-03-03 17:28:52 +00:00
Orgad Shaneh
989eb36012 QmlJS: Fix Qbs/CMake build
Change-Id: I27b4e2024ad1cddafea7ca7be5eb3055d34bf297
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-03 17:05:17 +00:00
Tim Jenssen
e935291c85 QmlDesigner: Use ActionManager in FormEditor
We assign an ICore context to the FormEditorWidget and
associate it with a Context (C_QMLFORMEDITOR).
This guarantees that the action are only active when
the FormEditorWidget has focus.
The actions are then registered as Commands. The shortcuts are set on the
command and are configurable in the options of Qt Creator.

Task-number: QDS-1712
Change-Id: I327f35736205c9337386cf70e6f058d4b19be50e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:15:38 +00:00
Thomas Hartmann
4f55b9a0fa QmlDesigner: Do not allow keywords as properties in annotations
Otherwise we get a syntax error.

Change-Id: Id69be9ef0426dae64c461f21dda14eca340f720d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:09:55 +00:00