feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
76,587 Commits 108 Branches 368 Tags
d63bfa4a2975541b51fc8173fdb06933bb9dd40d
Commit Graph

371 Commits

Author SHA1 Message Date
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
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
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
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
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
db2ab92801 Squish: Remove outdated code 
Creator can't be built with Qt 5.4 anymore.

Change-Id: Ic3c014e8384c72c10a48c65117c53daecaa683ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 10:25:32 +00:00
Robert Loehning
4ec10b55e8 Squish: Update expected files for tst_openqt_creator 
Change-Id: I32deb594e6836ba2dd627cdc1613bfc1fc26cd47
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-25 16:56:53 +00:00
Robert Loehning
4ad4f17811 Squish: Update expected files for tst_opencreator_qbs 
Change-Id: Ia840b6fef18bf09bce9938e9b2df5916e454bd7c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-25 16:56:38 +00:00
Eike Ziller
74cdce071f Merge remote-tracking branch 'origin/3.6' 
Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
 2016-02-24 10:08:37 +01:00
Robert Loehning
e71cb3ae62 Squish: Update expected sizes of project tree in tst_session_handling 
Directories in resource files are now displayed as
separate items, adding two more entries to the tree.

Change-Id: I398469bfe7680c73ab0440fdb9dc6f75e101f2f4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-22 10:21:11 +00:00
Robert Loehning
9d8e4aa922 Squish: Test overwriting of files when adding class 
Change-Id: I86ed9a3749f692fe9ead13c31e0ba62c2baa3020
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-16 13:14:35 +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
a9ffcbcf89 Squish: Update project tree for qtcreator.qbs 
Change-Id: I94ba5523fbbd715e44b228f2936148825ad43c94
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-04 15:46:13 +00:00
Robert Loehning
e94de191b0 Squish: Update objects of Qt version settings 
Change-Id: I2fce4d860a70230519d7f56e58d88a03dbb379ba
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-30 10:46:24 +00:00
Robert Loehning
1a9e097c80 Squish: Update tab's name in tst_installed_languages 
Change-Id: I22f69a589d8bb32c3fa7d984ada67043340e5e27
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-29 13:13:40 +00:00
Robert Loehning
1d88042b3f Squish: Remove dir separators from expected project tree 
Project tree displays native separators since
d7a373ef26

Change-Id: I75a9b391641a20f32000f909b5310ad702ab0ee3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-05 05:41:59 +00:00
Robert Loehning
f885286d22 Squish: Update expected project tree for qtcreator.pro 
The handling of .pri files was changed in
51ba32bccc

Change-Id: I581bfa00465e1d9f3c4bbcdfefa4d64555d48c73
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-05 05:41:52 +00:00
Robert Loehning
e087ed2452 Squish: Fix tst_default_settings 
Change-Id: I136d93e7b698dcda5388bc24b9bcaaae482fb861
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-21 11:01:43 +00:00
Robert Loehning
ebad4ed2c1 Squish: Test warnings about outdated Qt version 
Change-Id: Id5c3243ace16ef545386cc3f63744963edd5fda1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-11 12:14:45 +00:00
Robert Loehning
e873f872ef Squish: Reanimate tst_opencreator_qbs 
Change-Id: I00d1d1baea71e5b63a1a6b7c11aaf47e74082a21
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-03 14:58:53 +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
652ff8efeb Squish: Add test for creating new C++ class 
Task-number: QTCREATORBUG-14949
Change-Id: Ie42471f174eaacab2810eec12c2af4201a9374fe
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-01 09:44:28 +00:00
Robert Loehning
6fe810f514 Squish: Compare sets directly instead of differences 
Generates better output with less code.

Change-Id: I3a5fa02c5aca97561e20dc4ddf4153596a3a60ae
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-08-11 10:01:41 +00:00
Robert Loehning
5dab51ce9f Squish: Fix tst_default_settings for Ubuntu 15.04 
Task-number: QTCREATORBUG-14697
Change-Id: Ia8e41325e61ce6a380dbe0c60cf78c11afc2e99c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-08-10 13:15:24 +00:00
Robert Loehning
bb3b649957 Squish: Skipping tst_opencreator_qbs 
qtcreator.qbs contains a syntax error
which Creator does not ignore anymore.

