Commit Graph

63601 Commits

Author SHA1 Message Date
Marco Bubke
a86fd58e40 Sqlite: Improve LastChangedRowId
Sometimes we want not only the row id from one table but two or three.

Change-Id: I6d5444a71ecbfe6c1af8073be80b04932ea9268d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-14 09:14:35 +00:00
Michael Brüning
b84025cd3a Fix build on macOS
Commit 0e7a1e6650 was missing an
include for QDebug.

Change-Id: I34421f634c40984750daeac31eed9191a9128f87
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-13 14:55:53 +00:00
Marco Bubke
a4b00a7742 Sqlite: Add update hook and use it to get the last changed id
Sqlite has a function to get the last inserted rowid but very often you
want to get the updated rowid too.

Change-Id: Ie276a5039682813ad16597433996a2959f54d9ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-12 13:05:57 +00:00
Marco Bubke
fded815021 Utils: Use always std::strlen
std::strlen is computed at compile time if possible by the compiler. So
we don't need this optimization.

Change-Id: I31112219df9a3b42fe9d57cdd981f869e6f02dae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-12 11:01:41 +00:00
Tim Jenssen
03a1282bdd Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59
Change-Id: Ic0edcce1268b9cc47c91364eeb84e3b3f7dfe134
2020-05-12 10:04:10 +02:00
Tim Jenssen
c9b5671754 Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Iee9542b518367018b6e672ff920bfdb411639f8b
qds/v1.5.0-rc1
2020-05-12 09:59:55 +02:00
Christian Kandeler
8e1169f4bf qbs build: Take differences between clang and "apple clang" into account
In particular, clang with version number 10 is not really clang 10 on
macOS.

Change-Id: I8be489fa9cffd63c1ea8f13d181686ab1a575ec6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-12 07:31:39 +00:00
Marco Bubke
0e7a1e6650 QmlDesigner: Preview size is now changeable
You can now change the preview size with
rootModelNode.setAuxiliaryData("previewSize@Internal", size);
If size is null it will use the bounding box size.

Change-Id: Icbe747ccc5a2e26e79783825d2ed94ecc640012b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 07:11:15 +00:00
Leena Miettinen
99b66f6238 Doc: Update info about managing item hierarchy in Design mode
Task-number: QDS-2056
Change-Id: I0786d01dcde48e056450ea70b498abcdd204e381
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-12 07:08:47 +00:00
Alessandro Portale
ed9918a41c McuSupport: Let user explicitly create or remove MCU target kits
So far, the user had to press "Apply" to generate a kit for the
currently selected target. The kit got silently added, there was no
immediate UI feedback that something happened.
Also, there was no possibility to remove a specific Qt for MCUs kit once
it was added, becoause it is under the "Auto-dected" kit category.

This change modifies the UI interaction so, that there is a specific
"Create Kit" button, and in case that the kit already exists, there is a
"Remove Kit" button.

Task-number: QTCREATORBUG-23929
Change-Id: I334ed75f86905ac762e0293bd3aa70b3433acf28
Reviewed-by: hjk <hjk@qt.io>
2020-05-11 14:45:47 +00:00
Leena Miettinen
d88d27e7cc Doc: Make Git ignore Qt Design Studio generated docs folder
The docs are still generated under doc/qtdesignstudio/doc/html.

Change-Id: I9916ccf8cdfa2541b632a680fb6b4f7103f6a1a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-11 12:14:58 +00:00
hjk
65935ce03c Debugger: Fix startup when Python's json module is missing
Task-number: QTCREATORBUG-24004
Change-Id: I1c0563868374263f13cec3a8f40138bce71338d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-05-11 10:35:32 +00:00
Christian Kandeler
050dec20dd qbs build: Fix excessive clang 10 warnings for qbs submodule
Change-Id: Ie1bb9833e00412d753b32c8267a9e9413aa66a7d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-11 09:33:01 +00:00
Leena Miettinen
c370d345f1 Doc: Remove obsolete \contentspage command
This prints a QDoc warning when building with QDoc 5.15.

Change-Id: Id6f4646738f3e09956a243dc0da639f5567470f3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-05-11 08:43:31 +00:00
Leena Miettinen
d86c2a1ba9 Doc: Remove obsolete info about selecting items with content
The button has been removed.

Task-number: QDS-2056
Change-Id: I7495107e68920f02effef0618461f5ed6c88bfa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-11 06:36:24 +00:00
Leena Miettinen
c1781320f3 Doc: Describe using Alt and Shift modifiers in Form Editor
...when resizing items

