Commit Graph

2382 Commits

Author SHA1 Message Date
Eike Ziller
2a05186194 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	CMakeLists.txt

Change-Id: I799060da2cb299bb0c49a3da3530fad18427a23c
2020-08-21 10:08:55 +02:00
Christian Stenger
e9c27cca34 Utils: Fix persisting of QRect
And pass explicitly a QVariant to the writer to avoid
unexpected behavior when trying to store the geometry
of a widget.
This resulted in a warning for any session where the
user had used the debugger at least once.

Change-Id: I5cb2352ab29ff7d2a64c84ffcdf040efe6d04b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-08-19 07:39:43 +00:00
Eike Ziller
0c4135e380 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/android/androiddeployqtstep.cpp

Change-Id: Id624bad384050d567efba0700046331086cb12dd
2020-08-13 13:28:33 +02:00
Eike Ziller
f296ed1328 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
2020-08-13 11:41:32 +02:00
Tim Jenssen
4fe5b923cd Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
2020-08-13 06:39:40 +00:00
Christian Kandeler
0615d0ec06 CPlusPlus: Fix expectations in preprocessor autotest
... regarding unfinished macro calls.
Amends df0ffd8bb8.

Change-Id: Ia7b8752860ac9207e702697cbee87f16a39dd1dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-12 08:21:32 +00:00
Christian Kandeler
868236886a Utils::Environment: Extend autotest
... to cover the diff/apply mechanism.

Change-Id: I7d9e794792d6730e935c99c66062ea417dc65fe7
Reviewed-by: hjk <hjk@qt.io>
2020-08-11 12:13:23 +00:00
Eike Ziller
3944162039 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
2020-08-10 15:56:54 +02:00
Marco Bubke
e43c7fdb1d QmlDesigner: Split messaging and process for puppets
This will make it easier to implement custom puppets. The new connection
manager will restucture the code and it add a mechanism to capture data
too.

Task-number: QDS-2529
Change-Id: I5d15c3303ef1c9a3e25ba197d350e0d561ce813a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-10 12:53:30 +00:00
Christian Stenger
84e4b3af31 Tests: Do not fail if boost compile fails
Change-Id: Iaa74f0c5911f328ca041a8f8e84c760187f6c38f
Reviewed-by: hjk <hjk@qt.io>
2020-08-10 10:55:16 +00:00
Christian Stenger
326cf1a982 Tests: Fix compile
Amends 52b2ca55c9.

Change-Id: I82b2ae8a353fc6ebe46e38956100fd3dce53fdf6
Reviewed-by: hjk <hjk@qt.io>
2020-08-10 08:48:24 +00:00
hjk
52b2ca55c9 Replace QT_USE_FAST_{OPERATOR_PLUS,CONCATENTION} by QT_USE_QSTRINGBUILDER
QT_USE_FAST_CONCATENATION doesn't do anything nowadays.

Using QT_USE_QSTRINGBUILDER is the same as QT_USE_FAST_OPERATOR_PLUS
for QStrings and enables more QStringBuilder use for QByteArrays.

Change-Id: Ibd297817c50d86661d47822799f989447249af1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-07 12:45:03 +00:00
Fawzi Mohamed
2ad89747c4 qmljs: qtdeclarative change 9ab1a6759018b78b0f160c5286f8b0235a34ec50
Support required list properties

The corresponding rules were missing so far.

Fixes: QTBUG-85716
Change-Id: Iaf0cbfbb8736929a213bd6bf329bb2ebdde652c4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-08-03 06:59:36 +00:00
Christian Kandeler
3f9427200b CppTools: Fix formatting for lambdas with trailing return type
After the arrow, the state is still the same, as now a type is expected.
Only after the opening brace does the actual function start.

Fixes: QTCREATORBUG-18497
Change-Id: I7bf18fbd6907d36f8869af3a78ad617cf0ee9dbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-31 08:15:18 +00:00
Christian Stenger
2944b33530 Tests: Fix codemodel check test
Change-Id: I9ca0fec928ac90fd5951fc54963ba5e96d5a53a6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-07-30 13:43:12 +00:00
Christian Stenger
a826267cd4 Tests: Fix nullptr access
Change-Id: I4e2bf36dfa6e16dfd9924c865bd9a997750243a2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-30 13:24:48 +00:00
Christian Stenger
394b3212bb Tests: Fix condition
Amends eb52982c9d.

