Commit Graph

8097 Commits

Author SHA1 Message Date
Jarek Kobus
0dfcc97a3e SshRemoteProcess: Rename done() -> finished()
Change-Id: I9c22d075f50b0a2a171cbda11c7579e4735f3f4e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-28 16:12:27 +00:00
Jarek Kobus
7b5dfcd6cd SshRemoteProcess: Get rid of error arg from done() signal
Prepare for signal rename done() -> finished().

Change-Id: I81a7bd0a4826ce6200f4af47ba5868ceedb42206
Reviewed-by: hjk <hjk@qt.io>
2022-02-28 14:21:47 +00:00
Eike Ziller
d295d16ab5 Merge remote-tracking branch 'origin/7.0'
Change-Id: I809383e6c060701a2751197a8bf16add92bfaf0d
2022-02-28 09:21:18 +01:00
Eike Ziller
f562ebf239 Mimetypes: Make implementation switchable between new and old
- configure with QTC_USE_NEW_MIMEDATABASE to switch to the new one in
  utils/mimetypes2/
- added utils/mimeutils.h header for the Qt Creator specific static
  wrappers, that also includes the "public" headers for MimeType et al
  from the new or old implementation, depending on configuration
- change all utils/mimetypes/ includes to utils/mimeutils.h
- move the implementation for the wrappers to
  utils/mimetypes(2)/mimeutils.cpp
- also move the MimeDatabase declaration in the "old" implementation
  back to utils/mimetypes/mimedatabase.h

Change-Id: Ie8de229c035d6cd9a5e4739dc0fa78d9c17228e3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-25 07:19:58 +00:00
Christian Stenger
3ae6f41c3f Squish: Adapt to changed UI
Change-Id: Ie25ba8a72b7fd93f60f04303ed223e7cdf2406af
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-24 14:04:51 +00:00
Eike Ziller
41538832c3 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/libs/utils/qtcprocess.cpp
	src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
	src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp

Change-Id: Id0c31719e46d1c44770ea89663eee321a0517ff4
2022-02-24 11:42:57 +01:00
Christian Stenger
3efec2b887 Tests: Add build files for qml-ast2dot
Change-Id: I5d439be4442ab5c41935534b93ebc9d6868cb880
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-23 08:44:36 +00:00
Christian Stenger
ec80ae2322 Tests: Fix dumper execution on macOS
macOS may print warnings on stderr when running qmake which
in turn stops the test before starting to build.

Change-Id: I01750e984916b3e16f5d5737e44cd5a2c6e0433b
Reviewed-by: hjk <hjk@qt.io>
2022-02-22 13:14:17 +00:00
Eike Ziller
8259df00d0 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportplugin.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp

Change-Id: Ib423e9f23877176f01b188104b0a179ed32c4770
2022-02-22 14:06:41 +01:00
Christian Stenger
eccbc0fbcc Qbs: Factor out gtest dependency check
..to make it re-usable.

Change-Id: I7653ee7b3ced5fb9d2b7262aecdab12438628928
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-22 05:33:10 +00:00
Robert Löhning
00c7161e33 Squish: Run tst_save_before_build on CMake and qmake
Change-Id: I91501633e0fe7c863c43af4224474c09f57dbf8c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-18 22:01:14 +00:00
Jarek Kobus
97264e0591 Ssh: Drop ProcessMode from c'tors and creator methods
Change-Id: I2db51f26d9a841f60d5ab3722fa82b3a89d57146
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-02-18 10:49:29 +00:00
Thomas Hartmann
0d319ac3a1 QmlDesigner: Fix loading of .metainfo for versioned folders
This fixes a regression introduced by 7ea6492a17.
Since we actually check if import folders exist,
we did not take versioned folders into account. e.g. 'MyPlugin.1'
Extended and cleaned up the manual test case.

Task-number: QDS-6078
Change-Id: I3235d8fe498745903c5ca897e25e3d43222c119f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-17 10:45:37 +00:00
Eike Ziller
49ecd64b9c Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/docker/dockerdevice.cpp
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcupackage.h
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/mcusupport/mcusupportsdk.h

Change-Id: I8c8f5953a21729ba9178dbc44ed613eed131a0c8
2022-02-16 10:59:04 +01:00
hjk
4fb3eb8fd5 Debugger: Add test for QNX 7.1 gdb version string
Task-number: QTCREATORBUG-27053
Change-Id: I09447abfbe57968e5f5302be6b23cb950c4d0ea7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-15 08:56:48 +00:00
Christian Stenger
1652be1310 Tests: Provide some cmake files for manual tests
Add another option to mark a test as manual and use this for some
existing.
Manual tests will not be added as a ctest, but they can still get
executed explicitly.
Beside this allow to use a condition when using add_qtc_test().

