Commit Graph

6441 Commits

Author SHA1 Message Date
Robert Löhning
939fb7cb0c Squish: Fix storing breakpoint locations on Windows
Not changing Linux or Mac.

Change-Id: Idcc22c9d960ced7145b10651f75c78a740714cff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-19 11:15:00 +00:00
Jarek Kobus
9966cc4bcc Start and stop the process launcher in tst_qtcprocess
Change-Id: Ib28450d10c699abe3964f8bef2ff24baae0074f7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-19 07:44:48 +00:00
Christian Stenger
28d2674b54 Utils: Adjust FilePath::relativePath()
When using the same path for the anchor and the relative path
we end up in an empty path which is conceptually wrong.
Especially when passing such a result directly without further
checking may lead to bad issues.
Return a path containing just the '.' (dot) instead.

Change-Id: I86e1ab91e6610831fc05bd81776d278e9fe10105
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2021-08-19 04:39:05 +00:00
The Qt Project
d8a61bcea4 Merge "Merge remote-tracking branch 'origin/5.0'" 2021-08-18 14:42:50 +00:00
Jarek Kobus
6d18df6207 Remove QTC_REL_TOOLS_PATH and use RELATIVE_LIBEXEC_PATH instead
Change-Id: If737d7050985f2ae03d543c63347ea465a65c648
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-18 14:30:02 +00:00
Eike Ziller
94d352ab28 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/autotest/testresultdelegate.cpp

Change-Id: If172206f231fc2a9f4a672cd2e6eaeaea4988c96
2021-08-18 16:14:24 +02:00
Orgad Shaneh
2384865bff UnitTest: Adapt to Google Benchmark v1.5.4
Change-Id: I2c2a34206dbc01d277242f5d736eef3e1333b01f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-08-18 11:58:46 +00:00
Jarek Kobus
b568321806 Compile fix
Remove unneeded closeWriteChannel().

Amends d22505c41f

Change-Id: I499039f2c46d70473a4b1a2c89ad6b2c27174f3a
Reviewed-by: hjk <hjk@qt.io>
2021-08-17 07:55:38 +00:00
hjk
7c28c4f744 Utils: Introduce a FilePath constructor from char arrays
Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for
decorations in user code.

At the same time, drop some convenience constructors and functions
in CommandLine and Icon essentially serving the same purpose.

Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-17 05:34:10 +00:00
Marco Bubke
98cba6e50c QmlDesigner: Improve file status cache
It is caching the file size now too.

Task-number: QDS-4788
Change-Id: I5cb816b8359bf3d2ef372ea319ce5920d9e0e4e9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-16 15:23:10 +00:00
Marco Bubke
4ebc0f5078 QmlDesigner: Add file status support to the project storage
Task-number: QDS-4785
Change-Id: Idaadf6992fad938e3620169a415f9d3cf7b9927f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-16 15:23:04 +00:00
Marco Bubke
51452d0858 QmlDesigner: Add source path watcher
The watcher is only watching directories and then searches for file
stat changes. It is compressing signals too. So if files are changes
in a very short time frame they are compressed to one change.

Task-number: QDS-4776
Change-Id: I90052a0d5dba01467b505070fb58b04ea5576294
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-16 12:25:19 +00:00
Marco Bubke
19a30631af QmlDesigner: Improve support for explicit type names
Explicit type name ids are now saved as negative ids into the database
so they can be distingished by that 'flag'. For types we now use imports
and not anymore import ids. The resolving of the imports are done
internally to enable atomic synchronization.

Task-number: QDS-4662
Task-number: QDS-4725
Change-Id: Ia59763ec5578baec84f3c81fa1fd35ba075b8d84
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-16 12:25:00 +00:00
Eike Ziller
ab606faad2 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/android/createandroidmanifestwizard.cpp

Change-Id: Ibd06a254f52c2c96d8c6ddd6b1d27483fcc29a17
2021-08-16 10:51:50 +02:00
Christian Kandeler
33108795d6 CppTools: Turn some classes into pure value types
ProjectInfo, ProjectPart and ProjectUpdateInfo used to carry pointers
to Project and/or Toolchain, even though they were used in contexts
where these pointers were either unsafe to access or not guaranteed to
be valid anymore, which made their use difficult and error-prone.
We turn these classes into pure value types by copying in all relevant
information before the first async operation takes place.

Fixes: QTCREATORBUG-25678
Change-Id: I1914b0dbda6c7dfba6c95e5e92f2d69977755590
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-08-13 12:35:49 +00:00
Robert Löhning
00a2dd0747 Squish: Explicitly convert analyzer data to str
With Creator built on Qt 6.2, Squish considers the
data different although the contents look the same.

