Commit Graph

67787 Commits

Author SHA1 Message Date
Assam Boudjelthia
5bb462e070 Android: fix app logcat not always displayed
Fixes: QTCREATORBUG-23919
Fixes: QTCREATORBUG-23177
Task-number: QTCREATORBUG-23291
Change-Id: Ib053a15f2fd8e491a581268f3630725593186a47
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-07-10 13:05:30 +00:00
Henning Gruendl
2fa261c132 QmlDesigner: Move zoom buttons to FormEditorWidget
* Move the zoom all and zoom selection button to the FormEditorWidget
  taskbar
* Add zoom in and zoom out actions/buttons
* Fix ZoomAction in and out direction
* Add update icon font

Change-Id: I9addba5652cafa5884450bc633a1e16087aae8dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 13:00:18 +00:00
Christian Kandeler
4aba3da7bd CompilationDatabase: Fix unit test
Amends be97943372.

Change-Id: Ic840f5eca8a83b5bdf3e3864e8859234472911b7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-10 12:57:45 +00:00
Eike Ziller
d400dce35d Require GCC 7 and enable C++17
Fix MSVC2019
- result type of conditional expression is ambiguous:
  types 'const char [1]' and 'QByteArray' can be converted
  to multiple common types

Fix MinGW 8.1
- undefined reference to SemanticHighlightNotification::methodName

Fix Utils::transform with std::vector for GCC & MSVC

Unfortunately we cannot get rid of the special variant and optional
implementations, because Apple Clang requires deployment target >= 10.14
for the functions that can throw std::bad_optional_access.

Fixes: QTCREATORBUG-20520
Change-Id: I5c36a70f21f8b0215d2f4fc5c0653a022778d928
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-10 11:52:24 +00:00
Mahmoud Badri
f3bc2d609f Add/remove the simulink component when the import is added/removed
Task-number: QDS-2122
Change-Id: Ib4e2ff14ed9cfef1534f9c3edb0a8279fbabfd6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 11:48:44 +00:00
Henning Gruendl
c898152621 QmlDesigner: Add change type name dialog
* Add a change type name dialog showing all incompatible properties
* Fix ExpressionTextField triggering twice on pressing enter
* Fix compare operator

Task-number: QDS-1946
Change-Id: Ic384f6dcce44297b43839c17874108b39af909da
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 10:10:02 +00:00
Henning Gruendl
58ea14aea7 QmlDesigner: Controls 1 cleanup
* Replace ScrollView Controls 1 with ScrollView Controls 2
* Replace TabView with TabBar and StackLayout
* Remove unused styles
* Replace Controls 1 imports
* Remove print statement in FontSection
* Fix layout width by correcting CheckBox width
* Remove TabView from QtObjectPane

Task-number: QDS-2454
Task-number: QDS-2455
Task-number: QDS-2456
Change-Id: I913d326afb012375dd5b804171cb8cd67681514c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 10:09:48 +00:00
Richard Weickelt
245c9c760f Update qbs submodule
To HEAD of 1.17 branch.

Change-Id: I9cb01480d72d3d6132c80449ac2da5e18dc6c7f4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-10 08:40:15 +00:00
Christian Kandeler
e210bcf3eb CppEditor: Offer to create getters and setters for all class members
Fixes: QTCREATORBUG-14504
Change-Id: I12c687492b12c6997064eb7f137b6ccb189d2009
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-10 08:07:16 +00:00
Tim Jenssen
42d0c2b9f4 add litehtml to dev package
Change-Id: If33500eda8d095d1d9d63afe4ad8331109a22871
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-10 07:15:02 +00:00
Eike Ziller
255609d787 Update 4.13 change log
Change-Id: I2d87a104bc0a4a90a8da644686545bc093689e0d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.13.0-beta1
2020-07-10 07:03:32 +00:00
The Qt Project
9822e83392 Merge "Merge remote-tracking branch 'origin/4.13'" 2020-07-10 06:21:07 +00:00
David Schulz
d097330b40 LSP: remove qt version check for markdown
Change-Id: I54da2acf5e3542355064b916582f3507b6bc5356
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-10 06:13:36 +00:00
Eike Ziller
10fd921e26 Merge remote-tracking branch 'origin/4.13'
Change-Id: I4240608a7a0529bb2f6612ba84abae46166458f5
2020-07-10 08:02:27 +02:00
Christian Stenger
502ad9badb AutoTest: Correct completing test run configuration
Ensure all possible project parts are taken into account
when gathering build system targets.
When having multiple possible build system targets for a
test - which may easily happen e.g. when defining tests
beside the main application inside a big top-level
CMakeLists.txt - let the user decide which one to run.

