feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
55,875 Commits 108 Branches 368 Tags
ae01fe7c42ee84d19fb788ca9711a66a9787ca92
Commit Graph

1324 Commits

Author SHA1 Message Date
Christian Stenger
dfdfff2148 Squish: Fix expected string 
Capitalization has changed.

Change-Id: Icbfa295beab27c1cfb2ec1ae6198784f134563a6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-06-22 10:50:17 +00:00
Robert Loehning
7a14654a2a Squish: Remove workaround for fixed bug 
Task-number: QTCREATORBUG-20057
Change-Id: Id308fed4ec83c7aa89b822f00174a1e9ed2a0764
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-19 12:48:20 +00:00
Robert Loehning
c91dde79d5 Squish: Update object for tst_HELP05 
Change-Id: I0a38ed35061000591b8078ef534c2996809aeb58
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-08 05:29:20 +00:00
Robert Loehning
9cb1700993 Squish: Use built-in code model in tst_APTW01 
The warnings from ClangCodeModel confuse our build check.

Change-Id: Ic6b82bb304387f447bdf8eb0b2fd02dd2f250fb2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-05 09:08:47 +00:00
Robert Loehning
35eabd7d40 Squish: Explicitly disable ClangCodeModel for testing built-in 
The ClangCodeModel is the default now.

Change-Id: Id432cc9d27dcf7327c0b7efeba7004521d25fee5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-05 09:08:20 +00:00
Robert Loehning
2fb270c77f Squish: Update tst_simple_analyze 
Change-Id: I2cbe39a225760f53d70487e105e2b45fd4e16d33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-04 11:24:10 +00:00
Robert Loehning
149a77a01d Squish: Handle third kit state 
Change-Id: I3442cf7676b7f316a60344b9c7dfc2d777529785
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-04 11:23:51 +00:00
Oswald Buddenhagen
c065ea9326 Merge branch '4.6' into 4.7 
Change-Id: Ieddac600af64f3b278340c4e3555cee0f4190bcf
 2018-06-01 12:30:28 +02:00
Robert Loehning
2a3bfea8a9 Squish: Update for changed Options dialog 
Change-Id: I823e88e80a00079dbf0a2cbdfd72973d44001063
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-01 09:25:16 +00:00
Robert Loehning
c908a52628 Squish: Update to re-uploaded text 
This should not expire after another year.

Change-Id: I86ed49d491f619509e6bd32fc2624df2a1c24f5f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-29 11:43:58 +00:00
Eike Ziller
c1c57f0c38 Merge remote-tracking branch 'origin/4.6' into 4.7 
Change-Id: Ifddceb06f377ea428300fa8a48908cfc44b98705
 2018-05-28 16:07:00 +02:00
Robert Loehning
3fa66ca6e0 Squish: Remove outdated code 
Creator requires Qt >= 5.9

Change-Id: If63c12b354d8b89de3f70e8be924428812d3b2bd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-24 10:04:48 +00:00
Robert Loehning
e8586c8d12 Squish: Configure Qt Creator projects on Qt 5.10 
Task-number: QTCREATORBUG-20056
Change-Id: I0d12747ac9510fbab2cbe1e751d3613608a07053
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-24 10:01:56 +00:00
Eike Ziller
2278ebed1e Merge remote-tracking branch 'origin/4.6' into 4.7 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp

Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18
 2018-05-14 09:44:43 +02:00
Christian Stenger
9c1f47399e Squish: Stabilize selectFromLocator() 
Calling it several times inside the same run results in
unexpected behavior. The list of items inside the Locator
gets filled asynchronously, so give it a chance to populate
before trying to click something.

Change-Id: I542a9fda37ae09e98e496d12a40d507a040bb247
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-05-09 08:51:15 +00:00
Robert Loehning
1ac527d8f6 Squish: Don't configure Windows firewall when we don't need to 
Task-number: QTCREATORBUG-20316
Change-Id: Ibec253f15a39dc22ab8bd1693eab38b0ab7b44fb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-09 08:46:39 +00:00
Robert Loehning
5a54a813d3 Squish: Remove code for querying information about Qt 
Task-number: QTCREATORBUG-20337
Change-Id: Ib99d3bb45297b766ac1797a2a364350d96ce0056
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-08 09:06:02 +00:00
Robert Loehning
06c2e69301 Squish: Use Locator instead of menu hack 
Change-Id: I4e84a52fb6ad4c93ef53bb1a17639fd8b263b987
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-08 09:05:25 +00:00
Eike Ziller
4749a919a6 Merge remote-tracking branch 'origin/4.6' 
Change-Id: I9927fdff4c7e73c703757852a3f3cf79444e3cb6
 2018-05-02 15:22:16 +02: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