Change-Id: Ifddeea5b81080c1388b35f2c2378f0f2eabbd318
Task-number: QTCREATORBUG-14828
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-30 14:04:40 +00:00
Robert Loehning
84952c5a96 Squish: Fix tst_session_handling for Qt 5.5 
Change-Id: I9347656c659055472cdda42fe07348c07bc3037e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-28 13:48:37 +00:00
Robert Loehning
f11d5791a4 Squish: Timing issues in tst_openqt_creator 
- speed up the test by not waiting for C++ parsing
- measure the time for parsing qtcreator.pro and fail if too long

Task-number: QTCREATORBUG-10733
Change-Id: I1d00812a3e8e56a5ee6e1828bc60aa6eb3d2da41
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-23 08:26:24 +00:00
Christian Stenger
029b83b8dc Squish: Fix suite_general 
Change-Id: I4e1458555a971d21e42a071e2fc0b135b0b1e91c
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-14 11:19:54 +00:00
Robert Loehning
50c6343615 Squish: Remove outdated kit handling code 
Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-16 14:44:25 +00:00
Robert Loehning
e869d794c8 Revert "Squish: Fix verification in tst_rename_file" 
Didn't think of the bug mentioned in my own comment. Sorry.

This reverts commit c7b7fde2bf.

Change-Id: Ida2791a7c985c8036194df437c720a170a39458e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-03 04:52:16 +00:00
Robert Loehning
c7b7fde2bf Squish: Fix verification in tst_rename_file 
This doesn't change anything until we replace the used project.
main.cpp or utility.cpp may get the tempFiletype "Headers" and
then the test will crash because the file can't be opened.
In addition, only files with filetype "Headers" are included in
other files, so verifying including of other files is
pointless.

Change-Id: I30b20269a800eca5ef51de3af209e674da5189bd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-05-29 10:33:05 +00:00
Robert Loehning
a8cdf035ac Squish: Update to changed behavior when renaming 
The bugreport I wrote about this was rated invalid
so now this is the expected behavior.

Change-Id: Ia187062552ad9d4857b5078d4c9c5dde4c8b7521
Task-number: QTCREATORBUG-14469
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-05-29 09:43:58 +00:00
Robert Loehning
a127bb780c Squish: Remove outdated workaround 
Change-Id: I717e3422f728fcf71bc984c0c9113ecef6341163
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-30 09:35:17 +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
Christian Stenger
693e1b7227 Squish: Improve tst_default_settings 
Change-Id: I6aebbf300e9e86729c0b00bee3bb9b6d4bf87854
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-17 16:59:41 +00:00
Christian Stenger
7142402429 Squish: Fix tst_rename_file 
Changed behavior due to changes related to MIME database.

Change-Id: I54bbfd8ca5d027716ef6bca308df0863635fe474
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-05 12:25:53 +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
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
28971701fd Squish: Don't rely on progress bars when parsing qbs project 
Task-number: QBS-746
Change-Id: I316934884432953e2137d7e97b73fce352be4cac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 12:25:46 +00: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
Robert Loehning
1be459d9dc Squish: Avoid error in tst_build_speedcrunch 
Change-Id: I2f199f392016005b8e00e48253838370628875d9
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-15 16:25:04 +01:00
Robert Loehning
07a52d1ae6 Squish: Remove Qt4 compatibility code 
Thank you Qt4 for all the good times we had together.
Farewell.

Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-31 14:52:03 +01:00
Robert Loehning
5a58c4080a Squish: Test renaming of includes 
Change-Id: I0c3d64ae6339ff41fc742b67618efbf69998c64e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 13:57:30 +01:00
Robert Loehning
bdbab9274c Squish: Wait for C++-parsing in tst_rename_file 
Change-Id: I66a12ae685e6980bb9d41a1a177afc2bfa46ca98
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 11:48:52 +01:00
Robert Loehning
80f865c057 Squish: Test more templates 
Change-Id: Ia9d5afc621b4e79417f6aa1b64b6b9d9f7b5f38a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 11:27:08 +01:00
Robert Loehning
08a56e7506 Squish: Remove Windows-only files from expected tree 
Change-Id: I3043f613ba2bbafe1e6b32013be5e59cc1da412c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-22 13:31:29 +02:00
Robert Loehning
e8a0d1783a Squish: No need to enable qbs explicitly 
It's enabled by default now.

Change-Id: Ifdc51efbe8d075e839885296746ab5dc3faa1140
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-21 15:40:35 +02:00
Robert Loehning
b02f8f27fb Squish: Fix tst_openqt_creator 
Change-Id: Idfcf63cf7b783b033a8e09e5a8661e86ae4cc3b9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-21 15:40:04 +02:00