Fixes: QDS-2034
Change-Id: I4b4589a19c3c0ca96d6f8a80c7e4a3cc03731690
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-11 06:35:59 +00:00
Leena Miettinen
993a628859 Doc: Describe setting initial root item size in Qt Quick Designer options
Task-number: QDS-2056
Change-Id: I82fc86b748d72b180e2e503a7d80754d61682abd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-11 06:35:01 +00:00
Thomas Hartmann
6ab2f93f18 QmlDesigner: Adjust list of effects
Change-Id: I7d69ce83e86cf39b58601487f5d634b9aece211d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 19:13:33 +00:00
Thomas Hartmann
a41bb573e8 QmlDesigner: Add action for selecting effect
Change-Id: I7b89eb688fb7b9a9cd1ad21afcdf67c1662fd110
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 19:13:14 +00:00
Sergey Belyashov
361ddf6ad5 Update Russian translation
Change-Id: I2753eb8bcbd25f6388088bdeabca1553f6e24410
Reviewed-by: Viacheslav Tertychnyi <tvk537@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2020-05-07 17:04:55 +00:00
Cristian Adam
646d26b9cb CMake Build: Set BUID_WITH_PCH to OFF if CMake version less 3.16
Change-Id: I11a58cf2e67272b9d45a877dfa20c089706cfc2a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-05-07 16:29:13 +00:00
Christian Kandeler
27ea67728f qbs build: Suppress more warnings
Amends d08e5c33ff.

Change-Id: Ic842dda51b21427e1989190b44508d54aa1e7120
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-05-07 15:25:31 +00:00
Marco Bubke
2e409f792c Sqlite: Remove unneeded file
FTS5 is proving it. So for full text search we should use FTS5.

Change-Id: Iac5abdfa9bc6fd9f9c2515c1f15ef04cf445baf4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-07 12:15:14 +00:00
Marco Bubke
f02934458e Sqlite: Add foreign key support
It is still only support references in columns but so far it is enough.

Change-Id: Iebb4866cf738d651270e54357b5e4a2837f05417
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-07 12:14:58 +00:00
Thomas Hartmann
149453941a QmlDesigner: Fix bounding rectangle in FlowEditor
Change-Id: I30c3a5d88bbbe2fce968a23c9f9acb17771366a9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 10:26:01 +00:00
Alessandro Portale
5c71772fd0 Themes: Undo theme duplication. Just change the ThemeName
Until, we have a mechanism to define a default/fallback in a read-
only setting, it is better to stick to old file names rather than to
create redundant entries.

Change-Id: Ifbc78160e9c57025c66a266efab2b43646ee477a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 09:36:57 +00:00
Sebastian Verling
38e13e4216 add lower case a-f as address match
As the addresses were only matched against upper case letters
all registers with lower case characters were not correctly parsed
and had zero values

Change-Id: Idc3da0a33b9f075d7a209cad74768e81cced2d67
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2020-05-07 09:34:48 +00:00
Eike Ziller
99c4e7c94f Add first changes file for 4.12.1
Change-Id: Ibd3ca94c588fd322d59dcf3d9ac13bbdb9ffc34c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-05-07 08:02:44 +00:00
Christian Kandeler
83f213bb6a ClangClParser: Do not require two spaces before "error:" string
Presumably, this has changed in newer llvm.

Fixes: QTCREATORBUG-23992
Change-Id: I82aaae893e3cf159be7c43fb4d7762875d2be8a8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-05-07 07:50:36 +00:00
Unseon Ryu
a2cedf76f2 fix scroll height of property editor
Fixes: QDS-2013
Change-Id: I43c3e6507f7f2052a86b0ccc485bd520c4dbabac
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 07:48:18 +00:00
Christian Stenger
1cb8f525ea Marketplace: Disable videos from marketplace
They are no real products.

Change-Id: I534a1be922a9f0aa8e603ebbcb1bc01357c16bdd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-07 05:04:22 +00:00
Thomas Hartmann
369b020b4b QmlDesigner: Add allStatesForId
Change-Id: Ie04c58f50f2c9f5941afac2a3fba714ea9e61eb0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 20:17:20 +00:00
Thomas Hartmann
33c88a0ced QmlDesigner: Expose component url
Change-Id: I2b1708e6f87b00ad0b56c04f591ba24720a886ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 20:17:01 +00:00
Tim Jenssen
d5b83fc637 Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59
Change-Id: Ic3ae0fd8c779c0bac8a0f01e87043251b3ce7fd4
2020-05-06 19:51:29 +02:00
Tim Jenssen
f5a85171dd Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: I831e9d65be0009d0fd98c19aa38fa6fb69eed421
2020-05-06 19:49:12 +02:00
Alessandro Portale
a5074ac987 McuSupport: Add FreeRTOS variations to hardcoded list of targets
Task-number: QTCREATORBUG-23938
Change-Id: I73ca401bd323bd001fa5e05c33783307c94f10be
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-05-06 16:36:53 +00:00
Alessandro Portale
eccf1269ac McuSupport: Add support for creating FreeRTOS kits
Besides Baremetal, Qt for MCUs also supports FreeRTOS for a few targets.
This change:

- shows the FreeRTOS source path chooser
- set the FreeRTOS source path as kit environment variable
- sets OS=FreeRTOS in the kit CMake configuration and kit meta data

