Commit Graph

47434 Commits

Author SHA1 Message Date
Andre Hartmann
60a275ce62 CompileOutputWindow: Fix creation of task positions
When jumping from the issues pane to the compile output,
the selected text was always starting and ending one line
earlier than expected.

Probably broken by 1c6e4fbd3.

Fixes: QTCREATORBUG-25497
Change-Id: Ia5b796f27faa91e45b10b945dbf6261f1dbce036
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-25 19:38:00 +00:00
Mahmoud Badri
1dd52d39af QmlDesigner: Fix dropping files to assets view when in list mode
Fixes: QDS-3996
Change-Id: I1ef38fc784d2cf97a370caa39e42d6d7bf6bc6ea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-25 18:11:27 +00:00
Robert Löhning
cd0a140bde Improve translatable strings
Change-Id: I0104209bb0f865a48f9ca2524f62457f7524bba9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-25 16:53:40 +00:00
Michael Winkelmann
b994bb7bd6 Annotation Editor question dialog
Change-Id: I4c278abf34bd6c33fe989a5aa80006f1d88f687b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-25 16:44:03 +00:00
Michael Winkelmann
27c456dd9e Common EditorProxy interface for Editors
* Introduced a EditorProxy base class to have a common Qml interface for editors

Change-Id: I93af944002801cc3e318653c67dcc464bd9f1213
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-25 16:30:17 +00:00
hjk
904f59a744 Android: Simplify implementation of aspect for extra commands
Change-Id: Ic8bd75d8d6cb183772d96263837f1ed307c5dc5f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-25 16:19:32 +00:00
Eike Ziller
83a8e32b3a Fix build
Amends bd9a61fa27

Change-Id: Ib3cb0991419e8d85ee29591771cfb7f126b11076
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-25 16:16:55 +00:00
hjk
3deba648cf Core: Simplify use of settings based on aspect containers
This effectively introduces a third parallel system for handling
IOptionPage apply() setup besides setWidgetCreator/IOptionsPageWidget
::apply() and the few remaining completely manual implementations of
IOptionPage::apply(), but there is some hope that this one can actually
replace all in a not so distant future.

Change-Id: I0c90a3a484216de9d7ad0f2f60c044c4e84dadb7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-25 16:02:02 +00:00
Knud Dollereder
5faee6221f Load all curves when opening DS with lastsession
Change-Id: I2de37fbd25b828e585739edee8bb079c02f58f94
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-25 16:00:12 +00:00
Tasuku Suzuki
3bd490acdb Improve grouping and order in the build menu
Build related menu items are sorted by tasks, then configurations.
e.g.
+ Build
  + Build All Projects
  + Build All Projects for All Configurations
  ...
  + Rebuild All Projects
  + Rebuild All Projects for All Configurations
  ...
  + Clean All Projects
  + Clean All Projects for All Configurations
  ...

This patch changes the order to configuration > task like below

+ Build
  + ...
  + qmake / cmake
  + -
  + Build All Projects
  + Deploy
  + Rebuild
  + Clean
  + -
  + Build Project
  + Deploy
  + Rebuild
  + Clean
  + -
  + Build Subproject
  + Deploy
  + Rebuild
  + Clean
  + -
  + Build File
  + -
  + Build All Projects for All Configurations
  + Rebuild
  + Clean
  + -
  + Build Project for All Configurations
  + Rebuild
  + Clean
  + -
  + ...

Change-Id: I95844e51d2ae164ed9f29fdb1c51509611c514fe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-25 14:57:37 +00:00
Michael Winkelmann
bd9a61fa27 Refactor AnnotationEditors to support different views
Change-Id: I67797e911c320d77b8d6a2eba75de69546b30546
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-25 13:48:31 +00:00
Alessandro Portale
3f265c37c6 VcsBase: Avoid extra 1-pixel frame around SubmitEditorWidget
Change-Id: I394bbce04f0feed01f917f81ce075a83776b71a4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-25 12:23:11 +00:00
Alessandro Portale
bc158cdaee Help: Avoid extra 1-pixel frame in Help widgets
For QTextBrowser and QLiteHtmlWidget based viewers

