Commit Graph

67906 Commits

Author SHA1 Message Date
Marco Bubke 7785a3a651 Sqlite: Move result count to class declaration
It move the magic number of column results to the sql statement
and improves the mock a little bit.

Change-Id: I101067444cf27ec5dea0c72de7fd484a7e8710f0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 12:24:37 +00:00
Eike Ziller eb516063d3 Fix build with Qt 6
Change-Id: I546dd9457e68b9ff59b0fe50248553736d18729b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 10:48:11 +00:00
Leena Miettinen c79df73bde Doc: Add info on exporting nested Figma component instances
Fixes: QDS-4049
Change-Id: Ia5f370bab2d44fc90ded48ddc8b089bc9975d921
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-03-26 10:44:45 +00:00
Jarek Kobus d3faab0e72 StringTable: Use QElapsedTimer instead of QTime
Change-Id: I75065cbe32dcd4405360b90f3f51387f286d6186
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 10:31:28 +00:00
Eike Ziller daf23d29a1 Update perfparser to head of 4.15 branch
Fixes build with Qt 6.

Change-Id: I449f8ee0e507fbd9e4d1fe69aeaf38fa4da65cc4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-03-26 09:32:39 +00:00
David Schulz bd47caa348 LSP: Prevent soft asserts in LanguageClientArray::toList
Change-Id: Icb935137d389c223ac1360b4a7e0af5c303b793c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-26 08:43:54 +00:00
Leena Miettinen 9d0c3dc3d6 Doc: Describe new Language Client options
Fixes: QTCREATORBUG-25530
Change-Id: Ia59e476cdd6a1d655f269293c8e6ef97c5b084b5
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-26 07:53:07 +00:00
hjk 23f6aea6d3 Android: Prevent crash in AndroidManager::applicationAbis
... in connection with CMakeBuildConfiguration initialization.

Having an Android device type does not necessarily mean an Android Qt
version is selected in an incomplete kit.

Change-Id: Ib157166c45b7d2ac20eafd6437054b9232595c1e
(cherry picked from commit fdd69e27b3)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-26 07:52:40 +00:00
Vikas Pachdha 28de5ec4fd AssetExporter: Export type Label as text
Task-number: QDS-3979
Change-Id: I0920d242a480da9a27f26d39b44ab1d3714917e4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 07:31:46 +00:00
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
Eike Ziller 44d31cb687 cmake build: Disable PCH for CMake < 3.18 with GCC
https://gitlab.kitware.com/cmake/cmake/-/issues/20119 was fixed in
CMake 3.18.

Change-Id: Iad335e8c7a70069404f5c80bb3b65c0d52f82393
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-25 17:44:15 +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
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
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
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
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
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
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
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 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
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
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
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
Friedemann Kleint cc92c5001b Brush up the Python wizard code templates
Fix the spacing and introduce pathlib.

Change-Id: I240291d91cae7c233b2d3ec5c0dfaeede09ad47d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2021-03-23 11:58:56 +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
David Schulz 2177eeb7cd Debugger: Fix QJSValue dumper for qt6
Change-Id: Id0a6796d3a4efca71a7f7474b2143281dc3322f0
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 08:56:59 +00:00
David Schulz 4100b98d70 Debugger: Fix dumper tests for QVariant
Change-Id: I39953e14d3f1a15802b6acfc80a23005e304ee43
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 08:56:46 +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
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