Fixes: QTCREATORBUG-24268
Change-Id: Ia7b7e4148fe8e8dab55832c435f12cc78f5c2f7a
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-10 05:06:58 +00:00
Christian Stenger
cd1a848e16 AutoTest: Fix wrong caching of text layout
The text layout must get recalculated also when the width
of the underlying model index has changed.

Fixes: QTCREATORBUG-24236
Change-Id: I4ded56832c765320b6845cf35ad61453875dad50
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-10 05:06:47 +00:00
Thomas Hartmann
3db5f4a2af QmlDesigner: Output slot names in debug view
Change-Id: Iad37f28e85818228ca264f53c7757a1ff6a0e183
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-09 18:21:14 +00:00
Christian Kandeler
782ca5d8d8 Clang: Fix error when including float.h with mingw
Prevent mingw from trying to #include_next a private header from a path
we cannot add to our list of includes.

Fixes: QTCREATORBUG-24251
Task-number: QTCREATORBUG-24027
Change-Id: I18a9db130b9c2265cd208c3506d08d2e1c4cee45
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-07-09 17:24:16 +00:00
Thomas Hartmann
d964e91432 QmlDesigner: Remove curly braces from states code
This is not required and looks ugly.

Change-Id: Id0e5adabaff2cd16fb8e457e93a2ee71fb323416
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-09 14:04:13 +00:00
Christian Stenger
1929c38a9f Clang: Fix handling of paths inside common pri file
contains() expects a regular expression as value, so using
a bare windows path may be a bad idea.
Beside this fix the LLVM_INCLUDEPATH which is reported wrong
already by llvm-config.

Change-Id: I95aa3e461541099aac6607c4a8db8a38f9b2b0f6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-07-09 12:47:40 +00:00
Alessandro Portale
72484ae691 ClangTools: Fix icons in the DiagnosticsView context menu
"Online" instead oof "info"
Foreground-colored variant of the filter icon.

Change-Id: I88cd824632de4152b4b9153403bd0512417d46dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-09 10:01:59 +00:00
hjk
b9f47c5f02 Some Qt6 porting
- QVector cannot be forward-declared anymore as it is a typedef in Qt 6.
- 64 bit sizes cause warnings in printf("%d")

Task-number: QTCREATORBUG-24098
Change-Id: I75fc2a1113fb7a6e8c298e985eb7eb8d1a4c21b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-09 09:59:54 +00:00
Christian Kandeler
31f427a3a6 qbs build: Fix linking ClangFormat on Windows
Apparently, the MSVC linker gets confused if an input library
("clangFormat.lib") has the (almost) same file name as an output library
("ClangFormat.lib"), even though the latter is specified with an
absolute path.

Change-Id: Ia76e60fd10e16ce8daff880f4005d40d7f20d08c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-09 09:31:30 +00:00
Robert Loehning
ddd9158b03 German translation: Avoid ambiguous shortcut overload
D clashes with "Datei".
E clashes with "Erstellen".
B clashes with "Bearbeiten".
U clashes with "Auswahl in Kleinschreibung wandeln".
G clashes with git shortcuts

Change-Id: I2d13eb45f73847526b896420510bdba196949787
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2020-07-09 09:05:14 +00:00
Eike Ziller
5a64a0c5be Require Qt 5.14 or later
This is required for proceeding with support for building
Qt Creator with Qt 6.

Change-Id: Ibf8a3eef6d6da943c5ee7f4a2239f45ee49b1093
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-09 08:34:46 +00:00
hjk
2ddc752762 Use QStyleOption::initFrom() instead of init()
Avalaible since Qt 4.1.