Change-Id: I0e8003b555b15e8eca239c59e657d9cf417f2d58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-25 11:19:13 +00:00
The Qt Project
19558c82c8 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-03-25 10:48:57 +00:00
hjk
b569258748 QmakeProjectManager: Aspectify settings page
Change-Id: I97630d9c63d6629e89ada46a1c05b8d820bd72fb
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 10:41:05 +00:00
Eike Ziller
b213c87cf4 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63
2021-03-25 11:06:59 +01:00
hjk
01713d4dfd CPaster: Aspectify FileShareProtocolSettings
Change-Id: I9ae9975eb6fd2c4124d17e2862afa9cde32e9438
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 09:29:47 +00:00
hjk
123133841e CPaster: Aspectify general settings
Change-Id: Ia0a24dd5fdc03217c54aee50ed1f39be0110a415
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 09:04:21 +00:00
Thomas Hartmann
9a95611e54 QmlDesigner: Fix crash
The return was placed incorrectly.
A property called 'path' is required but not sufficient.

Task-number: QDS-1430
Change-Id: I4dbae2fa0f63c36698c5db3480a65eb56fbdb96d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-03-25 08:49:50 +00:00
hjk
baa794a7ba Utils: Use a full layout row for an aspect for Columns and Forms
Avoids some boilerplate on the user code side.

This seems to be the only existing case. If there'd ever be a case where
this is not appropriate, an extra Row { ... } would solve it.

Change-Id: I1ae1102e895640c0acc03b4949e3baabecfcdc49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-25 04:53:05 +00:00
hjk
46b1ac7d5b VcsBase: Actually write changed settings
Amends 8e507c215.

Change-Id: I245ef15be159039cee44cc2e1ea9dcafccb13bd0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-25 04:52:57 +00:00
Alessandro Portale
13741671a6 VcsBase: Fix swapped defaults for lineWrap and lineWrapWidth
Also the types differ.

Change-Id: Ib514dd07ffdf6186d46c015f32160ed337127464
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 15:52:13 +00:00
Aleksei German
960d0e42ad Replace modal dialog with InfoBar in QmlProject
Change-Id: I0dfa8722748ae67ff29ad0aeb72681ee8c413d28
Fixes: QDS-3765
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-24 14:57:01 +00:00
hjk
8e507c215b VCS: Aspectify common settings page
Change-Id: Ib860e40ba476b428c92766312bced2950d0390ac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-24 11:58:58 +00:00
Vikas Pachdha
5e1bf23811 AssetExport: Fix assets not being exported in certain cases
This can happen when the .ui.qml file with missing UUIDs is already
open in the editor

Task-number: QDS-4031
Change-Id: I17dbcf4b378141425a33dafc33a0ec47577c6d05
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-24 11:49:59 +00:00
Thomas Hartmann
ef508d61ad StudioWelcome: Update copyright notice to 2021
Task-number: QDS-3995
Change-Id: I0e8cd899cf70cc32031aec0acdd80d75c3f2ea7a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-24 11:37:15 +00:00
hjk
a694487711 Utils/VcsBase: Move ability to specify group settings keys to base
Merge it with the read/writeSettings implementation that was already
there.

Change-Id: I25dfbdf6fd1cf122b17f89eae82cb2598d8470c8
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-24 10:14:25 +00:00
David Schulz
9fcab76de6 TextEditor: Fix corrupted cursor after droping text
... by removing excess endEditBlock.

