feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
74,059 Commits 108 Branches 368 Tags
644b51a699c98fbcd47d89c59404e3b4f12d8a92
Commit Graph

1659 Commits

Author SHA1 Message Date
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
05b5b864c9 Squish: Remove unused MSVC2013 toolchains 
Change-Id: I2a809150e93e1b17eb13482cc85985cd9ce64e1d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-05-16 07:47:40 +00:00
Robert Löhning
95bbe6bde6 Squish: Fix toolchains in Qt 5.14.1 kit 
This referred to MSVC2013 which has nothing to do with this kit.

Change-Id: Iad72dfd7632e7039ac5d528a3e750264b192df63
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-05-16 07:47:13 +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
9c9aa75ca3 Squish: Fix findUnusedObjects for Python3 
Change-Id: I4d092c5f4be682116f3313a72e17e5b1056e6866
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-05-09 15:05:49 +00: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
Robert Löhning
83736649a7 Squish: Remove outdated comment from Readme 
Change-Id: I480756cf9c6be999d0a7c08476609e8f470a1221
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-05-09 09:53:45 +00:00
Eike Ziller
70b9f13792 Merge remote-tracking branch 'origin/7.0' 
Conflicts:
	src/libs/utils/qtcprocess.cpp
	src/plugins/cppeditor/cppcodemodelsettingspage.cpp

Change-Id: I602f4ff13f9370ec20704efaea34b42445a75fd4
 2022-05-09 09:48:28 +02:00
Robert Löhning
f52c9e7061 Squish: Fix typo in Readme 
Change-Id: Idbbd93318959fdddf967d7d6271cddfac2197645
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
 2022-05-06 13:34: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
Robert Löhning
ef52fa743b Squish: Fix tst_cmake_speedcrunch for Python3 
Change-Id: Ide963d0ee27ff14fdd3d5f4f2bd4dd7b94254521
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-04-13 11:41:17 +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
Robert Löhning
e4463ba6d4 Squish: Port tst_create_proj_wizard to Python3 
While staying compatible with Python2.

Change-Id: I1de16a4a066b00bc11b4142e144d7b9246f7c14c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-04-12 20:59:28 +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
Christian Stenger
e7f314e02a Squish: Fix local git test 
The test was written for a qmake based project. Explicitly use
one as default build system has changed.

Change-Id: Iccf5761915708dd66ba73aeda25ca6b61a8c0b99
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-23 13:44:28 +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
Robert Löhning
5b0b48177b Squish: Port tst_WELP03 to Python3 
Change-Id: I997fb8cc44fab986b5f4e0aa6e6f1f92fccfd54a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-23 13:14:18 +00: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
Robert Löhning
a2735ec024 Squish: Don't configure projects on Qt4 anymore 
Change-Id: Ib09fc44323e09fa4d6a5d2428c35b5b6afe08f24
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-18 18:27:32 +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
4e47ed66c9 Squish: Fix qml indentation test 
Adapt to default build system change.

Change-Id: I70b5869871d4fbb612d4b6a28beb5e73c2d8d88e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-18 14:39:56 +00: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
Robert Löhning
48c3a02229 Squish: Update suite_QMLS 
Change-Id: I2cf804362b965be77ff0cd6686c998664e6eee02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2022-03-18 12:57:08 +00:00
Robert Löhning
59c32bcfbe Squish: Don't use Qt4 in tst_HELP04 anymore 
Change-Id: Idebff8b0bfd75daf573ab870dedd984eac9d09d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-18 12:56:31 +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
Robert Löhning
689d3d528e Squish: Update tst_CSUP01 and -02 
Change-Id: I6e15545be1a92e43b5708dc5fdef456b8d2ab32d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-18 10:02:00 +00:00
Robert Löhning
ab772c50be Squish: Update tst_cmake_speedcrunch 
Change-Id: I46ab6f245a21546e6ebf20680f06b0cdd26eab8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-17 21:35:44 +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
Robert Löhning
a763f5d689 Squish: Port tst_SCOM04 to CMake 
Change-Id: I71f8978a41b25b2ed5fffaac1be6ff77cb3099f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2022-03-01 12:26:13 +00:00
Christian Stenger
869ad16d04 Squish: Remove outdated condition 
Change-Id: I89029f50cc0a303111f9960eac3f3c17b4c05fb0
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
 2022-03-01 08:54:43 +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
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
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