Commit Graph

1282 Commits

Author SHA1 Message Date
Robert Loehning
0c11cee246 Squish: Use example from Qt5 in suite_CSUP
Change-Id: Ib983af58c9797b8598f3e115112ebcb18dee0276
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-02 10:03:24 +00:00
Robert Loehning
47355608db Squish: Add workaround for opening qmlprojects
Task-number: QTCREATORBUG-19717
Change-Id: I3e3b11785154d5c2c20b68ca0091510d1a77ae04
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-28 14:25:53 +00:00
Robert Loehning
2c89829de4 Squish: Update suite_WELP
Change-Id: Icc3169a8af007fb1d42aa44acfd97b02e0d01220
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-28 12:41:55 +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
Ulf Hermann
13ba063696 QmlProfiler: Fix translations and tests for statistics view
The statistics view is not called "events" anymore.

Task-number: QTCREATORBUG-19658
Change-Id: Iff4375d3dc0cf5d82d118244698887818f924c07
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-01-26 11:26:48 +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
Eike Ziller
cff2cc90e2 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
2018-01-09 13:13:00 +01:00
Robert Loehning
b1239d6c4c Squish: Remove outdated workaround
This reverts commit dbfbe1d65d.

Task-number: QTCREATORBUG-19523
Change-Id: I443c1bbed42f9aa96593b66a6b135bd6df35447d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-09 10:12:17 +00:00
Robert Loehning
dbfbe1d65d Squish: Rename project while this triggers bug
Task-number: QTCREATORBUG-19523
Change-Id: I468c5fe0af07b1875b45de8a1fd32da23208f6a0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-03 10:16:37 +00:00
Robert Loehning
bada98379d Squish: Remove outdated workaround
Task-number: QTCREATORBUG-18290
Change-Id: Iddf51cc9655d24c866d3887afc4be6291768087d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-03 10:15:50 +00:00
Oswald Buddenhagen
777ca8e655 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
2017-12-21 13:20:24 +01:00
Robert Loehning
b64c1a96b8 Squish: Update WatchTreeView object
Change-Id: If999647727155dccc087d9d22f3b68d2b1661351
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-19 14:08:45 +00:00
Christian Stenger
8187c6a146 Squish: Assign custom name to distinguish main tabbar from others
If the settings dialog contains more than one visible tabbar when
trying to access its tabs Squish fails to distinguish them.
Assign a unique name for the main tabbar of a category inside
the settings dialog.

Change-Id: I349b480871306784b5adc9858984933dc26d7958
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-12-15 13:53:45 +00:00
Robert Loehning
7ded6bef30 Squish: Skip "Extract Function" with clang on Windows
Change-Id: Id98d630babff10fe0def36aa895f70587852036b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-14 14:52:21 +00:00
Robert Loehning
bd8027d232 Revert "Squish: Update expected line in tst_simple_debug"
...because the project template was changed once again.

This reverts commit fe5249c401.

Change-Id: Ie7940c4dfa98ed71d8c1e937c087918f9157cbfd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-13 14:36:42 +00:00
Eike Ziller
469edcdde3 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa
2017-12-12 10:53:51 +01:00
Robert Loehning
aaa65375f9 Squish: Remove some more expected lines from tst_opencreator_qbs
Change-Id: I2b56b24044e0c057dbe5aff1b7f9a1fdcfdeb6c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-12 09:19:24 +00:00
Robert Loehning
5ca3f52b4b Squish: Fix property name
...to the correct capitalization. Squish < 6.3 could
handle both, whereas Squish >= 6.3 is more strict.

Change-Id: I9864518e21d3f2ed44fe7527f75aa958dc0081de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-12 09:19:02 +00:00
Eike Ziller
a2739f55ed Merge remote-tracking branch 'origin/4.5'
Change-Id: Ic7c16091268083c0426cf29f0691a7ee458f2bd9
2017-12-07 09:16:01 +01:00
Robert Loehning
2427f1267f Squish: Update combos for creating projects
Change-Id: Ibbabacc7a5e357ac765ef8629e74ca2e05505078
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-06 13:21:15 +00:00
Robert Loehning
1f6d2e067e Welcome: Use https-links
Change-Id: I6eec438e5c881da8e6946b3d167e1e71f49ba574
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-12-06 10:02:00 +00:00
Christian Stenger
2c93654e58 Squish: Improve testing of Welcome page
Verification of URLs used for "link labels" on the Welcome page
is now possible again.

Change-Id: Id48ab40201a9c2a60dc3c991052f45bee93707bc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-12-05 11:08:09 +00:00
Robert Loehning
fcea6ceba6 Squish: Partial fix of tst_opencreator_qbs
Change-Id: Idaa228e4efcdac05e72932ed95c410af8a7bc80f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-01 10:22:06 +00:00
Robert Loehning
fe5249c401 Squish: Update expected line in tst_simple_debug
Project template changed again.

