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

101 Commits

Author SHA1 Message Date
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
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
Christian Stenger
9fde45fb52 Squish: Add possible error and respective handling 
When using pastebin there can be various errors. Add another
one and try to handle it gracefully as this is a server side error
we cannot influence ourselves.

Change-Id: I2bcd5b7752bfbb98e2b3fd41cc8ebb9daf0ebf32
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-08-29 13:52:18 +00:00
Christian Stenger
b7c8818eb9 Squish: Update expected texts 
Change-Id: I0959635cdfe92335c0a5582119e145c8e7ea88b2
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-08-01 09:33:54 +00:00
Robert Loehning
8637d04c1d Squish: Update expected text in tst_git_local 
Change-Id: I97a532f80b9dc2b40ec5931116b207cfaeef8f4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-11 09:20:27 +00:00
Robert Loehning
ae4be183fd Squish: Tune tst_codepasting to working cases 
Change-Id: Iaa7ebcbc20f096d1776be13c62978d6851707d39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-18 12:35:42 +00:00
Robert Loehning
d9e1c77c01 Squish: Shorten object names 
Change-Id: Ic57dce86bccae23a2edeee42207a872793feffa0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-18 12:26:18 +00:00
Robert Loehning
d7f79349ed Squish: Verify project was found when adding file 
Change-Id: I313d1ba1b621d45620bf613760cefdf0a2d2341c
Task-number: QTCREATORBUG-17994
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-10 14:01:16 +00:00
Robert Loehning
9bb80c0e80 Squish: Increase timeout for cloning in tst_git_clone 
Change-Id: Ib894ae05e8049331115ee34514d7638815408065
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-08 11:41:47 +00:00
Robert Loehning
d10b9390c8 Squish: Update tst_git_local 
Format of .pro file changed slightly

Change-Id: I026057ecc76c082ddac06e81b36c0b3b62629da0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-08 09:15:27 +00:00
Robert Loehning
d6ecd65c1c Squish: Clear General Messages before running tst_codepasting 
Change-Id: I78514e5a8553349abdf2558bba6c4a15ad280eba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-04-12 21:21:44 +00:00
Robert Loehning
629dd8bbed Squish: Update expexted log in tst_git_clone 
Change-Id: Ie0f87cf23d9c86c6e5ada37be00cf8e7c2c8ecb5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-14 13:11:07 +00:00
Robert Loehning
bea5fe0a63 Squish: Update moved license file in tst_git_clone 
Change-Id: I8a34a878e91a64762b28b03d08334148a3dbe8d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-01 10:30:29 +00:00
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2 
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
 2016-10-12 16:02:47 +02:00
Robert Loehning
b729d6da7f Squish: Update tst_git_clone 
Change-Id: Ie775ae993651b51699ebfedbe6b37c823392435e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:49 +00:00
Robert Loehning
8acca9f37b Squish: Fix error handling in tst_git_clone 
Change-Id: Id59ba23361beb0994f400647680e4facb223d22f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:10 +00:00
Robert Loehning
54a7188c27 Squish: Cloning installer-framework instead of jom in tst_git_clone 
jom's repository can be cloned quicker than Squish can cancel the
procedure, making the test instable. Cloning installer-framework
takes a couple of seconds longer.

Change-Id: I032a4bf60cfd3b070e4c311fbd1dae5b81e8fcd1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-07 10:17:20 +00:00
Robert Loehning
96a9b2bb5b Squish: Strip final newline from expected text 
Change-Id: Icc10f3f0efad5a5d803f556037ecbc08fb6503f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-08-30 09:41:08 +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
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
Robert Loehning
e7fe1ea41b Squish: Update expected file in tst_git_clone 
jom changed

Change-Id: I5d0bebe8a6d4711c98aa38b7db21fdc16d6639b7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-18 15:30:38 +00:00
Robert Loehning
3b9f1659eb Squish: Update type of VCS log 
Change-Id: Ia7359be2061a752a3e6957405b0150cd604b3bc7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-11 10:08:40 +00:00
Robert Loehning
888e2cdfa9 Squish: Update opening of CMake projects 
Change-Id: I0131d43c1d7b6d835fb2e1e6c5b5a9d27825a849
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-09 14:56:57 +00:00
Robert Loehning
02de3071ee Squish: Update tst_git_first_commit 
Change-Id: Ib5122595a3036345f441238de20878885f860aa4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-02 13:56:10 +00:00
Eike Ziller
b1b118821b Merge remote-tracking branch 'origin/3.6' 
Change-Id: Iba662995e76f1b6ec135d64072a36a2498b2b5bb
 2016-02-03 10:55:48 +01:00