Task-number: QTCREATORBUG-24098
Change-Id: I0dda1d78fc75070b6cbbef76d66bc54ccfca8f09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-09 08:02:35 +00:00
Christian Kandeler
4c02f807c1 MSVC: Use proper codec for vswhere output parsing
Fixes: QTCREATORBUG-24311
Change-Id: Ifeefd51ddc9f3eb738ee2649328209ed3494f9a5
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-07-09 07:52:24 +00:00
Thomas Hartmann
9410c7a575 QmlDesigner: Adjust priority of template merger
Task-number: QDS-2488
Change-Id: Iac6fc179e2c28fe59c9db7e09f4989c548b3249c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-08 16:54:32 +00:00
Christian Kandeler
53b4d6975d C++: Fix highlighting Q_PROPERTY with template types
We override the Q_PROPERTY macro in our own header. This appears to have
two effects:
  1) The macro arguments are properly highlighted.
  2) There is no completion from libclang for Q_PROPERTY, meaning our
     own helpful snippet is the only completion candidate.
I don't understand the reason for either of these; they seem to be more
or less random effects of parsing peculiarities.

As it turns out, our macro redefinition breaks if the type of the
property is based on a template class, leading to false errors in the
code model. Removing our macro redefinition fixes the code model, but
also removes the aforementioned effects. Turning the macro into a
variadic macro fixes the code model and keeps effect 1), but not effect
2). Therefore, we also update the snippet to provide an extra string
that makes it clear this it's a helpful snippt, rather than just a
normal completion.

Fixes: QTCREATORBUG-24243
Change-Id: I4044d5e633af3ebdba36032d5efd3333b5a36214
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-08 14:41:11 +00:00
Assam Boudjelthia
59aa4f8033 Android: check forward port exist before removing it
Task-number: QTCREATORBUG-24155
Change-Id: I3675a63d5aa85b8d11be9021d1a79fac1390b26e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-08 09:32:18 +00:00
Marco Bubke
b73ce9eccf QmlDesigner: Add row move up and move down buttons
Task-number: QDS-2294
Change-Id: Ia1e64d0811f55151dfe529db4868821840a8fba9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-08 09:17:41 +00:00
Marco Bubke
7504c966bf QmlDesigner: Move code from list editor dialog to model
And add tests to the code.

Change-Id: I9fb183729c716a50bbab861d207a212ff704ee7b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-08 09:17:26 +00:00
Marco Bubke
9bfb608986 QmlDesigner: Add adjustable frame color
Task-number: QDS-2238
Change-Id: I6f43a7c87ae4c8daaf41c08ad2960502770fba58
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-08 09:17:08 +00:00
Christian Stenger
39bd05c159 Android: Fix compile
Amends 3f655815be.

Change-Id: I19cd488322f50b0319ca18c094598f0bce4fcb45
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-07-08 09:11:53 +00:00
Eike Ziller
5fa442434a Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Icb405079fd601619b506e5c56b6ef465bc0424bc
2020-07-08 11:01:43 +02:00
Miikka Heikkinen
b508a98e6a QmlDesigner: Fix spinbox empty value handling
Force zero value when text value converts to NaN.

