feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
76,587 Commits 108 Branches 368 Tags
d63bfa4a2975541b51fc8173fdb06933bb9dd40d
Commit Graph

745 Commits

Author SHA1 Message Date
Christian Stenger
9f0dcd71c4 Squish: Adapt to ui changes 
Change-Id: Ie7cb2a80a5edfa135a1b5d1b44c365a5e6cf408b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-10-13 13:08:05 +00:00
Christian Stenger
0f24475f48 Squish: Adapt to changed ui 
Change-Id: Idbee4f2a4d1536cc1dc6a7822d4415032feb9a28
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-10-13 10:45:51 +00:00
Robert Löhning
fcb79ee810 Git: VcsBase: Squish: Make tst_git_local run again 
Amends 1548eef10b
Amends 69f4cb86dd
Amends 9ad5c4254d
Amends e070d826e5

Change-Id: I584b1b9b662144899d0292b887e8cb3386f80d4b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-10-07 08:33:12 +00:00
Eike Ziller
5d55cfdae5 Merge remote-tracking branch 'origin/8.0' 
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
	src/libs/utils/fileutils.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/nodemetainfo.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/remotelinux/linuxdevice.cpp
	tests/auto/utils/fileutils/tst_fileutils.cpp

Change-Id: I26a21e2523d3d725fdb8c548a531cdbdaeaeca20
 2022-09-19 09:54:06 +02:00
Robert Löhning
a35ebe2753 Squish: Update and improve isMsvcConfig() 
Change-Id: Icff3a8178e89623097e2da7ff8f1e72197f1a4dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-09-16 08:09:53 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-08-26 12:27:18 +00:00
Robert Löhning
0c2e1cf094 Squish: Update location of Options dialog 
Change-Id: Ie9df4f897621520744998c3dbd9a3c44600ba844
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-06-28 10:13:34 +00:00
Eike Ziller
84ff5eb169 Merge remote-tracking branch 'origin/7.0' into 8.0 
Change-Id: Ib669e2e993c4675a7382f721ccb7d6ecff11fc20
 2022-06-07 10:28:37 +02:00
Robert Löhning
e9a78b13b3 Squish: Remove exec permission where not needed 
These python scripts cannot be executed directly anyway.

Change-Id: I9ac3170450c4f8be4063b02ee8ec9df28f90cec5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-06-03 11:26:08 +00:00
Eike Ziller
6a296ab68a Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
 2022-05-18 13:35:47 +02:00
Robert Löhning
67f907f295 Squish: Fix MSVC2017 toolchain 
Without this, Creator cannot set up CMake properly
in the kit so configuring projects fails.

MSVC2015 also needs a fix.

Change-Id: I19c065eb087d098174c84301aa52cc3888ec42b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-05-18 08:56:43 +00:00
Robert Löhning
9d5512b137 Squish: Retire Qt4 
It can't be built with current compilers anymore and there
are no more binary packages publicly available.

Change-Id: I906789bbcca053690f39246ff7c3e602703ada37
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-05-11 12:10:06 +00:00
Eike Ziller
9bf0efcbb9 Merge commit 'origin/7.0' 
Change-Id: I90148816d32c81b9fef982b5010c785161d83097
 2022-05-10 11:45:37 +02:00
Robert Löhning
90bde92efd Squish: Align iterateKits() better with the way we use it 
Change-Id: Ib41b4e763b0df8a74fd7b073710b29640fea17db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-05-09 15:03:23 +00:00
Robert Löhning
02742670d3 Squish: Reduce complexity of iterateQtVersions() 
By removing dead code, code which generated unused data,
unneeded generality and needless abstractions.

Change-Id: Ie271363c5446ef02f32e48a78db3d8ef9be0ed29
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-05-09 15:03:07 +00:00
Eike Ziller
3b2134711b Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
 2022-04-20 16:12:41 +02:00
Christian Stenger
3b5ef55a32 Squish: Ensure treeview items are accessible 
Before using mouseClick() we must ensure the items are really
accessible. So, scroll the view to the respective item explicitly.

Change-Id: I9e460b9f8cd64590d8a59692ba2d726495de3d92
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-04-14 04:35:28 +00:00
Christian Stenger
113c867bda Squish: Ensure we get str output from commands 
Change-Id: I4e7ff85d2e2afbf714e9d16ae07e56d93cc57655
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-04-13 10:09:23 +00:00
Christian Stenger
0c1b5065c8 Squish: Remove obsolete workaround 
Squish forces file dialogs to be real QFileDialogs for a long
time while testing.
Beside being no more necessary the workaround also causes
problems nowadays.

Change-Id: I211b64e61a0e28ede2a38d4d90cea5da350fa749
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-04-13 04:29:19 +00:00
Eike Ziller
780f5da7c4 Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/studiowelcome/recentpresets.h
	src/plugins/studiowelcome/userpresets.h