Change-Id: I47b145b678eafab90f3569e4f6a785f272a87666
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-30 09:13:47 +00:00
Christian Kandeler
3d718d3dae qbs build: Fix valgrind test failure
Change-Id: I563d9b61e0e281058dac46ed913b3102f70c4d90
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-27 14:25:07 +00:00
Christian Kandeler
e34ff64196 qbs build: Add convenience properties for sanitizers
Change-Id: I8c0908ed482127712c1cf4052d7b792be5ba79ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-27 13:56:34 +00:00
Christian Kandeler
b484d770cd QML code model test: Show unexpected messages
The failure output is not very helpful without them.

Change-Id: I827876336c3ffdebb0b071f6d1a743c6766d92fb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-24 11:01:43 +00:00
hjk
13d0930575 Debugger: Fix QVariant2 autotest
Amends eb52982c9d.

Change-Id: I8ca2e2b03d0d5755c97523292fa6b4fbe0882cb7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-24 08:15:47 +00:00
Christian Stenger
eb52982c9d Tests: Replace QRegExp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: I8649423fc69faadad324bc3bb51004633fa7cc4d
Reviewed-by: hjk <hjk@qt.io>
2020-07-20 10:22:56 +00:00
Christian Kandeler
fed5a85110 Debugger: Remove name demangler
Never been used, completely outdated, fails autotest.

Change-Id: I2c1808b4a66e9abdb839670eeae3e5226c7246ba
Reviewed-by: hjk <hjk@qt.io>
2020-07-20 08:34:52 +00:00
hjk
4eaacced6d Debugger: Fix QV4 dumper test name
Change-Id: I561e088c7b789903b0fb6867a2a2b5edf8eef63f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-07-17 04:59:26 +00:00
Eike Ziller
770b07f71c Merge remote-tracking branch 'origin/4.13'
Change-Id: I0125351c7c6fa33f9fc7171469493e4fa53e87c4
2020-07-06 16:43:39 +02:00
Christian Kandeler
8bc01aee75 qbs build: Fix sdktool autotest
Change-Id: I069d9b3eaea295efa8d78d4d96b52b61cecbb783
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-06 14:10:46 +00:00
hjk
20be1f5ddf Debugger: Set WITH_DEBUGGER_DUMPERS to ON by default
The option went in with the initial CMale port, presumably because
the test itself created and compile qmake projects at the time.

I do not think it makes sense to leave out existing tests by default,
even if they run for some time.

Change-Id: I7ff055a2a432b9d8f6af16f7da63ebc56995c31e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 11:15:34 +00:00
Eike Ziller
1de74cceab Merge remote-tracking branch 'origin/4.13'
Change-Id: I015bac0cccdf466a923c706abdedd8bd8800b0cd
2020-07-06 10:30:54 +02:00
hjk
a2bf75bb55 Debugger: Add test for char * display
Change-Id: I7319ab6c12aab30e58c5b9fd9223534745fa741c
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 06:20:18 +00:00
Thomas Hartmann
a97ea2e3b3 QmlDesigner: Fix test build
Change-Id: Ib24054b9caa1a2b1404c8af7af7f85bc3de1e6b2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-01 08:16:36 +00:00
Thomas Hartmann
f9df5b445a QmlDesigner: Fix tests
Change-Id: I74442bf004a462d5d310f128b64f8bc82073d822
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-30 18:47:17 +00:00
Eike Ziller
6a095d6c9a CMake build: Make option to include dumper tests discoverable
Change-Id: I9828f362561b8392d31a56f8a60fe9531accf4ce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-06-30 11:39:44 +00:00
Eike Ziller
7f44d8582b CMake build: Remove timeout for dumper tests
They take much longer, but are also optional.
Makes it possible to run via e.g. "ctest -V -R tst_debugger_dumpers"

Change-Id: I8bbda6ca36e25cd896b1f3be5d1696a27b8acc53
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2020-06-30 11:39:24 +00:00
Christian Kandeler
22830fd5e2 Tests: Fix deprecation warning
Task-number: QTCREATORBUG-24098
Change-Id: Icea21e446173537d8fdb8113f1eff7d7176c34b3
Reviewed-by: hjk <hjk@qt.io>
2020-06-26 10:31:18 +00:00
Volodymyr Zibarov
40173ad4ab C++: Fix auto variable resolving for template class constructor call
Code snippet:
template<class T> struct MyStruct { int value; };
int main() {
    auto s = MyStruct<int>();
    s.value;  // "value" is not found
}

This fixes find usages for unique_ptr declared as auto like this:
auto ptr = std::unique_ptr<MyStruct>(new MyStruct());
ptr->value;

Also fixes in-place constructors:
std::unique_ptr<MyStruct>(new MyStruct())->value;

Fixes: QTCREATORBUG-15364
Change-Id: I8d452a77fe85e63665ec8d4c4afbcf8aad063121
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-22 14:27:49 +00:00
hjk
dd9519b1c4 Debugger: Remove QLinkedList occurrences from manual tests
And restrict the auto test to Qt<6.

