Commit Graph

123 Commits

Author SHA1 Message Date
Robert Löhning
95df308bc3 SquishTests: Remove compatibility code for Python 2
Change-Id: Ibcf9a76fb163aa7167ad0ef0616c39b33c30d7c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-10 07:30:00 +00:00
Christian Stenger
ac4aaf5e23 SquishTests: Some Python3 adaption
Makes some tests succeed and lets a couple of tests get further
on macOS.

Change-Id: I9a3f124c094e67f51748ddae47d00897fe5259d5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-27 04:36:30 +00:00
Christian Stenger
5c4cf2d018 SquishTests: More adaption to changed wizard template
Change-Id: Ib073a8eae3ee87dc46699083799a8316da66b32d
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-23 12:51:08 +00:00
Christian Stenger
3a7ab3ce8e SquishTests: Rename helper class
Change-Id: I39890cbd98b7e6ebcc0fdf4722d0311eb6650397
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-23 12:50:56 +00:00
Christian Stenger
15ca3268ad SquishTests: Provide Qt6.2 for testing
Long overdue. Adapt Qt Quick related stuff as this nowadays
is requiring Qt6.2 as a minimum.

Change-Id: Id1e727813034044edb4584c6d5f73a56310293d2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-16 14:07:44 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Robert Löhning
698a495972 SquishTests: Use existing function saveAndExit()
Change-Id: I2e10de8b454a69b3e4ade7520b4fa00415bcde42
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-15 14:45:42 +00:00
Robert Löhning
c72a93599d Squish-Tests: Use QTC_DO_NOT_PROPAGATE_LD_PRELOAD
This is a reaction to an change in Creator's handling
of environment variables. Creator now passes on
LD_PRELOAD set by Squish. This results in build errors
and crashes of started applications.

Change-Id: I39cf21c60a474d7453e9c29fd3eaf32d3f0d6806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 19:20:07 +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
Christian Stenger
c294df1d3a Squish: Skip a test
Wizard nowadays expects a Qt version we do not provide by
default.

Change-Id: If0f2b3aa5755a549bd63fc258fd78b1a40337a8a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:51:36 +00:00
Christian Stenger
1f12b3444e Squish: Adapt to removed wizard templates
Change-Id: I56b0bd7000fdc73cce759ca743da543ecc715453
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-12-08 13:20:50 +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
Tim Jenssen
453f4996db use "qml" as QML runtime
Since Qt 6.2 qmlscene is deprecated by Qt.

This patch also removes QMLViewer as a last
QtQuick 1 artifact in external tools.

Task-number: QDS-639
Task-number: QDS-4535
Task-number: QTCREATORBUG-22385
Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-13 15:38:46 +00:00
Christian Stenger
311ed87e30 Squish: Remove handling for closed bug
Change-Id: Ib78d62620b45458ebaddc3d0e8575ffe9be093db
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-06-08 11:28:26 +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
Christian Stenger
9a1135776d Squish: Adapt to changed build menu entries
Change-Id: I0b9ceb8024e42960a2b915ed5e59ae5d33fa4207
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-29 06:12:29 +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
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
97ae2d1ac0 Squish: Fix and update tst_qtquick_creation3
Task-number: QTCREATORBUG-20056
Change-Id: I8b0980e423c2bf8921f615d04769d91c7e660dd3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-05-08 13:14:02 +00:00
Christian Stenger
445b7a6242 Squish: Mark test as expected fail
Task-number: QTCREATORBUG-21335
Change-Id: I54148ecf746362a22bf739ef80930a40bb6da2fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-11-30 11:19:02 +00:00
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-05 09:24:18 +00:00
Christian Stenger
8c1a2eb2c0 Squish: Fix passing argument to helper function
The code of the helper function has changed and what worked
before by pure coincidence now fell apart.
Passing a list to a function that tries to use it as a key
for a dict results in an exception as lists are not hashable.

The code is likely to change by adding a newer kit. This patch
just makes the current state work without crashing instead of
adding functionality that is not yet used.
Amends aed1616b35.

Change-Id: I6e8a6490988700de14596ba981b5e6900133a79d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-08-10 10:39:47 +00:00
Robert Loehning
ff10f8c3a5 Squish: Fix warnings
Warnings from static code checks, that is, not test.warning() at runtime.

Change-Id: I651d13491106583908059ecdb5f700f539b6d9c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-06 14:21:30 +00:00
Robert Loehning
e8acb75115 Squish: Refactor selecting configured Kits in project
The design of the Projects mode changed several times. We wrote lots of
workarounds to keep even more old code alive because we never had the time
for a proper refactoring. This time is now.

Leads to more stable code with far less variables flying around.

Task-number: QTCREATORBUG-20265
Change-Id: I29e5956ea3279cdb1d6da61bf5b461666de436bc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-02 11:48:14 +00:00
Robert Loehning
c5511de338 Squish: Remove hooking into subprocesses
It worked well but the maintenance burden turned out to be too much.

Task-number: QTCREATORBUG-20055
Change-Id: Ic8663f808c50ca9fb17d52b6bc6c72baf7503358
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-05-02 09:51:05 +00:00
Robert Loehning
fdc4ac41d9 Squish: Replace Qt 5.3 kit with Qt 5.10
This patch just changes the minimum for replacing the kits while
keeping the tests running. Further updates to the tests should
be done in separate patches.

