feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

233 Commits

Author SHA1 Message Date
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
Robert Loehning
dcc3dcadac Squish: Let tst_HELP04 run on Qt 5.3 
Change-Id: I41a3121e616e5709f10e8d03da2fb71356d06498
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-04 13:33:20 +02:00
Robert Loehning
74649b7bb5 Squish: Update handling of HelpViewer 
Change-Id: I5b0b3e4d6c7e1e9e72ac0265bc4bfb276561e247
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-02 16:24:57 +02:00
Christian Stenger
da323129f1 Squish: Add another test for Designer 
Change-Id: I13d71579cf371b2345b16d932b41d9e8ccae0ee0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-27 14:17:08 +02:00
Robert Loehning
88d76de059 Squish: Remove pointless object 
Change-Id: I5acd2d0dfceffa9c5f693cec0dbb4f54207aa9da
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-20 14:11:41 +02:00
Christian Stenger
085469b894 Squish: Enhance tst_codepasting 
* set a random expiry for the paste
* make sure server side errors are handled

Change-Id: I28feab982fefbb97a9f603144943a57cc268538c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-09 14:05:49 +02:00
Christian Stenger
4b2cc015f8 Squish: Make sure correct output panes are used 
We expect the first five toggle buttons for output panes to be visible
by default. Additionally added buttons will have the property 'occurrences'
with a value depending on their position - not their label. Using the menubar
for these additional output panes is safer.

Change-Id: Ie58f8dd56ec35bfa9f6bba871aa807e4b1507c75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-30 15:45:02 +02:00
Robert Loehning
ca9a316cfd Squish: Test automatic saving of files before build 
Task-number: QTCREATORBUG-12014
Change-Id: I20080ac89d63c1d0a00cb18b31f5539bf2b4a554
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-30 15:29:20 +02:00
Christian Stenger
6ca680ac1f Squish: Fix tst_git_clone 
Some objectNames had been removed.

Change-Id: I5c3d405a623cbd894c7df79ce44ac05013049d3d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-20 13:05:22 +01:00
Christian Stenger
139a1a8dbe Squish: Fix tst_rename_file 
Change-Id: Ic8c7aac5133b3df32b25188c1ab325a985cc3d42
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-27 12:27:55 +01:00
Christian Stenger
a85f64a7c6 Squish: Fix DiffEditor related object types 
Change-Id: I295dc127a11e10496d441438feb7d1b8e15994b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:38 +01:00
Christian Stenger
e7297926ef Squish: Update objects after merging BaseValidatingEdit... 
...into FancyLineEdit.

Change-Id: I7e45861783a7bdf160827595b4e455d869884c81
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:18 +01:00
Christian Stenger
8d759829cd Squish: Update object types after merging FilterLineEdit... 
...into FancyLineEdit.

Change-Id: Id9b6c459cf994baa00b51f3125a8ba8718421a46
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-14 17:00:15 +01:00
Christian Stenger
4ae5445d8f Squish: Get the right QLabel on Qt Versions option page 
Change-Id: Idcec56352536b8b508d7fc7d5205bc54b5b14f34
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-14 08:35:15 +01:00
Robert Loehning
6a8dc025d5 Squish: Update objects moved from Find::Internal 
Change-Id: Icc34cdcf6b6fc5aa08f10b1cad4306ce666d21dc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-13 13:37:22 +01:00
Robert Loehning
29acdd89b3 Squish: Update Qt Creator_QmlJSEditor::QmlJSTextEditorWidget 
Change-Id: I3fd264e15706f1e763543eeb553f7b16071fdfa7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-12 15:12:23 +01:00
Christian Stenger
fca97a53d4 Squish: Clear analyzer results after verification 
Change-Id: Ic475704773770d7d17361c96947734681e959fea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-21 23:09:41 +01:00
Christian Stenger
7312733452 Squish: Extend tst_git_local 
Change-Id: I4160e3f8e7f43f9711b3436693aeb3b333208faf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-20 13:41:55 +01:00
Christian Stenger
d787e4e2ab Squish: Enhance tst_default_settings 
Change-Id: I150d4d53a6e6e93749f9cdbfe33971633805573a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-06 14:23:35 +01:00
Robert Loehning
5cddad9d9b Squish: Added test for local git actions 
Change-Id: I4b7cd2e872d6a9aed95d3802d9df98ffdce2cbfe
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-13 16:22:56 +01:00
Christian Stenger
f714c3811f Squish: Avoid squish crash on Mac 
The crash happens when using waitForObjectItem() on this object while
converting the used menu to a Mac specific menu.

Change-Id: I531272a316c929709aaf2acd0b0b7ffa82fe7f70
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:04:15 +01:00
Robert Loehning
56256a208a Squish: Test handling of description in tst_codepasting 
Change-Id: Ib24a4863f02b479cc18c17fb3d6dc20e8dc85452
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-12 12:28:51 +01:00
Robert Loehning
7f492541b9 Squish: Remove unused objects 
Change-Id: I36d5174e26b853777792f69eac4df16efc52292b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-03 10:41:49 +01:00
Christian Stenger
75c0b5bfe2 Squish: Fix now named wizard buttons in objects.map 
Change-Id: I871a5079dcef6712c3d7ddb21dbfab4c6f7c8f88
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-28 10:47:24 +01:00
Robert Loehning
7bf30c46e9 Squish: Updates for renamed objects and dialogs 
Change-Id: If12c82f7faadab67af31400a9688aec4088d4c1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-24 12:03:32 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00
Christian Stenger
8b7dff6fdc Squish: Fix tst_debug_empty_main for Mac 
Change-Id: I57cd9647d07cfbf823bdff63dd1c2f5c3050cb7c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-20 12:48:03 +02:00
Robert Loehning
5d1aece721 Squish: Fix tst_default_settings 
Change-Id: I2b9e03d77df657b107bc81d3b8f16720c25b4a0e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 11:54:56 +02:00
Robert Loehning
0e0d8eb7bb Squish: Update editors 
Change-Id: I022d0c5b2e025106860ea330f6b690842bb0558c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 11:54:36 +02:00
Robert Loehning
fbda0ef558 Squish: Updated tst_simple_analyze after fixes 
Change-Id: I2cc19737d750117780efc57e4047c48f147f08ab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-09 12:15:58 +02:00
Robert Loehning
49adb78ec9 Squish: Fix tst_create_proj_wizard 
Change-Id: Ie4fb69873edb8be5cfb0e82a920cb90e822f6a7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-09 11:27:31 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
 2013-09-06 12:20:44 +02:00
Robert Loehning
c77c392cb9 Squish: Trying to stabilize tst_SCOM01 
Change-Id: I895d763fdee4b15a36e109ee9f46d84635afa6a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-05 17:47:38 +02:00
Robert Loehning
f7c67d5521 Squish: Add test case for git clone wizard 
Change-Id: I4b4415d8a9b40b16be609286f0f07a63c4dd88bc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-05 17:44:50 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
 2013-08-21 14:39:18 +02:00
Robert Loehning
9a3e999f97 Squish: Add test for codepasting 
Change-Id: Icba9a10d0269353f7b11e341ffa62ca78593cf2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-19 16:57:51 +02:00