Also, onEditingFinished doesn't trigger if value is something not
accepted by the validator (the empty value), so do the equivalent
also on focus loss, if value is still dirty (meaning onEditingFinished
didn't happen). This ensures we're never left with different value
shown and written in qml file.

Change-Id: I3862d8d11adf7955f99b50b515e015ad132a5c78
Fixes: QDS-1539
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-08 08:41:36 +00:00
Assam Boudjelthia
3f655815be Android: keep manual Qt version names in the autodected kit name
With in 19154bf0e7, When having
an offial Qt for Android and a manual Qt for Android with the name
version, the kit will have the same name, avoid that
by keeping the exact name of the manual versions.

Change-Id: I280a286f99cbc17185a5309c8825381e03ea7ff6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-08 08:28:14 +00:00
Assam Boudjelthia
41c697a67b Android: silence adb irrelevant SynchronousProcess error outputs
Task-number: QTCREATORBUG-24155
Change-Id: Ibebc48d471ef7aeec37c99eda5c27d5419c913f3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-08 07:08:13 +00:00
Assam Boudjelthia
697a7ad6db Android: fix qml debugger not starting on Qt 5.14+
Task-number: QTCREATORBUG-24155
Change-Id: Iddc5f7cb31a3512762d1e72b42108e5ed61bd9af
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-08 07:07:31 +00:00
David Schulz
9182d4eda7 Editor: Do not use the editor palette to store editor scheme colors
Otherwise all editor ancestors like scrollbars might get an incorrect
palette.

Fixes: QTCREATORBUG-24270
Change-Id: I133cd1dbe284282122972130666c280ea412ea1a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-08 04:17:04 +00:00
Thomas Hartmann
29214a212c QmlDesigner: Add slot/function support to NodeMetainfo
Change-Id: Ie8e153d552a003ca189b65fe8691cb84091c8159
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-07 15:56:10 +00:00
Ulf Hermann
f4732b4a70 Use perfparser 4.13, not 4.12
Change-Id: I29848bbd1e78133216cc0bccbce3e8f142887cba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-07 14:25:48 +00:00
Christian Kandeler
5b3aece387 CppEditor: Make "Add curly braces" quickfix more robust
Anchor the opening brace at the closing parenthesis, rather than at the
statement. This way, we won't get troubled by macro weirdness in the
statement part.

Fixes: QTCREATORBUG-13921
Change-Id: I05af24d1642e6b62c78bb2f47a1ef0b1fea326d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-07 14:13:37 +00:00
Henning Gruendl
044faadc2d QmlDesigner: Fix crash with ADS
When pressing Ctrl + Shift + F in design mode the OutputPanePlaceHolder
is requesting its splitter, which isn't set with ADS. To avoid nullptr
access a check for the splitter before accessing.

Change-Id: I3085bba23d4cf9bddcfec154e4557000d880600d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-07 14:07:30 +00:00
Christian Kandeler
284ff753f3 GccParser: Catch file paths in "inlined from" lines
Change-Id: Ia16e5e4e3d3ce453e54df8eac48248164059bdc9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-07 10:21:43 +00:00
Christian Kandeler
ef87abdfbf ClangTools: Fix clazy output parsing
We must not paste stdout and stderr together, because if there is stderr
output (as in some versions of clazy), then the trailing messages will
make the JSON parsing fail.

Change-Id: Ia31efdf3376eeb2e232b32bb0cdb543345e2dbfc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-07 10:09:52 +00:00
David Schulz
dfd7bdd22a Autotest: Introduce ItemDataCache
Change-Id: Icbd703a8ddd3c5dea4a90d2c32c1866764bc0267
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-07 08:42:08 +00:00
Christian Kandeler
286d1832e6 clangpchmanagerbackend: Fix compiler warnings
"warning: catching polymorphic type ‘const class
Sqlite::StatementIsBusy’ by value [-Wcatch-value=]"

 ---[ Fields ]-----------------[ uncomment and edit as applicable ]---|

Change-Id: I84c1d3e21b36f291bc9adc075666fdf55d5ca6cc
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-07 08:06:54 +00:00
Christian Kandeler
63c6efc29f ParseIssuesDialog: Flush the parser
Amends 1c6e4fbd32.

Change-Id: I53bc79a6e909daf83a42ff32cc7e6f0577f3ccc1
Reviewed-by: hjk <hjk@qt.io>
2020-07-07 08:06:17 +00:00
Thomas Hartmann
282c392d4e QmlDesigner: Fix for broken prototypes in templates
This is just a band-aid fix.
plugins.qmltypes can contain "duplicated" cpp type declarations, some
without export, similar to a forward declaration. This is the case for
QQuickItem in templates for example.
The prototype for QQuickItem in this case is not assoicated with
QtQuick.Item, which we expect.

Task-number: QTCREATORBUG-24283
Change-Id: I3377760e29f1af5c8e948aaa1ae7883448116872
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-07 07:14:54 +00:00