Change-Id: Ibd2767719e13e3de041e63e0977d838aa6c34f3c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-01 10:20:43 +00:00
Robert Loehning
09f0d1a2ca Squish: Stabilize tst_HELP05
Change-Id: I9296dc577fac4ea06c7c8f482a44948ba327568f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-30 13:20:44 +00:00
Robert Loehning
f9c0069903 Squish: Update test for sorting
Change-Id: I79a68377425b3596ec25c98e12c46ed59d439249
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-09 15:49:32 +00:00
Robert Loehning
84c0390bdc Squish: Update Creator's sources to v4.4.1
Change-Id: I95ba4de5ec0148b602d91b684dabc09e954d52ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-08 16:47:39 +00:00
Christian Stenger
38d307ffb8 Squish: Adapt test to improved compiler detection
QC now finds some more compilers.

Change-Id: Icbf8d29a24c3360d2d7d8ed73011f705dd156aa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-19 10:28:56 +00:00
Christian Stenger
fb4f66927d Squish: Adapt tst_HELP05 to changed template
Change-Id: I03973193b2a705af632fd8978b37873bde51006f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-18 04:56:11 +00:00
Christian Stenger
c4ec04d254 Squish: Adapt QMLS suite to changed template
Change-Id: I43fcb9a47759025c4da2d2fba75c4fa05d1dc340
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-18 04:55:20 +00:00
Christian Stenger
e33d0cb1d0 Squish: Adapt Qml indentation test
The used Qml file template has changed.

Change-Id: I594c77f05ac51a49afe2498d61aea54abd5b8677
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-18 04:54:57 +00:00
Robert Loehning
6d919cd85a Squish: Stabilize tst_simple_analyze
Change-Id: I3875451ee263a97f0919f08c96318502b49922f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-29 13:25:58 +00:00
Robert Loehning
cf370d5305 Squish: Update debugger tests
The used project looks a little different now.

Change-Id: I786749a4aae5d2ceaff0d2fc65aedf41c04a66f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-26 10:25:49 +00:00
Robert Loehning
5b94c3730b Squish: Update tst_SCOM02
...for changed QML file in project template.

Change-Id: I3a0999650bffc35bc09d0f8ae92a33b80ac90474
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-25 09:33:26 +00:00
Robert Loehning
9afe6fa1c4 Squish: Update texts of message boxes
Change-Id: I3ca17bb62201d6271c0e98d07a99f7344faba439
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-19 12:04:54 +00:00
Eike Ziller
3d9cf954e2 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
2017-09-19 12:10:26 +02:00
Robert Loehning
b58dadfecc Squish: Enclose code model tests in sections
Change-Id: I4478acfc5ea7b3fa22d1cd17576e04fdda81dbb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-19 09:44:08 +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
9690337f47 Squish: Update expected tree for tst_cmake_speedcrunch
Needed since 3bb3f4af56
filters out duplicates.

Change-Id: If7e56914feb9d22c1620822fbb363b55b894a41a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-12 12:20:10 +00:00
Christian Stenger
6d0c167ba7 Squish: Update language test
Danish and Ukrainian had been added a while ago, so add them to the
list of languages to check.

Change-Id: I92c507e3a567efa39d7295559af0fb16bbcd1bb6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-09-12 09:53:30 +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
Robert Loehning
40e90cb8be Squish: Update expected combo box in tst_WELP01
Change-Id: I35f40a637a6914bea2057b951409b21b7ce90c8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-08 11:47:26 +00:00
Eike Ziller
a9aac73e37 Merge remote-tracking branch 'origin/4.4'
Change-Id: I53a31b3463b2bd8efffb1c00e5d172854d8ff5e5
2017-09-08 13:06:07 +02:00
Christian Stenger
85e656b041 Squish: Workaround Squish issues when using nativeType
When using nativeType() Squish sends single key press events for
any char to type.
nativeType() does not wait until these events have been processed
which leads to complete useless time measurings inside
tst_tasks_handling as timestamps are taken too early if nativeType
had to be used - which happens when a native FileDialog is used.

Change-Id: I446de898fd99b2e169ca39bef1adb4306d6ee530
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-09-07 12:47:44 +00:00
Robert Loehning
f98731b81a Squish: Update tst_create_proj_wizard
Change-Id: If6c85dab873fac694e3d0bea3ff65cbb08618f4d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-06 13:50:00 +00:00
Eike Ziller
c2ef4b52d3 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I9620928b431cefa995a06db85ecfcb92f225f732
2017-09-06 12:19:18 +02:00
Christian Stenger
b381418476 Welcome: Squish: Assign object name to fix Squish tests
Latest change of adding QScrollArea around Welcome's sidebar made
the objects lookup fragile. Using the QScrollArea inside Squish
tests helped for some but not all lookups.
Simplify the lookup by assigning an object name.

Change-Id: I5f37ee69bf20eaf02c9717cbaa5ba541d8ffbc17
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-09-06 07:09:35 +00:00
Eike Ziller
3543bd5d1a Merge remote-tracking branch 'origin/4.4'
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I7881fc51021c49b792a384ad9f8a4f71fc457ce2
2017-09-04 16:12:34 +02:00
Robert Loehning
5f7636254a Squish: Store text of item as early as possible
It seems that item.text can change after (not during!) the
double-click. Storing it earlier to workaround this problem.

Change-Id: I5da4ae7ea8e19b945e56349c2236940a9e5731cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-01 05:04:19 +00:00
Eike Ziller
696a978942 Merge remote-tracking branch 'origin/4.4'
Change-Id: I5b12586086297b57e250bbbd9c94818623ad33f9
2017-08-30 14:49:19 +02:00