Commit Graph

685 Commits

Author SHA1 Message Date
Christian Stenger
da53e3f994 Squish: Allow automatically created kits
Linking to Qt makes the respective configured kits become
auto detected and these have a fixed Qt.
The Qt version combo box for these kits is disabled on the
Kits page, so be more relaxed when checking kits page.

Change-Id: Ieb7e22b47bd5e5c5603e85dc0ddf2421427e85d6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:11:26 +00:00
Christian Stenger
412b661672 Squish: Correct hitting "Do Not Show Again"
Original implementation just made it work for the common use case.
If the order or the selected buttons differed from the common case
this failed.
Beside this it is later on more easily to extend.

Change-Id: I581b0af2579fa728a81b9946028ade5559f17fd8
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:10:53 +00:00
Christian Stenger
de04f29198 Squish: Wait for the docs update progress bar
Change-Id: I73e80119a7e5a8d09397138d1301154af597f907
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-02-25 08:02:37 +00:00
Robert Loehning
89d36b418a Make Help mode Squish-testable again
Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-22 12:44:54 +00:00
Robert Loehning
38efee1598 Squish: Update __getSupportedPlatforms__()
Change-Id: Ia9840c74528c8fb435099ccdffb2f6f1b06b7e77
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-07 12:48:40 +00:00
Christian Stenger
e17ebc7a6e Squish: Stabilize menuVisibleAtEditor() even more
If the machine fails to correctly initialize the desktop
environment we end up with a rather small resolution which
in turn makes the condition useless.

Change-Id: Idcea7f4e2a5dd265442b5c9d98bf42ed7f01c8af
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-07-22 10:24:11 +00:00
Robert Loehning
cc63b3b47a Squish: Update menu items
Change-Id: Ibbca07fb02092ce829246e99b2365b513b1fa4e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-02 11:15:13 +00:00
Christian Stenger
7c669a06be Squish: Adapt to changed ui
Change-Id: Ibad3b2080040f7345125c549527f22f2c246fbef
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-06-11 13:44:24 +00:00
Christian Stenger
3a97df0f61 Squish: Adapt to changed menus
Change-Id: I8557003bbc94affb018b09e6d5d36cae0f72403a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-06-04 19:53:35 +00:00
Robert Loehning
fd17810e82 Squish: Don't use negative y-position for QMouseEvent
Change-Id: Ib453b41e5906ddf24228b92f8c904b39eea4526f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:04:35 +00:00
Robert Loehning
7c95e17436 Make WidgetTips Squish-testable
Change-Id: I337fdca3541c5b2fb8f09ab2d7721b8950c0bea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:01:01 +00:00
Robert Loehning
aac77eecb9 Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 15:59:08 +00:00
Robert Loehning
7eda08f600 Squish: Directly click mode selector
The tooltip doesn't show up on Windows anymore unless
you manually move the mouse.

The positioning has proven to be stable, so we don't
need to double-check using the tooltip anymore.

Change-Id: I92400d1fa273d4fb6a011cdf00c3b127c06764d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-24 10:50:34 +00:00
Robert Loehning
fd2653bdc2 Squish: Remove outdated error handling
Change-Id: If3bb6f8dd5c79e11139801623f63ce88ea46cf42
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-19 11:58:57 +00:00
Robert Loehning
3e9437d8c5 Squish: Update chooseTargets()
Fixes tst_cmake_speedcrunch

Change-Id: I154647ca2108676b4184170ef121649547c3fd41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:42:34 +00:00
Robert Loehning
46e5d52238 Squish: Update addAndActivateKit
Fixes warning in tst_opencreator_qbs