Fixes: QTCREATORBUG-25305
Change-Id: I81fd2ee57a7a470fcc8e78475f336bf2b651a14b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-24 05:31:10 +00:00
Alessandro Portale
460d446c61 CMakeProjectManager: Set CMAKE_TOOLCHAIN_FILE for WebAssembly
Like for Android and iOS, CMake also needs a CMAKE_TOOLCHAIN_FILE when
configuring a WebAssembly project. We pass it "qt.toolchain.cmake",
which is part of Qt6, just like we do for iOS.

Fixes: QTCREATORBUG-25519
Change-Id: Ia02cafc163da6cd94c483e860922b08a35284c71
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-23 18:23:43 +00:00
Kai Köhne
9b3de8dd70 Register QT_LIBEXEC_PATH variables
Task-number: QTBUG-88791
Change-Id: I6f83836bab624f2281fd1a62970234713074f8a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 16:47:07 +00:00
Kai Köhne
f9cfc0bde9 Expose Qt's libExecPath setting
Task-number: QTBUG-88791
Change-Id: I3c84fc060fbf818a013bd42b6a2f4929d580156f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-23 16:46:50 +00:00
Kai Köhne
6c37cd53be Fix location of qmlscene, qmlplugindump tools for Qt 6
Do not try to locate qmlscene and qmlplugindump via parsing mkspecs
anymore. Instead, expect the binaries to be installed in
QT_INSTALL_BINS.

Change-Id: Ifc194ce3e40dbeca26cf3abd327cf5f633d6a6ba
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-23 16:46:43 +00:00
Cristian Adam
c9053256d3 CMakePM: Better error message when CMake file-api config is missing
Now the available configuration list is displayed, alongside with
the hint that CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES needs
to match / contain the "Build type" field.

In order to test this just clear (or set a random value) in the
"Build type" field and click "Re-configure with initial parameters"
button.

Fixes: QTCREATORBUG-25506
Change-Id: I44558c45c7050d03e72a3a0b9ce2c8d89bd6e4bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 15:27:08 +00:00
Eike Ziller
aa98c02443 Locator: Add descriptions to "locator filters" filter's tooltip
Change-Id: Ib29cef34465e60a66cae6fb75765f1530b8b224a
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 13:26:29 +00:00
Michael Winkelmann
9b99e93a96 QmlBuildSystem: MainFilePath member function
Change-Id: I388af6ffdbd310c9a433f6fbcb76e86db4c5053f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-23 13:26:08 +00:00
Eike Ziller
b71e673bf2 Improve description of "Link with Qt"
Make it clearer that this only affects that specific Qt Creator
installation.

Fixes: QTCREATORBUG-25500
Change-Id: Ia636e2f98b8042333ca12aaab0af58df42ba4727
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-23 11:08:47 +00:00
Cristian Adam
9d2fab7c17 CMakePM: Clear CMake configuration to remove backup files
Also remove the CMakeCache.txt.prev, .cmake/api/v1/reply, and
.cmake/api/v1/reply.prev which might cause problems in
case of CMake configuration failure.

Change-Id: I24f049e5e0338b78393b68ab3680276388ffc6bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 10:51:11 +00:00
hjk
5b13fb2168 QtQuickCompilerAspect: Use better connection guard object
The aspect may outlive its widgets.

Change-Id: I93d742e15277f64d1919739a2244736fb294e5b0
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 09:12:46 +00:00
hjk
f28b0fe6a1 QtSupport: Use createSubWidget for Qml related aspects
Change-Id: I8ceb64cdd96abe241fd81b411200871e7d061a97
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 08:55:40 +00:00
Kai Köhne
4f8474e532 Simplify handling of qmlplugindump
Much of it isn't needed anymore:
- we do not build a debug version of qmlplugindump anymore since Qt 5.0
- on mac, qmlplugindump is not an app bundle since Qt 5.1
- since commit 6871f31b4e, the env parameter was just passed through

So if we take out this and all the infrastructure around it,
qmlplugindump is just a tool that we can handle like all the other
tools.