Eike Ziller
62050437c3 Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

Change-Id: Ia723411f4b5c9c90f9786223ac6a7346d7ab9b99
 2018-04-26 10:16:32 +02:00
Robert Loehning
da47a92611 Squish: Update Options dialog 
Change-Id: Id0133ac1a52ae46add284252fe024075a79575c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-24 08:56:14 +00:00
Robert Loehning
1e31683b7d Squish: Update expected tree after removing WebEngine 
Change-Id: I097dce55361027acc459070ac750610ec80fa6c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-20 12:27:44 +00:00
Robert Loehning
db9922a5bf Squish: Fix expected compile error message 
Change-Id: I37d9ea1cdbe21151f8f06cb53851143bbd2c3d6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-20 08:45:49 +00:00
Robert Loehning
64b6cb88b0 Squish: Flip bool to its correct meaning 
Change-Id: I8de704ca3086789a7c8bcb787e678ba10c42ca9d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-20 08:45:31 +00:00
Robert Loehning
038e214f90 Squish: Fix timing issue in tst_HELP04 
Change-Id: Ib69429f9288fb767186c61e913a29fc75ddc4498
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-20 08:44:07 +00:00
Robert Loehning
356a2fd855 Squish: Update tst_HELP04 for current Qt versions 
Change-Id: I944f824807d47bcfaf9cabd2b15b678d858db15f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-19 14:06:34 +00:00
Robert Loehning
0e216fda3e Squish: Don't expect WebEngine or WebKit 
Change-Id: Ib44d0c7671b016c27e33ffd66e4797be37523ca3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-19 14:06:03 +00:00
Robert Loehning
d57ab7f6b9 Squish: Update tst_HELP04 for hidden "Search" button 
Task-number: QTCREATORBUG-20295
Change-Id: Idada7f86088946ecddd69c0ac10656c202d4f566
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-19 11:36:45 +00:00
Christian Stenger
cc0c7f2ccd Squish: Fix provided test settings for macOS 
Change-Id: Idec36e178d448015efa6d0ff73a4d17eba6ba76e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-04-18 11:57:20 +00:00
Robert Loehning
bb0358cc68 Squish: Add expected error message for MSVC2015 
Change-Id: Id1ace17486af21c4c0786859178c3a82d6e05145
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-18 05:49:28 +00:00
Robert Loehning
3eeaf965e8 Squish: Fix property name in tst_WELP03 
Squish 6.2 still accepts both property
names but Squish 6.3 is more strict.

Change-Id: I390af974425242d1f766853b80870dcb1948ef92
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-17 11:57:39 +00:00
Christian Stenger
d21c508b0a Squish: Remove dead code 
Change-Id: Ic24c9db0b923409026d92b87b246694dde8968db
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-04-17 11:52:48 +00:00
Christian Stenger
8771054060 Squish: Check also for expected clang on macOS 
Change-Id: I32d7f5ebf02a559ca854553536874c6ec68f0ec5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-04-17 04:55:48 +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
6a62717271 Squish: Update tst_designer_goto_slot for Qt>=5.10 
Change-Id: I29b3788f2daed5ca27069cc8ab9d972bdcee3c02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-13 11:44:42 +00:00
Robert Loehning
12398a4abe Squish: Remove duplicate code 
Change-Id: Ic852f3438fac9cdc38b53509daaa592ac0688648
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-04 13:33:12 +00:00
Robert Loehning
1aed2b06de Squish: Stabilize tst_CSUP04 
Change-Id: I2e036e401253f1f2cfe29efdbeedf9a51491d0ef
Task-number: QTCREATORBUG-20140
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-04 13:27:00 +00:00
Robert Loehning
fad75a3d56 Squish: Update tst_rename_file 
Creator only selects the filename now, the
extension will be left unchanged by default.

Task-number: QTCREATORBUG-20057
Change-Id: I66bbbb5b95e1d487c2087efa596a87a240721e44
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-03-15 14:09:50 +00:00
Robert Loehning
24db24734d Squish: Open example from Qt 5.6 in tst_qml_editor 
Change-Id: Ibd5bd516d8409fa5389da3e330d6723ba772f135
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-03-15 11:19:35 +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
38326b1811 Squish: Skip tst_opencreator_qbs 
Change-Id: I0935a52f5b58c444bd6dd66cc9d93301444f0157
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-03-14 10:46:42 +00:00
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