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

168 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
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
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
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
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
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
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
f54b7d63cc Squish: Fix tst_simple_analyze 
Change-Id: Iac334d37a1cf6a85d4f85d09165503f9bca8ce91
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-13 14:43:11 +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
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
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
Eike Ziller
4058ff6fe9 Merge remote-tracking branch 'origin/3.4' 
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010
 2015-05-07 14:42:46 +02: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
Christian Stenger
9f269dfb63 Squish: Fix accessing objects on project's Build & Run settings 
Change-Id: I4a91b920796cd4cdfd383ac24282ef59c0c4a421
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-04-22 11:58:56 +00:00
Robert Loehning
559d8dc203 Squish: Fix tst_simple_analyze 
Change-Id: I56a7c2a651fc9d2701cf650279a677856b6cf84c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-09 14:36:56 +00:00
Robert Loehning
0c0b0c2f45 Squish: Update DiffEditorWidget in objects.map 
Change-Id: I7c3a1f85a379afcc48189b38da20fa63adaa7531
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-17 12:22:28 +00: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
Christian Stenger
b5478c994c Squish: Fix tst_git_local 
UI for committing files has changed.

Change-Id: I452e1e7f1bd4a976d8fb0a3a98927ddbfb372213
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-11-10 13:24:44 +01:00
Robert Loehning
0172dde1a6 Squish: Update object 
Change-Id: I94b8d4e66982a365c5a8ae5c6a7429a1cb2d9c45
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-22 13:52:19 +02:00
Robert Loehning
e2456cf8cf Squish: Update object for tst_modify_readonly 
Change-Id: I45814f0e7d7e719c4ea73de658e44bd0e7c17d9a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-14 15:17:54 +02:00
Christian Stenger
135a0dfb0e Squish: Fix Welcome page related tests 
Change-Id: Ifbec46c6e695835f9d88d298823e8793ed428409
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-13 14:15:24 +02:00
Christian Stenger
42236fc734 Squish: Fix some tests due to latest refactorings in QC 
Refactoring of dialog wizards and editors.

Change-Id: I6604a302b04579519c78698375bc4b1027ac8b02
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-13 14:15:12 +02:00
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
 2014-09-29 13:40:53 +02:00
Robert Loehning
bacf4f0afb Squish: Do not crash tst_simple_debug if debugger can't stop 
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-26 15:42:30 +02:00
Robert Loehning
ea93a6531c Squish: Run tst_CSUP05 with Clang code model, too 
Change-Id: Ief81ba27d8cbd43de5ef9c71b586da8cc372a8bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:03:20 +02:00
Robert Loehning
741ab6b732 Squish: Fix NewDialog 
When called from Welcome mode, the windowTitle is "New Project".

Change-Id: I12f013cf5a5c8d4d2ec1115e4f29f12cadf99676
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-19 11:11:32 +02:00
Christian Stenger
ca6a766314 Squish: Clean up 
Change-Id: I4cfde0c332b08e8b0beac8089fbdb641b09a4a05
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-09-18 12:16:52 +02:00
Robert Loehning
4c45e43916 Squish: Updates to keep suite_tools running 
Change-Id: Idb7a4c70c26aaf105ba2023d126fbc0f9f992e9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-18 11:01:05 +02:00
Robert Loehning
f2b5f6a8eb Squish: Updates to keep suite_debugger running 
Change-Id: I3096289a935b654005cdc7440a87cbc527410c64
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-17 16:45:04 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
 2014-09-16 15:17:21 +02:00
Robert Loehning
1f3d7c9e61 Squish: Include new Qt Quick templates 
Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-05 12:27:12 +02:00
Eike Ziller
c4e51e7405 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667
 2014-08-19 12:34:58 +02:00
Christian Stenger
ad239a766c Squish: Revive WELP04 for Squish 5.1.1+ 
Change-Id: If357eca07661df58484ea12d22a881d3d6564523
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-19 07:34:47 +02:00
Robert Loehning
bc03271f0e Squish: Remove unused objects 
Should have done so in 4541173535

Change-Id: I2f6b578db506d8e9e35b90d0a7fbc2ae833b148c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-18 11:30:55 +02:00
Ulf Hermann
8b3b868f4c QmlProfiler: Rename JavaScript view to "V8" 
The fact that the separate JavaScript view only works with versions of
Qt that use the V8 JavaScript engine is frequently confusing users.
JavaScript events for newer versions of Qt are integrated into the
Events and Timeline views, making the separate JavaScript view obsolete.
For those users who already know it and who are still using Qt 5.0 and
5.1 "V8" will be recognizable. For others "V8" won't mean anything and
they'll ignore it.

Change-Id: Iac0d89db24a3677e47b978a152cfc25c01f9c2b6
Task-number: QTCREATORBUG-12766
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-18 10:33:13 +02:00
Christian Stenger
ee97aeb5b0 Squish: Revive WELP03 for Squish 5.1.1+ 
Change-Id: I8c92495f3441fc8ee68e34d15f48f4021ae90f90
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-12 15:43:31 +02:00
Christian Stenger
5a06e6f903 Squish: Revive WELP02 for Squish 5.1.1+ 
Change-Id: I432494320cbbd4f19e0386a19183d0b9476054ed
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-01 12:11:48 +02:00
Robert Loehning
95d22fc972 Squish: Revive testing of Welcome mode 
This partly reverts commit a1274c93c8.

Change-Id: I1ba8586ae51a42a2239ee4ae5c8ead2ac880ecfa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-22 15:03:27 +02:00
Christian Stenger
469fe52af7 Squish: Provide test for QmlJSConsole 
Change-Id: Ib7cbf312b611176dbb762958bca687e043372a27
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-22 13:11:42 +02:00
Christian Stenger
be61ea48bf Squish: Fix expected label 
Change-Id: Id276a10dfcc1ca095acee74201104e6d1c6960f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-10 15:54:47 +02:00
Robert Loehning
1d8c2e61b4 Squish: Update getQtInformationForBuildSettings() 
Change-Id: I54df50a31bd1bc937668870e86666156ecddb6ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-27 13:27:47 +02:00
Robert Loehning
bafe7dbb0b Sqish: Update tst_git_clone 
Change-Id: I0d51540b7202e0968a44d87865672ca7a6cfa91d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-26 16:40:07 +02:00
Robert Loehning
922f25170c Squish: Update editor tests 
Change-Id: Idcc7de48f30438b2d26512999fe8c7a785d0f3dd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-26 15:30:13 +02:00
Eike Ziller
2786250c17 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
 2014-06-13 10:51:51 +02:00