Change-Id: I82ba025ebc6befd222dd8f47cabcff08ad2e584e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:41:41 +00:00
Christian Stenger
4205134847 Squish: Fix compiler toolchains on macOS
Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-17 14:06:31 +00:00
Robert Loehning
debc304bf8 Squish: Update detection of configured kits
Change-Id: Icade1feffde4a1b252175d8012c411a0a423748f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 12:04:26 +00:00
Robert Loehning
11abdb9ddc Squish: Fix error handling
Change-Id: I896ce824a0c75d47f7b123f80937e81793cc33e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-07 11:08:42 +00:00
Eike Ziller
5c121d5791 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
2020-02-05 11:59:35 +01:00
Christian Stenger
0275e0fa6a Squish: Fix handling of enabling Qml Debugging
Amends 0168a42b72.

Change-Id: I71c32a94fa6de4f64d03c9c73681e30496c2560d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 11:33:52 +00:00
Robert Loehning
72def2c625 Squish: Wait for project parsing after creating projects
There is a new progress bar titled "Updating Locator Caches". The
unspecific progressBarWait() will continue after that disappeared.
Project parsing did not even start then.

Change-Id: Iaa6b7c63ea5669aefa3f34329d8d6e4958ae4eab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-29 14:31:28 +00:00
Christian Stenger
0168a42b72 Squish: Fix tst_debug_empty_main
Change-Id: I5c484a46cf795feee17c200416c4cd303c189774
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-28 12:58:37 +00:00
Christian Stenger
51cc14c738 Squish: Close Link with Qt banner at startup
Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-27 14:38:24 +00:00
Christian Stenger
3573b2db7f Squish: Fix wizard template categories
Change-Id: Ifb26430c429dc41ea73789a210f93b80e0e8d3f2
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-27 12:07:33 +00:00
Robert Loehning
68fbd15299 Squish: Remove old hack for the Mac
Change-Id: I8655b8fe5a1a448995a3798fd587a01919129434
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-21 10:20:07 +00:00
Christian Stenger
ebcde98b72 Squish: Re-enable testing Qt Quick 2 Extension Plugin wizard
This effectively reverts commit 4f2f86b5bf.
Additionally fixes the expected kits for this template.

Change-Id: Ie90f113894d331fa4023b8c58f30da5c4886c76d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 16:01:51 +00:00
Christian Stenger
a08a5499e9 Squish: Fix expected ui elements and page order
The wizard had been transformed to use the
JsonWizard nowadays.
Order of wizard pages has slightly changed to be
consistent with the rest of the wizards.

Change-Id: I841349d3b20dbc03a56a3dc4d15f717d0d21acdb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 15:48:33 +00:00
Robert Loehning
775c78eca8 Squish: Stabilize selectBuildConfig(...)
Change-Id: Iba111e8cbbe652dd488b4dc91c58b92f53eccba3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-15 12:46:13 +00:00
Robert Loehning
cf3772ca77 Squish: Update testing ProjectWelcomePage
Used by tst_session_handling and tst_WELP02.

Change-Id: I28bdececac39719372834c373f82ac9e99beb613
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 05:42:53 +00:00
Robert Loehning
40fb68d18d Squish: Remove outdated comment
Change-Id: I4aeee19ada28ad536994d3b6ec164429b3fc90c4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-29 18:17:46 +00:00
Christian Stenger
99deb21b7a Squish: Adapt verification of kits
Kits are nowadays displayed if configured, but disabled
if they do not fit for the respective project.

Change-Id: If04a20afde2fc1ada643e45d5eea33e6ace7a4f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-24 09:37:12 +00:00
Christian Stenger
cc67ad8736 Squish: Adapt handling for project creation
Some templates got an additional page for handling translations.

Change-Id: I420e4f1bd8be5a30056220abd73b3f9da44d5047
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-21 09:34:20 +00:00
Eike Ziller
4f0ffcecbe Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: Ibd255105a01c53a1f81a1ec7b30495dfef1877a9
2019-10-04 12:19:32 +02:00
Christian Stenger
ea829fa6d5 Squish: Workaround bad focus issue when using Squish
When interacting with the file dialog QC seems to lose its
focus and never gets it completely back.
This in turn makes lots of short cuts useless and (context)
menu entries disappear or being disabled.
Avoid this by explicitly closing the popup of the line edit
if there is one.