Change-Id: I03d5397db36c0a2c9ee506a4214ed68fae6ad6e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-15 08:21:40 +00:00
Tim Jenssen
f9cceb6267 qds: remove redundant "QtStudio" feature
Nowadays, the decision which wizards will be shown are
done throw the StudioWelcome plugin if it is initialized or not.

Change-Id: Ief95fa8f813408522ac43c31dd6f4ffb069338d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-14 10:33:26 +00:00
Christian Stenger
b82bb52183 Tests: Fix launcherinterface location
Change-Id: I0802d6e26938528635094bc928f55b8a285c1639
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-14 10:01:04 +00:00
Christian Stenger
900cd206c8 Shootout: Fix compile with Qt6 on Windows
Change-Id: I817eb9b02b09db76a2bebbc5f28388be96a4c54f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-11 16:03:50 +00:00
Christian Stenger
fba9a3514f Tests: Add some more information to README
Change-Id: I84be21478f26a48cee271836793ff74835d456e9
Reviewed-by: hjk <hjk@qt.io>
2022-02-11 15:44:39 +00:00
Eike Ziller
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
2022-02-11 10:49:15 +01:00
Christian Stenger
12c63bbce9 Tests: Fix manual plugin view test
Amends b822b3f9e2.

Change-Id: Ibbed286a8626396319738194f417cedc84332011
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-11 07:49:32 +00:00
Thomas Hartmann
6472e8c5bb QmlDesigner: Set proper version when duplicating states
When duplicating a state we did not set the correct version.
This stopped the rewriter from syncing the property with the QML code.
I added a regression test.

Task-number: QDS-6185
Change-Id: I11552a9f880eb83f4df1341fb0b94c9a3a6e5035
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-10 16:33:51 +00:00
Christian Stenger
d408726023 Tests: Include flamegraphview test
Change-Id: Id30d171d43c7b5adf5bb7b45fda99364662c93be
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-10 05:52:07 +00:00
Alessandro Portale
a6fcb4b3ce Tests: Fix crashing of tst_flamegraphview on Windows
...by setting the RHI backend to "opengl". That is preliminary.
QQuickWidget will work with other backends such as "d3d11", soon (likely
with Qt 6.4).

Change-Id: I57e1869e837794fa887894cae0905a548f9e436c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-09 14:44:00 +00:00
hjk
76eb84e72d Docker: Also mention the logging category used for debugging/testing
Change-Id: I3f3c34e6102a6225539f3ad3b32d2e1e0026bc3a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-09 11:02:15 +00:00
hjk
fa7a60eed7 Docker: Update manual/docker/README.md
Change-Id: I2c8f713bc1d32191fd52765d3e82733a460b2fbf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-09 08:00:13 +00:00
Christian Stenger
d8bd4e8e05 Tests: Fix pluginspec test on Windows
Change-Id: Ie72131f2e85b999ef8aaefd773407b2c5ce23019
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-08 13:41:06 +00:00
Robert Löhning
b8b5687f21 Squish: Fix availableTargetClasses()
Amends 40caa8a4ba.

Change-Id: Ib48a70fa641c5d3c65f53aad2dd1ce8fd3abce54
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-03 17:49:44 +00:00
Christian Stenger
4e716c0db5 Squish: Fix unknown global variable
Amends 40caa8a4ba.

Change-Id: I014210c2035fa0a69ca273718df726a523a23786
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-03 17:49:35 +00:00
Eike Ziller
9bc9fb5a0d Fix avdmanageroutputparser test
- There is no PLUGIN_DEPENDS for tests, and it wouldn't work anyhow
  because of duplicated symbols. It was interpreted as a dependency and
  the test disabled because no such target exists.
- Move the platformNameToApiLevel(...) function to
  avdmanageroutputparser.h to break the dependency to a lot of Android
  support code.

Amends 78da7e2922

Change-Id: I6933684a76e5291d415c72388caa3df2bee7cbfb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-03 15:31:13 +00:00
Christian Stenger
9a5cb5896e Tests: Fix cmake file
Change-Id: Iebe454bee2037c0d150d5ea537419044745abc10
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2022-02-03 14:13:39 +00:00
Christian Stenger
b822b3f9e2 Tests: Provide qbs files for some manual tests
Change-Id: I6c5c839dc199379edaf4c43ae4d6a0ed6ebdf751
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-03 05:27:56 +00:00
Christian Stenger
841bd52e07 PluginView: Fix crash
Without a running QC we still need to initialize the
plugin manager properly.

