feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
46,254 Commits 108 Branches 368 Tags
43193ea45b56764ca558965089648b62b51f9e7c
Commit Graph

1074 Commits

Author SHA1 Message Date
Eike Ziller
33210099f1 Merge remote-tracking branch 'origin/4.0' 
Change-Id: I9793f0f9019b16f3725c5a9708a5ccf81557cdc6
 2016-06-03 09:50:43 +02:00
Robert Loehning
79623d5774 Squish: Base getPaths() on new path functions 
Change-Id: I54cd03bc1d24b715df15de37291f776f9867416f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-02 09:35:16 +00:00
Christian Stenger
b04b5e5d75 Squish: Provide functions for getting paths inside Qt installation 
Change-Id: I273304f0c6d451d28a256c99588479525eef95e4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-06-01 14:50:25 +00:00
Robert Loehning
4117ba7313 Squish: Replace remaining shell usages 
Change-Id: Id7c2c1a17fed053f2e8601fc4c7716705e260431
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-31 14:52:17 +00:00
Eike Ziller
73bb92c5a6 Merge remote-tracking branch 'origin/4.0' 
Change-Id: I89c52ca2145a43c94d3366367ba72fde605dd577
 2016-05-31 12:02:13 +02:00
Robert Loehning
7d51d3849a Squish: Silence more warnings 
Change-Id: I6259382a2359a795654a6d6536112c090ede130f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-31 09:15:35 +00:00
Christian Stenger
0e331a2e29 Squish: Adapt to changes in Quick Application template 
The template has slightly changed in 6b506b34ec.

Change-Id: Id58e67beacaac046c6dd235b715f360dc7ef4c09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-30 12:35:39 +00:00
Robert Loehning
7e9aa9c908 Squish: Silence warnings in tst_default_settings 
Change-Id: I668cc7b1fcb569b50d2178fe792f566721c9d4d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 10:40:12 +00:00
Robert Loehning
c1e7cf84e4 Squish: Do not use shell in getOutputFromCmdline 
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 09:13:04 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0' 
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
 2016-05-27 12:01:36 +02:00
Christian Stenger
e564abdd9a Squish: Use more stable subprocess code 
Change-Id: I9a895831f9d57562a9eeb8491cc7f46c1da2eba1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-27 04:35:49 +00:00
Christian Stenger
a00a73a74d Squish: Fix expected failure in tst_SCOM04 
Change-Id: If09e33b616356e0f0eb5aa37c035acaf2c2adaac
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:54:44 +00:00
Christian Stenger
2b57a1afa6 Squish: Fix handling of context menu on OSX 
Change-Id: I6f5d50eca0199826e8af0f11016a1dfeb924f046
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:31:25 +00:00
Christian Stenger
1f1a9e5870 Squish: Fix expected sort order 
Change-Id: I882ad3633f7cf827aea086b5f5fd2a9204eeb482
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:07:47 +00:00
Christian Stenger
3b820cc9a4 Squish: Fix tst_installed_languages on OSX 
Change-Id: I470047d663ec4c2bfebaa17baf67bc811d9c0c65
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:06:15 +00:00
Robert Loehning
b2f869c411 Squish: Test code model's reaction to decimal separator in float 
Must not be interpreted as member access operator.

Task-number: QTCREATORBUG-16188
Change-Id: Iec252fbc63899cef5b004a5770e3ebee5af7188e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-26 11:48:03 +00:00
Christian Stenger
91d7886313 Squish: Fix tst_designer_edit on OSX 
Change-Id: Idabdd1577373636d9b39c83447febdf4da7b04f1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 11:31:15 +00:00
Christian Stenger
b1e9290b73 Squish: Raise some timeouts a bit... 
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 05:08:23 +00:00
Robert Loehning
80ef8d11f9 Squish: Handle failing startApplication() without ClangCodeModel 
Change-Id: Ic50939219c8dcf2b04423d99d0d5021de8f26afc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-25 15:34:38 +00:00
Robert Loehning
0e299cbd0b Squish: Expect failures in tst_memberoperator on Windows 
Change-Id: I582109d104816545c804340c7e0d4dbe343d55f3
Task-number: QTCREATORBUG-16336
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-25 15:30:57 +00:00
Christian Stenger
0aff733a91 Squish: Stabilize clickOnTab() on OSX 
Change-Id: I984a6a2012668e0b0095b2118b9d7001c7cda616
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-25 04:41:31 +00:00
Robert Loehning
6a74d8cad1 Squish: Fix suite_SCOM for Qt 5.5 
Change-Id: Iea47ca2c74a6ac2287aee26418636abcb748a5d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-24 11:36:17 +00:00
Christian Stenger
c9dac0fa61 Squish: Raise waiting time when using FileDialog on OSX 
Necessary especially when trying to open big files for which the
system file dialog of OSX is creating a preview.

Change-Id: I6d352b78f76571fbb7224902b05e228d584c443a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-24 09:59:13 +00:00
Eike Ziller
ec231b5910 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/plugins/valgrind/valgrindruncontrolfactory.cpp

Change-Id: I96c0f8cc3b49f8f55f45ef1f839857f878f532f4
 2016-05-18 12:12:46 +02:00
Robert Loehning
8c8ed3294f Squish: Raise timeout for help content 
Change-Id: Idc53e974a271d0c833ca8371c9a65b0c6d98c45c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-18 08:43:45 +00:00
Robert Loehning
990e2a83ca Squish: Fix tst_HELP02 
We don't just need any items in the model,
we need an item that passes the filter.