Change-Id: I79f86b3133d2d0780d73d75e15416d59f35dfa1e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-02 19:32:00 +00:00
Eike Ziller
ac014e3875 Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: I10a749cca38c2d0929cf4d2b74ab089e14b6157b
2019-10-02 07:32:57 +02:00
Christian Stenger
93e725c17c Squish: Update UI tour handling
The UI tour is no more offered as modal messagebox
but a small banner frame on the bottom.
Close this the same way we closed the messagebox to
avoid interfering tests.

Change-Id: I40ab675330aa8c40efe5bbd386d2d6bd051ccb4d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-01 19:51:45 +00:00
Christian Stenger
17f5e19399 Squish: Stabilize tests that rely on a parsed project
As more and more progress bars might be present for different
purposes and we are not able to easily distinguish them
we need to use a more reliable way to wait for the end of
parsing a project.
Add a respective function and use the new approach where
this appears to be appropriate or necessary.

Change-Id: I20e2b9b0efd4785f8f0b1ddbc8496be111628669
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-01 06:11:42 +00:00
Robert Loehning
2c5d4ef6f8 Squish: Use parameters in some calls to mouseClick(...)
Partially reverts e8727fcae2 for these lines.

Change-Id: I268b1ff337095bd08d3e92c8be57bc2b6e5de8d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-26 14:56:47 +00:00
Christian Stenger
e8727fcae2 Squish: Clean up single (left) mouse clicks on items or objects
Do no more use pixels as offset if we can handle this without.
Clicking on items by using an (x, y) offset will likely fail if
running on a machine with a different DPI setting.

Change-Id: I0e5a4985104bd1d68aadf8c5534583fa1b048edb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-07-25 12:06:05 +00:00
Robert Loehning
c1a83b2a88 Squish: Update lib creation
Fixes tst_APTW03

Change-Id: Ifa1bcf5334773b68b8b0027ca03a016d5ba92cb4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-24 11:58:32 +00:00
Robert Loehning
38685de894 Squish: Update openCmakeProject
Change-Id: I17f1a271eafbcff24987fbd7e31dc6cc8c789b84
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-26 06:58:32 +00:00
Robert Loehning
d1d7a488d9 Squish: Update GuiAppWizardDialog
Change-Id: Icdcab66e4d3a231286607a32ba8ce66d47741442
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-25 10:48:21 +00:00
Robert Loehning
3959a4db14 Squish: Update verifyBuildConfig
Change-Id: I090957fc1a1af0d08714ad9d51d2873fa097b728
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-13 11:22:39 +00:00
Eike Ziller
e23ebfbd20 Merge remote-tracking branch 'origin/4.9' into 4.10
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id73301c82c4ba50e0a886e850da2c92bbeed4dc3
2019-06-03 10:46:09 +02:00
Christian Stenger
6505799c44 Squish: Remove unused functions
Change-Id: If53390d65b9013c42f7dcf5834b4caee2bcb8766
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-05-29 04:48:26 +00:00
Eike Ziller
4704f49fbb Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp
	src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp
	src/shared/qbs

Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
2019-05-28 14:01:01 +02:00
Robert Loehning
9956d8d461 Squish: Update tst_qtquick_creation
Task-number: QTCREATORBUG-20056
Change-Id: I5a7e239b9c65b32e2bc57dd594cc96bdda94b472
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-20 16:30:38 +00:00
Robert Loehning
fc8dea8830 Squish: Remove unused workaround code
We have not been using this for more than a year.
Instead, we seem to prefer having workaround code inline.

Change-Id: I37066f359eac5eda62c9c9acfcae3b89f980d024
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-20 16:15:41 +00:00
Eike Ziller
829a08047f Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628
2019-05-17 12:47:24 +02:00