Task-number: QTCREATORBUG-24098
Change-Id: Idfbe94bc1a4b2d5a8c23a07a031520775bb17cd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-18 13:41:56 +00:00
Christian Kandeler
8eac3fba80 CPlusPlus: Fix lexer crash
At some point in the preprocessing stage, some tokens get "squeezed", so
their associated string no longer refers to the document content, but
only to their own symbol. However, there is at least one context that
operated under the assumption that the token's offset still pointed into
the "global" string. As the token's offset is zero after parsing, this
lead to the same piece of code being preprocessed in an infinite loop.

Fixes: QTCREATORBUG-19525
Change-Id: I231ba51811cfa0b5c6dfe7f75fe0384472252c6f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-18 07:52:02 +00:00
hjk
5a7256b4bf Debugger: Start making auto tests work using cmake
Change-Id: Ibe6c9bdfb52a16171e6f6acb841f185d936878f3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-17 12:15:43 +00:00
Christian Kandeler
5ca17578d5 Tests: Fix Qt 5.15 deprecation warnings
Change-Id: I458cced795f29479557853919bd6d317e5870f07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-17 10:22:09 +00:00
Volodymyr Zibarov
9be4a5f839 C++: Fix Find Usages false positive results for function arguments
Code snippet:
void bar();         // call find usages for bar from here
void foo(int bar);  // bar from here should not be in results

Add test for member function false positives, that is part of
QTCREATORBUG-2176. That was already fixed before.

Fixes: QTCREATORBUG-2176
Change-Id: I9a079caa83bbaea1edb7ba6aeb151d4d4c77952f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-15 13:19:51 +00:00
Volodymyr Zibarov
7d82741602 C++: Fix find usage to see Catch test functions bodies
Catch test functions defined with function-like macros.
To speed-up semantic analysis, find usages does not expand function-like
macros.
Semantic fails with "expected a function declarator" on such functions
and skips function body.
To avoid that, we create dummy function type specifically for this case

Change-Id: Ie2f2464ee57aa4dc86eed07b8b699458f95c0266
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-15 10:16:06 +00:00
Eike Ziller
8b8ecfa28f Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/fileapiparser.cpp

Change-Id: I39f8c2be859be043f506bef77de9bb5b42d38165
2020-06-15 11:30:34 +02:00
Eike Ziller
c644e7c80a Merge remote-tracking branch 'origin/qds-1.59'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
2020-06-08 16:04:15 +02:00
hjk
28d34d196e Debugger: Fix QJson dumper for Qt >= 5.15
Storage is internally based on QCbor now.

Since this works better when having dumpers for QCbor values,
add those, too, for Numbers, Strings, Arrays, Maps for now.
None of the custom types.

Fixes: QTCREATORBUG-23827
Change-Id: Idf281d859aaf8556d9895646bbc091af85b34157
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-08 09:34:35 +00:00
Eike Ziller
623e607b23 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I19a7406f7e387b53f1e7b3f08a0b4c89a377ab82
2020-06-08 08:22:10 +02:00
Volodymyr Zibarov
3ad203b56e C++: Fix variable template parsing in expression
Fix parser to not fail on TemplateId without parentheses, for example:
int i = foo<int> + foo<char>;

This fixes std::pair structure parsing in MSVC headers and find Usages
to work with pair->first and pair->second.

Change-Id: Ic300ea99d44a749705430d5eb47b2744715af995
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-04 08:18:40 +00:00
Christian Kandeler
02f2841a41 CppTools: Fix formatting for new-style function declaration
Fixes: QTCREATORBUG-23502
Change-Id: Ie80fe9aa77ffbf0b9ecc531841e78f2bd80de37e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-04 07:21:39 +00:00
Christian Kandeler
330b1bcbb5 Debugger: Fix misleading indentation
Change-Id: I20188acb2d00c255984a05f522bfca7938639a6b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-04 07:18:34 +00:00
Michael Brüning
083b02377d Add option to apply style sheet coordinates
Enables the user to have pixel positions in the style sheet even if the
template does not use pixel positioning.

Also adds some more ordered properties to make the test case
deterministic.

Task-number: QDS-2208
Change-Id: I79b6af0c24539d1b9eb03dcf0fb52bb078d74afe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-04 05:42:07 +00:00
hjk
777ae8b87b Debugger: Adapt offset tests to changed QDateTime structure layout
Chandge with 5f1f0fe0b71c in qtbase.

Change-Id: Ifceac5125f974a1ebd2ab2e358ba906188d451a2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-04 03:14:25 +00:00