Change-Id: Ifa583ce7052a9030858312ab7c2e20f7ebce4051
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2021-03-23 08:41:01 +00:00
Eike Ziller
072607962d Locator: Add longer description to filters
This is shown as tool tips in the location options, and if any platform
supports this also as tool tips on the menu actions of the locator input
field.

Change-Id: I8b439e45e6097a16a5f932d25d4e5d3e9bddb6ad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 08:29:30 +00:00
Cristian Adam
bc518cf353 CMakePM: Disable Add and Batch Edit buttons when the file-api parsing failed
For a project that failed to generate a valid CMake file-api reply
the manual added variables could be lost when the new state doesn't
result in a valid CMake file-api reply.

The user will have to edit the initial CMake parameters to generate
a valid CMake file-api reply.

Task-number: QTCREATORBUG-24637
Change-Id: I091a301ceee3cd41ec59b6282bb9515a49c1a366
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 08:29:19 +00:00
Cristian Adam
1a4c7abb22 CMakePM: Keep CMakePM error messages meaningful
If CMake project parsing is failing for some reason, it's better
to keep the error message with the actual error than just replacing
it with "The project was not parsed successfully."

This error message was also issued when the project was loading,
which is a bit misleading.

In order to test this:
1. Set the build type to "" (nothing)
2. Clear CMake Configuration from menu
3. Run CMake

This will re-configure the project with initial cmake parameters,
but "-DCMAKE_BUILD_TYPE:STRING=" will set the build type to empty,
and CMakePM would try to parse 'Release' and issue:
"No 'Release' CMake configuration found".

The commit resets the error message when the project is loaded.

Change-Id: I1a586ec19f324d75a25e8f282cab02a6934fce2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 08:25:37 +00:00
Mahmoud Badri
a52c2519e3 QmlDesigner: Fix import version when adding unimported module
Fixes: QDS-3994
Change-Id: If39df641cbfb563a169b3b2e8001f68941fd398c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-23 08:15:51 +00:00
Christian Stenger
eda5fbd645 QtSupport: Do not set visibility for items without parent
Avoids having the item popping up separately before adding it to
its respective parent.

Change-Id: I7e7d4765ebf8b1937f50670cbf04ab3bf6edbecd
Reviewed-by: hjk <hjk@qt.io>
2021-03-22 19:59:25 +00:00
Thomas Hartmann
7f05b7e918 StudioWelcome: Add new examples and tutorials to welcome page
Change-Id: I15c9323ada722b34197c544e785630d467177170
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 17:06:02 +00:00
Michael Winkelmann
0c7cb42e5f StatesEditorView: replace custom scope guard with qScopeGuard
Change-Id: I87379e50fb652ed27692f78470d9bf706d5abfe8
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 16:55:55 +00:00
Eike Ziller
e9bf841dc9 Fix lupdate issues
Some wrong tr calls / missing tr functions.
Some places where we need to bring lupdate to the right track with
regard to namespace resolution.

Change-Id: Idf552054a34e24d9671db68c816bf37f4d403dbc
Reviewed-by: hjk <hjk@qt.io>
2021-03-22 15:00:37 +00:00
Marcel Krems
efa9d258a2 Pass the correct positions to clang-format
clang-format expects the position in bytes and not in characters.
This offsets the position the more non-latin1 characters the code contains.

Fixes: QTCREATORBUG-21812
Fixes: QTCREATORBUG-23131
Change-Id: I499c44c5364c0623ffba7cd35e6d18659c61d742
Reviewed-by: hjk <hjk@qt.io>
2021-03-22 13:35:34 +00:00
Cristian Adam
49a2e14357 CMakePM: Add "Re-configure with Initial Parameters" button
This makes it easier to configure a CMake project with initial cmake parameters
when parameters are added or if the configuration fails.

Task-number: QTCREATORBUG-24637
Change-Id: I880ac6ad82f7cc5e1df2e34e9bcc28e67c3d716e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-22 12:04:35 +00:00