Change-Id: I281b7425d5b3f9a977456253e0299f452d75c1e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:23:33 +00:00
Robert Löhning
765e6d2856 Squish: Remove redundant search criteria for named object
Change-Id: I8d6432f479381c7a517b8aeaeb29f76da03f4ae2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:23:13 +00:00
Robert Löhning
aec25d293b Squish: Use regex instead of wildcard to find objects
Squish 6.7.1 for Qt 6.1.x can't find the objects when using wildcards. The
same version of Squish for Qt 5.15.x works fine.

Change-Id: Ia378934af51cab2894a9df01e2391dbdb9cf32f9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:22:57 +00:00
Christian Stenger
0408b4a757 Squish: Improve Python2/Python3 compatibility
Change-Id: I49dc9ee2f4ef52900b403ed94f0c6cd5925239b6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-12 11:17:44 +00:00
Robert Löhning
e9f53752ee Squish: Update tst_codepasting
Change-Id: I7929a97dea0a362f07eff46a37d84b65fa546bbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-12 10:19:27 +00:00
Eike Ziller
c7168d1063 Merge remote-tracking branch 'origin/5.0'
Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
2021-08-11 10:10:51 +02:00
Christian Stenger
bfe2a7b9d1 Squish: Fix suite_debugger
Change-Id: Ic0add36d2acfbf4c6de93d27f8651062ad9f1fb4
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-10 18:55:43 +00:00
Robert Löhning
867b006517 Squish: Update tst_APTW03
Change-Id: Id3b93b8e78b7797bd8c1cec5e6edb0b7cc966ea1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 18:49:23 +00:00
Robert Löhning
5c2b00aaf7 Squish: Update tst_build_speedcrunch
Change-Id: Ie3ea3a06f36a540e1e96ed288af46e5e69e47997
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-10 18:49:04 +00:00
hjk
9e529bef7b QmlDesigner: Fix a "#pragme once in main file" warning
Change-Id: I0e6efe3c2cabb3a3c3e80ab5021a43809a6e279c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-08-10 07:52:29 +00:00
Christian Stenger
b98b807bc9 Tests: Fix compile
Amends 25f585227f.

Change-Id: I7f96fab0ecb12225f32f31f5c8cb89f6faf58a32
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-08-09 09:34:38 +00:00
Eike Ziller
6f69ee8b27 SilverSearcher: Use data driven testing for output parser
Change-Id: Ia5a312a3c55eb753820d45ffcd72763137856933
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2021-08-09 09:33:08 +00:00
Christian Stenger
bd5c36530b Squish: Prefer 64bit debugger over 32bit on Windows
We nowadays build with 64bit Qt and need a matching compiler.
Especially when testing packages that ship both cdbext versions
the preference of 32bit breaks debugging.
As a drive by, fix tst_simple_debug by triggering rebuild via
locator as menu items are nowadays harder to distinguish.

Change-Id: I6f0c1083472713c48b4d558d6c6f9b8b0da2ca77
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-06 18:58:51 +00:00
Robert Löhning
2f6c5db856 Squish: Update isMsvcConfig
Change-Id: Ia2042d32d0a41a8876ba6dfae960f48bca2b298c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-06 09:29:17 +00:00
Cristian Adam
124dc2c6b6 Android: Add setup_android.cmake script to download JDK, Android SDK
Execute from command line with: cmake -P setup_android.cmake

Then in Qt Creator -> Options ... -> Devices -> Android point the
"JDK location" and "Android SDK location" to the directories
created by the script.

Change-Id: I59d1b39ec34a58dc54882c04d3f272c0baefcc7d
Reviewed-by: hjk <hjk@qt.io>
2021-08-05 16:54:14 +00:00
Robert Löhning
b543ed4068 Squish: Raise minimum Qt version for Qt Quick apps
5.12 is the lowest available version in the wizards now.

Change-Id: Ib8de3470188316b01ff521d6e66162baaa8db0af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-05 09:08:51 +00:00
Tor Arne Vestbø
562848f647 Fix warning about format string not being string literal
Change-Id: I54e80b15b7a492acd4ffdb50a28f00511f72355c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2021-08-04 09:46:13 +00:00
Eike Ziller
17d716118a Merge remote-tracking branch 'origin/5.0'
Change-Id: I4236e3d2f87d56aea787905f4b78b1f5f933c069
2021-08-03 14:19:44 +02:00
Tor Arne Vestbø
53b21b7644 Replace uses of deprecated QWARN macro with qWarning
Change-Id: I71ee2cedaf40197ac52f61e74060656fc4b305d4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2021-08-03 10:03:34 +00:00
Robert Löhning
140c267181 Squish: Update tst_simple_analyze
Deal with Build menu items which all look the same now.

