Commit Graph

68568 Commits

Author SHA1 Message Date
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
Eike Ziller
92de8402c4 build.py: Do not enforce building without PCH
We have a guard for the CMake version in QtCreatorAPIInternal since a
while.

Change-Id: Ie76010b39e33d57c77b993db375a7821687145ea
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-25 15:44:00 +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
hjk
bfe398072d Utils: Allow nested groups for settings keys
Will be helpful for the Autotest settings

Change-Id: I83a1cc27021124a14d8e8023164f20ede6c4d80e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 13:40:32 +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
Cristian Adam
b9b4cd9262 Utils: Compile fix for MinGW
Amends 611615f10b

Change-Id: I27e474d98114dcb68b55082b7622eec38b5a0e2d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-25 11:55:53 +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
Eike Ziller
2b521506f3 Bump version to 4.15.0-rc1
Change-Id: I522a8c88d636bcc09de2be0b2aa4f47a1c080ac9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-25 11:15:10 +00:00
The Qt Project
19558c82c8 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-03-25 10:48:57 +00:00
hjk
641bccacf1 Utils: Actually delete subwidgets on finish()
In the context of option pages, finish() means that the dialog is
dismissed somehow. Keeping the widgets around for subsequent re-use
is ok in principle, on the other hand it's a matter of hygiene and
give a defined clean slate next time addToLayout() is used.

This has not much practical impact yet as most option pages do not
forward finish() to their aspects right now.

Change-Id: Ifd591e3fa0d07c7943e86eb5474429efae2887f9
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 10:42:16 +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
hjk
b7b41f7cc3 Utils: Fix SelectionAspect with radio button display
Register subwidgets to make non-autoapply work.
Also delete the parent-less button group on destruction.

Change-Id: If6fb306a812c8aa950535dd138a2020145d80c34
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 10:36:11 +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
hjk
bc97b10488 Utils: Only set SelectionAspect value automatically if requested
This is in line with what the other aspects do. Without this,
non-auto-apply aspects behave as auto-apply, even if marked with
setAutoApply(false).

Change-Id: I39192f63bb3b6e47ee181527938c19ee5044a5ec
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-25 09:04:13 +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
David Schulz
c3ab90e30f Utils: directly use default value if settingsKey is not defined
This saves one value > variant > value transformation.

Change-Id: I16e5c464017fdcc0b9a07b895bbe90423022ac83
Reviewed-by: hjk <hjk@qt.io>
2021-03-25 08:15:29 +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
Johanna Vanhatapio
52fad1870e Doc: Update info on the Library view
- Fix the paths to sections in Library
- Update pictures where needed
- Use "component" instead of "item", "object", or "QML type"
- Add links to the new topics for Design views
- Other minor improvements

Fixes: QDS-3879
Change-Id: I464fbe2db2f5045bdc04a70ea5feb5050ec22c18
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-24 17:02:04 +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
Eike Ziller
f8341d587f More changelog for 4.15
Change-Id: I55d1a3301946a0a5ff83bc05019eb06e1f632b5d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-24 15:10:31 +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
Marco Bubke
611615f10b Utils: Rebase SmallStringView on std::string_view
There are still some methods missing but with C++20 we can maybe remove
SmallStringView.

Change-Id: I65a1eacda0a07cec824f1837e385faa01fc825e9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-24 14:12:12 +00:00
David Schulz
321652be19 Utils: prevent crashes in SelectionAspects
Change-Id: I21315f1cbbc43948f00f00dbef777fa82c9606f5
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 14:04:18 +00:00
hjk
77dc087250 Utils: Allow aspects to modify values for loading and saving
In some cases it is useful when the persistent value is not the
internally used actual value, e.g.  Having the displayed string
of a SelectionAspect instead of a numerical index makes
the settings more readable for a human.

Change-Id: I11ecb8e75ab041ace2358cc45972ce9ee965b24d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-24 13:28:55 +00:00
David Schulz
8a82c8f4ee Highlighter: adjust Qt6 compile fixes to upstream changes
Change-Id: I0d7962a4a52cbdf5645f30f86bca5457a4c061f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-24 12:55:55 +00:00
David Schulz
eeedf4cd8c Utils: simplify loading/saving grouped settings
Change-Id: I8e06fb301eab193137f3e77d841698b9f4881deb
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 12:24:27 +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
35b190834c Debugger: fix stringdata offset in metadata
Change-Id: I94899346c8193218133f80aa2716a6e5d44093e2
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 09:55:52 +00:00
David Schulz
e05fe66f4b Debugger: Fix qobject name dumping for Qt 6
Change-Id: I146aa3d0b9d0f66a56a5fb1595f64297e15ebab8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-03-24 08:29:30 +00:00
Leena Miettinen
3c96c07b64 Doc: Update manual front page illustrations
Task-number: QDS-3985
Change-Id: I5be1ab2efd76b7d526fbbdf64c5a7343cd4552fd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-03-24 07:33:44 +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>
v4.15.0-beta2
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