Task-number: QTCREATORBUG-23938
Change-Id: I69cbd4f9b6b4a842788a8dad57905ef517b8b1d5
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-05-06 16:36:24 +00:00
Leena Miettinen
9179743464 Doc: Fix terms used for Design mode views
The "canvas"/"scene"/"stage"/"working area" is called "Form Editor view".
Library, Navigator, Projects, Properties, States, Text Editor,
and Timeline are also their own views that can be organized as
workspaces and open from the Windows menu.

There are "tabs" only within views, and "panes" refers to
output panes.

Change-Id: I55898eef99b87245e4ab9b0163943725a90615a3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:27:14 +00:00
Leena Miettinen
937d3d3a70 Doc: Add Qt Design Studio example documentation
From Qt Design Studio 1.4. Add .qdoc and .qmlproject files,
quoted .qml files, and .png files.

Edit the files as necessary to reflect changes in version 1.5
and to reduce image file size.

Task-number: QDS-1519
Change-Id: I3bbdec0d3b4acf904c0008d1566dad13707e9851
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:26:11 +00:00
Brook Cronin
559df59907 Theme: add new dark and light design themes
Change-Id: Ibc65528694d5b8e55e17a80ecd82497c4ab98499
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 16:15:43 +00:00
Thomas Hartmann
3c0cd3baca Update designer theme to new color roles
Change-Id: I39ece78e3961d6c2705abcdefcffc4b9cdd8e704
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-06 15:59:18 +00:00
Henning Gruendl
f2ca950d18 QmlDesigner: Add bezier curves to transition item
* Add support for bezier curves on transition item
* Rework connection drawing

Task-number: QDS-2055
Change-Id: Ifbe30df4965eee0f39681a2285cc664aaffda667
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 15:34:34 +00:00
Aleksei German
0d18aa0b2d QmlDesigner Global Annotation Status
- Added Global Annotation Status for files
 - Added Status into ModelNode
 - Slight rework for annotation dialog .ui classes
 - Workaround for QmlJsLexer changes with Comment::deescapedText

Task: QDS-2027, QDS-2057
Change-Id: I609076110589fbeca1d8c45d049da9d433085a35
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-06 15:27:28 +00:00
David Schulz
04da8f4178 Debugger: prevent calling functions on windows targets
This will result in a crashing gdb.

Fixes: QTCREATORBUG-23982
Change-Id: I59b65c5854bb4b7cbd59522a555388d1e833a560
Reviewed-by: hjk <hjk@qt.io>
2020-05-06 12:55:49 +00:00
Eike Ziller
fe1d758943 CppTools: Fix crash when loading pre 4.11 settings
If pre 4.11 settings are present, this might lead to updated settings
being written at startup.
The code that writes settings indirectly uses the CppToolsPluginPrivate
instance via the "d" member of CppToolsPlugin. So this code path crashes
if triggered in the constructor of CppToolsPluginPrivate, since at that
point "d" cannot be assigned yet. Separate construction and
initialization to avoid this.

Fixes: QTCREATORBUG-23916
Change-Id: I0cb8a08bd9aa051679b71b06f569c44d2faab5a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-05-06 12:44:10 +00:00
Eike Ziller
d4164da52e CMake build: Fix copying of Clang headers to build
- "copy_directory dir target_dir" copies the contents of "dir" into "target_dir"
  so we need to specify "include" at the end of the target directory
- copy_directory creates directories as needed

Fixes code model and analyzer errors when running without previous deployment

Fixes: QTCREATORBUG-23910
Change-Id: Id63dd790f89f720593cd0508241f79dfaddac794
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-06 07:19:38 +00:00
Alessandro Portale
02efd43199 McuSupport: If kits are missing, provide an InfoBar that opens settings
When installing Qt for MCUs via the SDK installer, the user (in many
cases first-time evaluator) has to create the kits for Qt for MCUs. For
those who see Qt Creator for the first time, it is difficult to find out
where to search for the UI that generates those kits.

Let's help the user with an InfoBar entry that in case of ...

 * McuSupport plugin being enabled (by SDK installer)
 * Settings key [McuSupport]/Package_QtForMCUsSdk set (by SDK installer)
 * Absence of valid Qt for MCUs Kits

... helps to directly open the right page and tab of the Options dialog.

Task-number: QTCREATORBUG-23943
Change-Id: I7d4834633b1b94ef663d62cd395ee071bd123f1f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-06 06:43:24 +00:00
Tim Jenssen
f33dddaaec Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59
Change-Id: Id492d324031d4d5fb919eca80ffae4baa50f247f
2020-05-05 21:01:17 +02:00
Tim Jenssen
c5157368bd Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
2020-05-05 21:00:19 +02:00
Tim Jenssen
028d66f25a remove variant.hpp error
So this can be used with a Qt 5.15 build
outside of QtCreator.

Change-Id: I691687bf661be21d9c28f13a52ff5df58bb7412a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-05 18:57:49 +00:00