Task-number: QTCREATORBUG-26002
Change-Id: I120f0f0b6f0ee0451636635313cff6d7bd53706b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-30 09:27:52 +00:00
Robert Löhning
60a77e64f5 Squish: Substitute tilde in Qt version settings
Creator doesn't seem to handle it anymore.

Change-Id: I9398193e1b3ceafa2bf05c2cbd85a757aaca3306
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-30 09:27:12 +00:00
Marco Bubke
3ed4c8dd05 QmlDesigner: Remove document imports for deleted documents
Task-number: QDS-4724
Change-Id: Ie5ec1788387c224b48380fa0f256b012f2b7dbcf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-29 12:16:11 +00:00
Cristian Adam
dbdea46f66 Unittest: Allow standalone tests build without libclang
Without libclang, or for the MSVC case when libclang has been built
with a different CRT. (release vs debug)

Change-Id: Ia1c5adbd1f9126efb95f1517c8ff274b5919c10e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-07-28 15:28:41 +00:00
Christian Kandeler
2b4f5749ab Unit test: Remove unused mock class
Change-Id: I57f0f176d639271d7fbd2ab164d99bac7326e453
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2021-07-27 10:07:35 +00:00
Orgad Shaneh
61008441da Merge remote-tracking branch 'origin/5.0'
Change-Id: I9aa7b7a6490e8fb592a0e785a57128d438fdbab5
2021-07-27 11:39:29 +03:00
Christian Kandeler
3edc5822da Unit test: Remove unused ProjectExplorer sources
Change-Id: If30f601955d287ab4db719f0499c9e92e6eefe02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-26 10:11:19 +00:00
Marco Bubke
a98d2a6770 QmlDesigner: Imports updates are source id aware
Imports are now only updated for their source id. The source id is now
used as import id too.

Task-number: QDS-4724
Change-Id: I12988e9c19746291bbc26d5c80fc7dfdd33528e9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-26 09:46:55 +00:00
Marco Bubke
1ba8899749 QmlDesigner: Atomic synchronize
Merging the synchronization function into one function. This is needed
to exclude inconsistent states of the database.

Task-number: QDS-4715
Change-Id: I9915726d78d81a471c0494c584f141f011714c39
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-26 09:46:37 +00:00
Marco Bubke
3591735293 QmlDesigner: Detect alias cycle
An exception is thrown if an alias cycle is detected. This prevents that
the designer would get in an endless loop.

Task-number: QDS-4682
Change-Id: Iffbfb42d7334aa2a5490fe2830b5cfab8c8e627a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-26 09:46:04 +00:00
Marco Bubke
15f44db84c QmlDesigner: Support recursive aliases
So far we push changes up to aliases. But because we have recursive
aliases we have to separate different phases off the declaration and
linking. First we simply declare. Later we set the alias ids and then we
can find out the alias property types. To minimize the changes we stick
to the push model.

AliasPropertyDeclaration was merged into PropertyDeclaration so that
Sqlite::insertUpdateDelete can be called on one sequence. This prevents
inconsistent states as aliases would be changed into properties and vice
versa.

Task-number: QDS-4654
Task-number: QDS-4711
Change-Id: I8459ab07fd6b30efa19cfd4bc335286a039a511f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-26 09:45:50 +00:00
Christian Stenger
8593920f4c Tests: Fix build on Linux and macOS
Amends fd677101a9.

Change-Id: Ie994588f91b3b239080530df417128418a4e36ef
Reviewed-by: hjk <hjk@qt.io>
2021-07-23 05:55:58 +00:00
hjk
09286d062f Merge remote-tracking branch 'origin/5.0'
Change-Id: I074571dac56b26a8a1449c29aef53b9052d8e304
2021-07-22 15:00:19 +02:00
hjk
fd677101a9 Utils: Split FilePath off fileutils.h
This now rather central class deserves a suitably named file(pair).

The rarer used declarations including otherwise not needed includes are
still in fileutils.h.

Change-Id: Ib18d72f16322c03f76023fdefcd5f6da35311b8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-22 11:52:58 +00:00
Christian Stenger
805d19d1ed Unittest: Remove deleted file
Amends baa83725f6.

Change-Id: I9a5d3ad9a17dd37cdc39d05d0065022621219ab1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-22 09:41:34 +00:00
Christian Kandeler
1275a12582 CppTools: Move SendDocumentTracker tests into plugin
Change-Id: I1d0532b5d0e155f6d53c683d01c4a92e4bae3ce9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-22 08:55:46 +00:00