Change-Id: Ie573b945eb28347a36ee1b3582fbd6ab0c0f866c
 2022-03-28 15:10:11 +02:00
Christian Stenger
c1b585933b Squish: Fix remove kits test 
cmake is automatically running when re-opening a project
and creates a temporary kit which was different when using qmake.
Switch back to qmake and enhance later to support cmake as well.

Change-Id: Id3e1dc23c828a6e2af5454863e1349d9866dfa38
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-24 05:55:16 +00:00
Christian Stenger
fcddfe5a8c Squish: Fix project wizard test 
Change-Id: Iabf4463ac535cab025db3ee808e61f5fe7054095
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-24 05:55:08 +00:00
Eike Ziller
ae6c974fb2 Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
 2022-03-23 14:16:07 +01:00
Christian Stenger
34b94d8cd2 Squish: Update Welcome page test 
Change-Id: I447addcba50e932886a8ed5e730a1eab663a2224
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-23 05:37:42 +00:00
Eike Ziller
b6f679d777 Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	src/plugins/webassembly/webassemblytoolchain.cpp

Change-Id: Ia75c783e3ecab1f97de2b5c73a0979c49da82009
 2022-03-18 16:07:51 +01:00
Christian Stenger
de1a328390 Squish: Fix debugging console app test 
Change-Id: I752dab65948952081752a805018cfc3b01193855
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-18 14:39:49 +00:00
Christian Stenger
cc885348c7 Squish: Adapt to ui change 
Change-Id: I0c896d5fa6d8fd814afec3206a2faae434da9dc7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-18 11:31:54 +00:00
Christian Stenger
a42b63ac05 Squish: Build speedcrunch with Qt5 
Change-Id: I1fe79d6775b157fda26248917c9489edca88fd53
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-17 05:27:13 +00:00
Christian Stenger
f43348c4f2 Squish: More corrections due to change of default build system 
Change-Id: Ia221e1e84784f5218d14258fcc24dcac900d60ad
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-16 12:56:43 +00:00
Christian Stenger
d24f13d66d Squish: Adapt to changes ui text 
Change-Id: I03187ddecb7a5737a87a626135584458795aa633
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-16 05:18:18 +00:00
Christian Stenger
2907d60973 Squish: Handle build systems more appropriately 
Change-Id: I43e89d76c4199a741a5606dd0d6de2165b8133c6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-16 05:18:10 +00:00
Robert Löhning
82534fc979 Squish: Explicitly use qmake-based projects in suite_APTW 
Creator's default build system is CMake now which broke the tests.

Change-Id: I901b44dd4545a297d0100da5d92aa1bea79e41d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-15 08:24:20 +00:00
Robert Löhning
50199cab93 Squish: Fix checkLastBuild() with python3 
Change-Id: I25c02f91eab4a7cbf784ab726e0fe24210050a84
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-03 20:02:26 +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
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0 
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
 2022-02-11 10:49:15 +01: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
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
Eike Ziller
1368111824 Merge remote-tracking branch 'origin/6.0' into 7.0 
Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
 2022-02-02 10:17:03 +01: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
3eef024960 Squish: Fix checks in __selectQtVersionDesktop__ 
The expected checkboxes only matched what Creator displays for
qmake-based projects. This crashes since some project use CMake
by default.

Change-Id: I4d52ee6d71f332b5e884bdd87b94f9d9bacd9d19
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-12-10 12:44:49 +00:00
Christian Stenger
8039aa9ddb Squish: Adapt to changed UI 
New File and New Project are nowadays separate menu entries.

Change-Id: I36c619d5a2eb4b5ac36bb25a20a1cb62f33493bb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2021-12-09 12:10:26 +00:00
Robert Löhning
5ba3eb7fcf Squish: Update for running tst_generic_highlighter 
Change-Id: I262fb7a7223e235708cbc7e8e382a2448a2f8c84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-10-29 13:20:00 +00:00
Robert Löhning
73405cc089 Squish: Update for running tst_APTW01 
Change-Id: I95ac2d2209dbc47e316b746313e4545a1b80ab55
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-10-29 11:23:37 +00:00
Robert Löhning
c4ba0c2021 Squish: Update for running suite_CSUP 
Change-Id: I2773f98af0a6656fcf1362b4dcd2d853cc2aea81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-10-27 18:47:04 +00:00
Robert Löhning
4455dd2ece Squish: Prepare tst_WELP01 for Qt 6 
Working around the wildcard issue...

Change-Id: I3d3b8e0360762ea72c39a49274df271fc0090e8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-08-23 09:28:25 +00:00
Robert Löhning
0824aa2ce3 Squish: Use tab visibility hack on Windows, too 
Change-Id: I6e5f4b75747b703ab46e2f3776b134aff8b34ac0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2021-08-23 09:26:39 +00:00
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
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