Task-number: QTCREATORBUG-19440
Change-Id: I25ce60ad0a47678dba4352a4b2601ca1cdd4741d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-16 14:15:11 +00:00
Robert Loehning
139d64615e Squish: Revert workarounds for fixed bug
This reverts commits 47355608db
and 6cc61be23b.

Task-number: QTCREATORBUG-19717
Change-Id: I052ff84ab33a5c483c11b66eaf55a175cc34c28d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-14 10:47:03 +00:00
Robert Loehning
6cc61be23b Squish: Update tst_quick_creation3
Qt 5.3.1 used to be selected automatically which was wrong when the minimum Qt
version is 5.6. Now, because of QTCREATORBUG-19717, this does not happen
anymore.

The kit using Qt 5.6 should be selected automatically, but since we explicitly
do this, the end result is correct. When QTCREATORBUG-19717 is fixed, we
should not need to select a kit ourselves anymore.

Change-Id: I446b2843cd6e545905ce3a6616f7f8d3204bbafe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-20 18:20:19 +00:00
Robert Loehning
a4ff3423e9 Squish: Update Qt version names and constants
As a preparation for using Qt 5.10, these
need to handle two-digit minor versions.

Change-Id: I2a47606ee801a28df12d75323b480f8ee583893b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-22 12:30:49 +00:00
Robert Loehning
89d08bf4b2 Squish: Update createNewQtQuickApplication() and calling code
This is only meant to let the wizard finish successfully. Further
changes will be needed because of changed code in the project.

Change-Id: Ic88ffa107f15c55b3278d3d6fc4d3c2dbc4d728b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-13 13:17:13 +00:00
Robert Loehning
1e3b5418ea Squish: Update createNewQtQuickUI() and calling code
Change-Id: I117afaabd0baf6074247c55b66d8d302b9dbfd34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-12 09:37:59 +00:00
Christian Stenger
1ffd752e02 Squish: Fix suite_qtquick
* adapt category label to expected
* adjust to removed library wizard

Change-Id: I799882c9c7557c5d7f4c36fb4d2198f8e586b435
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-10 12:48:43 +00:00
Eike Ziller
cec29f34ea Merge remote-tracking branch 'origin/4.2' into 4.3
Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
2017-03-09 12:14:55 +01:00
Christian Stenger
d301824886 Squish: Adjust tests that use Qt Quick UI wizards
Qt Quick UI had been slightly renamed and Qt Quick Controls UI is
gone.

Change-Id: I990af2bc83513ad8d85838b037e79dc88bbfdb73
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-03 12:40:38 +00:00
Robert Loehning
f78327a571 Squish: Use list instead of bitfield for kits
Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 12:32:36 +00:00
Christian Stenger
9d328ef1a9 Squish: Fix adding new kit
Projects view has changed and so has functionality of adding a new kit.

Change-Id: I44377822b8b850fd17be24e12f7e5d0104be568d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-01-06 05:51:59 +00:00
Robert Loehning
bde4362dad Squish: Replace Qt 5.2.1 kit with Qt 5.6.1
Change-Id: I5865024f55a68bc2860f5b8b0b7c9c37775cc122
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-27 10:07:14 +00:00
Robert Loehning
a7933e9372 Squish: Use example from Qt 5 in tst_qml_outline
Task-number: QTCREATORBUG-15469
Change-Id: Ib719e31e53f23a51c4971a53eaa870f4833ef748
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-19 09:20:44 +00:00
Christian Stenger
76781b40a7 Squish: Adapt suite_qtquick to 4.1 changes
Change-Id: Ic1d178820a3c2b6ce61f9e4fc424bc701eca87e5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-06-29 12:39:24 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 16:01:06 +00:00
Robert Loehning
f8afdf06bb Squish: Check for QML runtime errors
Change-Id: I5b5d854a8bbadfbd4076af1cfdd3e356d763da29
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-10 09:42:26 +00:00
Christian Stenger
9cb59772dc Squish: QmlProjectManager is re-enabled by default
Change-Id: I91e12547843053c5de5ab5bd1af88977e937f80e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-07-09 13:53:32 +00:00
Christian Stenger
b78e3e7ff5 Squish: Fix suite_qtquick
Change-Id: Ibafa3d9871ba95ada52a270a018ce7a5106db312
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-07-09 13:53:14 +00:00
Robert Loehning
54438b21aa Squish: Removing Qt 4.8.0 MinGW kit
Change-Id: Id88c715ee294e337600a5b41abd79569b11eddbf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-26 13:21:45 +00:00
Eike Ziller
45e544b442 Merge remote-tracking branch 'origin/3.3'
Change-Id: I79fac4a4e8535153da1b3f73a6b1caad1513ea9c
2015-02-16 12:35:54 +01:00
Robert Loehning
0352e54253 Fix copyright headers in Python files
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-13 16:52:03 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
2015-02-12 17:29:21 +01:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Christian Stenger
f515a2528e Squish: Enable QmlProjectManager plugin for tst_qtquick_creation3
Change-Id: Idaa2a603f5945a4df249f9b6ce606769a5c7ea74
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-12-16 07:19:39 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00