Robert Loehning
8c13f2437e Squish: Increase timeout in tst_git_first_commit 
Change-Id: Id65b729cd200bb37ad132b4071a263ab61bb3ed8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-02 10:19:12 +00:00
Eike Ziller
d18d7eaef6 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I4e1ec4054d7364057c63e63e293a246e64afdddb
 2016-01-25 13:21:18 +01:00
Robert Loehning
62fae6b6c2 Squish: Test clicking on unknown git commit id 
Task-number: QTCREATORBUG-15051
Change-Id: I9046fe8279a661a5ba28bd14747a9ee9915c3416
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-21 12:42:25 +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
506c0685a3 Squish: Avoid menu problems with Squish 6.0.0 
Change-Id: I43219d36f07e2b5636f84f891f94220148f4dd7f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-09 10:27:26 +00:00
Robert Loehning
9c9dbe3c53 Squish: Update Creator's sources to v3.5.0 
Change-Id: Idc41db621470886920173f7d5caf366204408731
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-03 11:41:20 +00:00
Robert Loehning
a80f4d179b Squish: Verify shown filenames when adding C++ files 
Change-Id: I1e6c944a70c4f44d4f1b3e5cb7b6b6c8421ba453
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-01 09:44:41 +00:00
Robert Loehning
e34148ba75 Squish: Update tst_git_local 
Change-Id: I26a0e497382a602e99811e77a7f1b5cebc57a946
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-14 08:30:39 +00:00
Robert Loehning
fe34bf5c1c Squish: Update tst_git_clone 
Change-Id: I5af8398893ac89f56245d67978ca4c1df6fce009
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-19 12:14:56 +00:00
Robert Loehning
13daaaac67 Squish: Update tst_git_first_commit and tst_git_local 
Change-Id: I5e7a1c3be4fe7fab848c98abdf52d3b9af318047
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-16 16:15:23 +00:00
Robert Loehning
82f536c24e Squish: Weaken test for git summary in first commit 
Linux test machines count 1673 files instead of 1675.
If this is a bug at all, I don't expect it to be in Creator.

Change-Id: I8202aae88ceda6b8bf472d8b9a7506862ad2473c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-05-11 08:29:22 +00:00
Robert Loehning
6febfc802e Squish: Test showing Creator's first commit 
Change-Id: Ibbd7a2ed6ac7c54a304fec057a61357fed3b4274
Task-number: QTCREATORBUG-14322
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-29 12:31:26 +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
Robert Loehning
033a628cdc Squish: Updates for renamed template 
Change-Id: Ic5a3fad69d8fb2875b7578cb58c8f3203678531a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-13 12:37:10 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
 2015-02-12 17:36:29 +01: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
Robert Loehning
98f2a74f90 Squish: Update tst_git_local 
Change-Id: I4bc64ad82bddf448b6846fe3a75941741c32a24a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-30 10:05:06 +00:00
Robert Loehning
f78479014f Squish: Disable pastebin.ca for now. 
"Server is at capacity"

Change-Id: I440dca1e2d6bfab13b2fe59662691df4fa724ba7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-21 10:56:44 +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
Eike Ziller
df3176d5e3 Merge remote-tracking branch 'origin/3.3' 2015-01-14 16:06:46 +01:00
Christian Stenger
4f1e9aa485 Squish: Re-enable testing of Pastebin.Ca code pasting 
Change-Id: I67f8d9705cd7b5063322e53fb3d745d0314b9fc0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-01-14 13:38:48 +01:00
Robert Loehning
6e2782b8b0 Squish: Test first commit in git repo 
Task-number: QTCREATORBUG-12755
Change-Id: Idf27f4bc19ec62ce10ca9367e0b32b8d2b031587
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-09 12:16:21 +01:00
Christian Stenger
949a86f035 Squish: Fix tst_git_local 
Change-Id: I6acdaaf81a0b8c2523df4fda4ee7ec044da25678
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-15 15:24:30 +01:00