Change-Id: I831a8a2d4ba27c838e7ea07625d066a19946a789
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-17 13:11:31 +00:00
Eike Ziller
6efd8e33e2 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I6217662f0c51d04a83f7a85dc5d7c7f25e78e09a
 2016-05-13 16:24:37 +02:00
Christian Stenger
1914329ec2 Squish: Fix tst_HELP02 
Content of the QHelpContentWidget gets populated asynchronously,
so wait a bit to have at least one entry - which normally should
be our own documentation.

Change-Id: Iad78f0bab0dd7f2f5a83cd94d2b2830ba146f554
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-13 11:36:55 +00:00
Christian Stenger
dbfa9280b0 Squish: Fix assigning shortcut 
Change-Id: I32d563a198ec1e56b86e97f6803dd2e15f1bd565
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-13 11:26:43 +00:00
Christian Stenger
07ba87349d Squish: Fix accessing Options on OSX 
Accessing the application menu inside the menubar of OSX
does not work properly since using Qt5.
For some time using default keysequences worked fine, but
for the Preferences (Options menu) this stopped working,
so make the used hack even more crude.

Change-Id: I48ed37dc69b8c64f649f0130d48d4deb02afb87e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-13 11:08:06 +00:00
Christian Stenger
53770ebaa5 Squish: Add some verbosity to figure out what might be wrong 
tst_HELP02 is consistently failing if running from inside Jenkins,
but passes when executed locally.

Change-Id: I70fe9b7dc74dbf82f102b5670ddf04bf0dbfa270
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-12 12:40:49 +00:00
Eike Ziller
ee8bf341c6 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
 2016-04-20 14:58:48 +02:00
Robert Loehning
9e63807134 Squish: Remove workaround for fixed bug 
This reverts commit ca66ad3d0c.

Task-number: QTCREATORBUG-15806
Change-Id: I2e81aa5c0fe014be6dda32b326ab3d4a1bfd9600
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-15 13:19:59 +00:00
Christian Stenger
532cd88dd7 Squish: MSVC2015 and Build Tools are supported... 
...so, expect them if they are present.

Change-Id: I333bba81717d44431857a543540e5599e2de7fed
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-15 12:08:58 +00:00
Eike Ziller
5c87432260 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
 2016-04-12 11:34:46 +02:00
Robert Loehning
ca66ad3d0c Squish: Expect missing breakpoints in qml 
Task-number: QTCREATORBUG-15806
Change-Id: Id7b5966a4ae6fafe979f7373718b89fdcc2b918b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 14:40:59 +00:00
Robert Loehning
25919d9020 Squish: Don't crash when missing breakpoint 
Change-Id: I8eba72baa043bebc8618fbfe51fa31d7215165e7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 11:11:54 +00:00
Robert Loehning
513cc235fe Squish: Clean up expected fails 
Change-Id: I216c6f6453412e65c48ddceaf950bd1112c32a42
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 10:29:30 +00:00
Robert Loehning
30541d0213 Squish: Don't expect fail anymore in HELP02 
Change-Id: Iba979f099b31a35693d0fee49de86fe6b8b3c55c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 09:33:00 +00:00
Robert Loehning
78c3fcc160 Squish: Small cleanup 
Change-Id: I8ca788b28612568935dcf68bc57089c0a0174fb1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 09:31:57 +00:00
Christian Stenger
6ffbb88b7b Squish: Adapt to changed tool tip 
Change-Id: Ib6f01cdad6a8e54010ad455cb7e9322d6311dc12
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-06 15:16:47 +00:00
Eike Ziller
1ae483fc83 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
 2016-04-05 14:11:47 +02:00
Christian Stenger
f7a1c1caa0 Squish: Disable testing QmlJS console 
This has changed too much and must be rewritten.
Due to other issues this is not easily doable, so disabling this
test for now.

Task-number: QTCREATORBUG-15831
Change-Id: If0c7866b1f68a32c0696636fc76aed9bbe2ea921
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-05 10:21:13 +00:00
Christian Stenger
4c5163f675 Squish: Ensure clean state after test run... 
...depending on the environment and the present terminal variations
it might be possible that QC leaves terminals with still running
qtcreator_process_stubs open.
Ensure to kill these (and automatically close their terminals).

Task-number: QTCREATORBUG-15749
Change-Id: I0cdbaf000c355443289bf827034ad9884efc2ce7
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-04 14:06:17 +00:00
Oswald Buddenhagen
e426d08e54 Merge remote-tracking branch 'origin/4.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
 2016-04-01 17:31:39 +02:00
Robert Loehning
59c260d60a Squish: Update Readme 
Change-Id: I0588e18ac23a72c596a24e5144c8f531dabbfc8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-01 09:56:29 +00:00
Robert Loehning
483fcb6ab7 Squish: Update object in tst_session_handling 
Change-Id: Ia1f327cf2a69e74d242bf4ad7d7ed8cfd7cd3a34
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 13:35:15 +00:00
Robert Loehning
d0ad71bb18 Squish: Sort objects 
Change-Id: Iff9e700d1c4f392a019803efc407709dd7ccf181
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 13:31:50 +00:00
Robert Loehning
180c0a2883 Squish: Expect more fails with clang code model 
Task-number: QTCREATORBUG-15710
Change-Id: I9a074921d6521fa11a281c0e2d296666ca86ef51
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 10:26:02 +00:00
Robert Loehning
93da73ffce Squish: Update objects for tst_qml_locals 
Change-Id: Iddc266417f9e1d5ba1ecdddb46f62f820c921b20
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 10:25:52 +00:00