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

1016 Commits

Author SHA1 Message Date
Eike Ziller
f4e87a7e0c Merge remote-tracking branch 'origin/3.6' into 4.0 
Conflicts:
	src/plugins/projectexplorer/applicationlauncher.cpp
	src/plugins/projectexplorer/applicationlauncher.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qtsupport/uicodemodelsupport.cpp
	src/plugins/qtsupport/uicodemodelsupport.h

Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57
 2016-03-03 16:10:04 +01: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
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
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
Robert Loehning
edadd6cad5 Squish: Remove unused object 
Change-Id: I65021379b27803ea1d38f554348b24e210fb0c8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-25 10:31:28 +00:00
Robert Loehning
ed1f8b9d1f Squish: Update tst_simple_analyze 
Change-Id: Ifba9af5446fec3daa42aa9794a26d02e23b8459d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-24 14:05:08 +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
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
Robert Loehning
6f7c4249ad Squish: Stabilize tst_CSUP06 
Change-Id: I52f4c858f178cb3018e57461e2350564fbf78024
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-15 10:40:54 +00:00
Robert Loehning
cb7b24be15 Squish: Try to stabilize tst_qml_js_console 
Change-Id: I9de2d7784954ebe658530505ba64e816a95d411c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-03 13:53:36 +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
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
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
Robert Loehning
03e5392ac9 Squish: Don't expect parsers to understand invalid C++ 
Change-Id: Icfe466540b7193c6f55014a68f1399debb0a17c3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-20 10:19:06 +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
Eike Ziller
ad6c0f9bc6 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I8f034f91de04e319dd5ba24b8837f1daca54d918
 2016-01-07 11:01:14 +01: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
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
Eike Ziller
ff60bf37c9 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I8223551aec66539dd8c55262e5000c1621410334
 2015-12-15 12:21:58 +01:00
Robert Loehning
ba4fa17a67 Squish: Ignore known issue in clang code model 
Change-Id: Ie57bf820fc2aa318ecf16cac0a2f4cb2f0ffe43a
Task-number: QTCREATORBUG-15483
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-10 13:04:50 +00:00
Robert Loehning
8a650b8c23 Squish: Remove workaround for fixed bug 
Change-Id: Id639f455b41e3b96d6867dbeb0b7af5c614cffc7
Task-number: QTCREATORBUG-15457
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-10 13:04:17 +00:00
Robert Loehning
b2321e04f1 Squish: Finish update for tst_qml_js_console 
Change-Id: I5efd9e93a22beed24e770c2015e7239576be6438
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-10 11:37:56 +00:00
hjk
33651877d8 Move QmlConsole to Debugger 
Now it is closer to its only user and possibly reusable for no-QML uses
there.  We also drop the QML/JS syntax checker. The application being
debugged can already tell us about syntax errors. There is no need to
duplicate that functionality.

Change-Id: I2ba151f9f4c854c6119ba5462c21be40bddcebf9
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-12-09 12:06:26 +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
a4231de01c Squish: Update tst_qml_editor 
Change-Id: I403b64fc60e3d4f1ad0635ce86190ea89ab49de5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-07 10:21:24 +00:00
Robert Loehning
4d4eb4da22 Squish: Remove pointless tabs from tested code 
Change-Id: I030aeff529c24730a13087fd9554d1f60a0e7462
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-12-07 10:20:22 +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
Christian Stenger
696b8e9cc6 Squish: Raise timeout for qml refactoring 
As the navigation treeview is updated asynchronously this might
take more time.

Change-Id: I5002fc547158147d921a5d19098f2cfc3a14336f
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-12-03 09:50:57 +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
114e52b3f0 Squish: Update video's title in tst_WELP04 
Change-Id: Ibf9d75324332be4e3223323ed8aa4cc34b01612e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-11-23 11:41:29 +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
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
85992f823e Squish: Update tst_qml_editor for fixed editor 
In 3.5, the QML editor showed two empty lines at the end of
the file. Now it's only one line so only one must be unmarked.

Change-Id: I831002e5ab9d14570d2a788010806c0b3de5614c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-22 12:09:33 +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
f3400f62cd Squish: Remove workaround for fixed bug 
Change-Id: Ifac94dfc27b0cb5f230d7b137bafabaa82a6773c
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-01 08:59:08 +00:00
Eike Ziller
0ba4781bfc Merge remote-tracking branch 'origin/3.5' 
Change-Id: I889b93611d1762121548fb71d1d3493e4adba313
 2015-09-25 10:35:42 +02:00
Robert Loehning
335f6e4363 Squish: Stabilize tst_cli_output_console 
Skip frequently failing qDebug output from Qt 5.4.1 MinGW.

Change-Id: I20d0fed184e3935484179e9509c902eb94e48ead
Task-number: QTCREATORBUG-15067
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-21 12:27:00 +00:00