Change-Id: Ia2a83080f68de9f88d214f5afbcb6a07f31daea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-03 05:27:44 +00:00
Christian Stenger
40caa8a4ba Squish: Make presence of Qt4 optional
It is hard to build Qt4 nowadays. Any machine set up
today won't be able to build it without hazzle.
So, make it optional inside the Squish tests to avoid
fails and fatals. Use a different available Qt instead.

Change-Id: I151d809f4fada8047a30940a183f913af2a1a691
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-02-02 11:09:12 +00:00
Christian Stenger
b864496238 Manual tests: Adapt to upstream changes
Change-Id: If7a3cfe94f96c64efbd43636ab0d054f9dbce32c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:58:44 +00:00
Christian Stenger
435a4e9dd4 Shootout: Fix compile with Qt6
...and fix location of build directories used by the test.

Change-Id: I483739e8dedb9a1915115ae9895490cb79de5c94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:58:35 +00:00
Christian Stenger
d9f1421841 Manual test: Silence deprecation warning of proparser test with Qt6
Change-Id: I89fcc27e9d8f87fc35f677eea09a50ae3226a3a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 10:58:22 +00:00
Eike Ziller
1368111824 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
2022-02-02 10:17:03 +01:00
Eike Ziller
1221552377 Require CMake 3.16 and remove workarounds
CMake 3.16 is available on the major Linux distributions nowadays,
so we can get rid of some workarounds.

Change-Id: I32500375748f33c3e40fbd7a08824d823f817a8f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-02 08:55:31 +00:00
Christian Stenger
3a9ce46928 Simple test app: Fix location
The location had been correct with qmake, but
is wrong with qbs and cmake.

Change-Id: I967f6db60e084dbc98548d61bb6eddbac4f7be24
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:33:59 +00:00
Christian Stenger
c8b2e4fe1e Manual tests: Correct qtc_processlauncher location
Change-Id: Ia3c550ae5cd0f2a6c75ec6d4fba230edf2a0bec8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:33:38 +00:00
Christian Stenger
f6061d4f1a Manual test: Adapt to upstream change
Change-Id: I4bb8b323535eaeb456d3cfcedaef0e67970cfe4e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-02-02 06:29:55 +00:00
Jarek Kobus
1d15a934cd QtcProcess: Get rid of useTerminal
Remove SshRemoteProcessRunner::runInTerminal() method,
it wasn't used anywhere (just in test).
Remove QtcProcess::useTerminal, as process should be
created in TerminalOn mode when there is a need for terminal.
Add a parameter to
SshRemoteProcess::fullLocalCommandLine(bool inTerminal)
as this may still be needed when running application
through ssh from terminal (ssh -tt option).

Change-Id: I71911082fcca190b82a1106a2ca1ca48dc5d4c79
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 95a9b22f6f)
2022-01-28 12:19:12 +00:00
Robert Löhning
7a8ca55f77 Squish: Introduce helper function for checking for strings
In Python3 type unicode is unavailable since it's implicit with "str".
The new functions helps porting code.

Change-Id: I5de0fa182acbbaf267ed51f66f658cb9c884f4c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 11:00:35 +00:00
Robert Löhning
4980f71dd5 Squish: Update tests which use "Rename Symbol Under Cursor"
When using this on open files, Creator used to make the changes
but not save the file. Creator 6 now also saves the file unless
it already contained other changes. Because the file is being
saved immediately, "Save All" and "Revert to Saved" cannot be
used in this situation anymore.

Change-Id: I0b8a58d998c54ccceae6d178b2c7a6f6182c7ad0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 10:59:39 +00:00
Christian Stenger
016e497242 Tests: Add another docker device script
Change-Id: I5cd62cc3277fa495bbac74efd4db25f5e1fc9488
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 13:10:54 +00:00
Eike Ziller
9d8a419d10 Remove qmake build files
Removes qmake as a build system for building Qt Creator itself.
Keep them for some tests that are not completely moved to CMake yet.

Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 12:18:15 +00:00
Christian Kandeler
ead181e385 ClangFormat: Move tests into plugin
That's where they belong

Change-Id: I78e33e76a2f42f05961f6fab31da5f3dd583a2e9
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 10:27:13 +00:00
Marco Bubke
704f239b55 Sqlite: Update to 37.2
Change-Id: I43087c35249af1abee5a2172f29dc998c7babd0d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-01-19 12:14:54 +00:00