feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
44,951 Commits 108 Branches 368 Tags
fd83c50599b52d0fa07901b7709d0ad6f562e0c0
Commit Graph

499 Commits

Author SHA1 Message Date
Robert Loehning
8e6765df23 Squish: Update tests using clang code model 
Code models can't be swapped at runtime anymore.

Change-Id: I76a9894d0413d7d5a368ec6d506180a3837a6e2c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-26 13:06:24 +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
122f896548 Squish: Update addHelpDocumentation() 
Change-Id: I8b26f1e5efbc51058306ea7183c0b37bcbc49179
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-17 14:52:04 +00:00
Robert Loehning
7aa8dc38e9 Squish: override startApplication in startCreatorTryingClang() 
Change-Id: I6cb16c2a93ca46503f056c558eb8a6a2b33153d7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-16 13:16:00 +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
Robert Loehning
692261564f Squish: Include binary editor in tests 
Change-Id: I0b4fc4e0cb18dcbd569ebdba201bfb9e2596ba5b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-15 10:44:47 +00:00
Robert Loehning
901d74121a Squish: Use existing tools for finding executables 
Change-Id: Ic3e7f5db6d12e37f908df3290893768a5be4fa56
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-15 10:43:11 +00:00
Eike Ziller
5952165cf9 Merge remote-tracking branch 'origin/3.6' 
Change-Id: Ic4d3d94feaaa588c6244509bb3dd14c5cb646fe7
 2016-02-01 16:15:48 +01:00
Robert Loehning
7114ee9149 Squish: Run tst_CSUP01 on clang code model, too 
Change-Id: Ic2424cc9d962feff06baadc23a5fdf121bf2a11d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-01 11:38:49 +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
76773763e6 Squish: Update tst_qml_editor to use Qt 5 
Change-Id: I1f2c8b9212ab2b1eec07a4587495aaf02d201523
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-21 16:48:00 +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
ef39a087c7 Squish: Remove workaround for fixed bug. 
This completes the revert of
commit 89d8693107.

Change-Id: I359ce87b0d29dc242c9ee9d7c04e025859ff5b31
Task-number: QTCREATORBUG-15456
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-05 15:36:58 +00:00
Robert Loehning
60e26abca0 Squish: Fix qt4Classes() 
Change-Id: I43d8e7f6006c96276f069d95cc35cbbba62fc356
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-08 09:45:36 +00:00
Robert Loehning
89d8693107 Squish: Work around bugs in tst_cli_output_console 
Change-Id: Ief5f731b3ff84dcbd34f4200acbe2646847c0f1c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-07 13:41:20 +00:00
Robert Loehning
8abd9fae80 Squish: Update openCmakeProject() 
Change-Id: I21f5e40b2da0b2a9b37752c2f5e15c4efd687ca5
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-12-03 13:43:07 +00:00
Robert Loehning
66e7b77d88 Squish: Update selection of code model 
Change-Id: Iee76086dfd886dd8d61db3cfe4600a5eedd36cb7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-01 14:38:36 +00:00
Robert Loehning
9ca4648081 Squish: Replace white box code with GUI interaction 
Change-Id: I513142498768dfb3f8373d00f0b04edba0dfd06f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-30 10:46:53 +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
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
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
c70502d691 Squish: Fix remaining WELP tests for Qt 5.5 
Change-Id: Ibe0df94d833ac2a10d43884ada3c1fe3d5de0b98
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-28 09:39:02 +00:00
Robert Loehning
fa67536272 Squish: Fix tst_WELP01 for Qt 5.5 
Change-Id: I8589b6b5a4ea9c50a49fc459532f043503786816
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-27 09:45:17 +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
b2ba98d988 Squish: Remove BlackBerry 
Change-Id: If79d09f44f682e8fa7ee7b71e265696ecc998337
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-14 10:54:50 +00:00
Christian Stenger
7901601eb0 Squish: Simplify __selectTreeItemOnBuildAndRun__() 
Change-Id: If1bc3f610cd59041fb4e6ce9edd38354f73b141d
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 14:00:37 +00:00
Christian Stenger
9cb59772dc Squish: QmlProjectManager is re-enabled by default 
Change-Id: I91e12547843053c5de5ab5bd1af88977e937f80e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 13:53:32 +00:00
Christian Stenger
b78e3e7ff5 Squish: Fix suite_qtquick 
Change-Id: Ibafa3d9871ba95ada52a270a018ce7a5106db312
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 13:53:14 +00:00
Christian Stenger
cf52ab6bac Squish: First fix for createNewNonQtProject() 
Change-Id: I0c6d76f0740e8abaf7980b67156fd52388aba3eb
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-02 13:30:29 +00:00
Christian Stenger
e2adf9b7bb Squish: Fix tst_HELP05 
Additionally move Qt5Path helper class into classes.py as it's now
used in more than one test suite.

Change-Id: I0a1faed7fa8c082316c5568e4150091812af8979
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-01 04:41:26 +00:00
Robert Loehning
96f03dc09d Squish: Update suite_SCOM 
Change-Id: I341efe4dc6440f8d8773a27a3dcc754c1151241c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-19 12:37:07 +00:00
Robert Loehning
aa0d68ec3e Squish: Remove compatibility code for Qt 5.3 
Creator 3.5 needs Qt 5.4 at least.

Change-Id: Ie37447ff612cc7294cbd8dcca17e81997e4f9328
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-19 08:49:34 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4' 
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
 2015-06-17 12:04:21 +02: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
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
02b521a8ff Squish: Fix reading tooltips in tst_qml_editor 
Change-Id: Ie65752d2c8c87c3802c810b98ffe7b122549c762
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-02 13:09:03 +00:00
Robert Loehning
40d112d5ec Squish: Make deep copies of Targets.ALL_TARGETS 
Fixes crash in tst_generic_highlighter

Change-Id: I186cf47990e80ee6902c0812e6d6e3a260dfeec5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-31 14:37:05 +00:00
Robert Loehning
1d0582ecdb Squish: Simplify maintenance of kits 
Change-Id: I757ff8991f1f2c54789b3b536c0300e0fe643bf2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-30 13:56:20 +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
Robert Loehning
4413096cae Squish: Add Qt 5.4.1 kit 
Change-Id: I8efa72f8695796bd69af11e9904fae143137d1e6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-25 14:17:54 +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
e11caa793a Squish: Remove outdated code 
Change-Id: I765374645bb6176028416e7ad8e4ce69df65723d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:45:44 +00:00
Robert Loehning
f2c9cd655e Squish: Prepare help tests for Qt 5.4 
Change-Id: I38568b325ae37d8b75ad3481ef0cc6ced0a99488
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-11 11:13:38 +00:00
Robert Loehning
26972ade65 Squish: Stabilize tst_qml_editor 
Avoid false fails with Squish 5.1.3 and Qt 5.4.0 on Windows

Change-Id: I4d330627ed7d93ad7e327aebd9c9d3173e34a8e1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-02 14:22:54 +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
6ad3f3975c Squish: Update menu objects 
Change-Id: Id1c8ee441a8479aa2bd19410e88c4ea48d0ee3f9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 15:17:54 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL 
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2014-12-19 10:18:23 +01:00