feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
37,781 Commits 108 Branches 368 Tags
ccf130a64297982b4e54738c687a4bf857504a14
Commit Graph

802 Commits

Author SHA1 Message Date
Eike Ziller
49db3a450a Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
	src/plugins/texteditor/basetexteditor.cpp

Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
 2014-09-03 16:08:02 +02:00
Robert Loehning
0f253e48bf Squish: Continue testing other files after fatal error 
Change-Id: I2e8709a84882dde5a6bc96b4bd213581175c6c8c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-02 16:54:54 +02:00
Robert Loehning
7854dd33d9 Squish: Test opening of QBS project 
Change-Id: I980ad15147f419b2d42d86b2a62ebf2875a3c2d8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-01 15:23:03 +02:00
Robert Loehning
14fe8f07cd Squish: Update Creator's sources to v3.2.0 
Change-Id: I224da43ad46acfce33fb62926df62c211164ed40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-26 11:20:29 +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
742db5115c Squish: Use small letters in shortcuts 
Following Squish documentation. Capital letters even caused
problems in nativeType().

Change-Id: I902984da40c7b57c1c40d35c2cd183e95481f1cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-18 15:20:27 +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
Robert Loehning
8c133689be Squish: Stabilize selectFromCombo 
I keep losing the second mouseClick in tst_create_proj_wizard...

Change-Id: I45f37c848c7eccd9fd59c455e8d6c80c6de88c06
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-15 13:46:24 +02:00
Robert Loehning
75ec15e849 Squish: Fix tst_codepasting 
Test crashed when there was unexpected output

Change-Id: I6fd56bf95d664cff5284e574db9b57f42b0e93cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-14 12:55:12 +02:00
Robert Loehning
7e92419175 Squish: Fix hack for tests opening multiple files 
Change-Id: I35ff3e1cf99a8e5f171f0728f05a3b828da78293
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-14 11:34:57 +02:00
Robert Loehning
4541173535 Squish: Remove pointless waiting 
Change-Id: I1da64859bf5d6974ceacfe22d230be1983533d77
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-14 11:28:26 +02:00
Robert Loehning
5e318936d0 Squish: Stabilize tst_codepasting 
Change-Id: I38f53d98159e15340b2f6cbc1912c6e15242dc5b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-13 15:32:01 +02:00
Robert Loehning
646dcf0eea Squish: Hack when "Open File" dialog can't be found 
Happens to me with binary packages for Linux.

Change-Id: I688103ba2df26056468e89271e815b5717effeee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-12 16:39:47 +02:00
Christian Stenger
2b02c0067f Squish: Use only Delete key that is documented 
For consistency and to avoid unforeseen side effects.

Change-Id: Iebbf8179b604572e7ad24dbfbf757387788e2383
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-12 16:22:33 +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
Robert Loehning
b2682fee22 Squish: Remove workaround 
Just doing as the great wise frog tells me.

Change-Id: I73c07142cd902ac3b89f8c00597087d7d550a2ee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-01 14:31:39 +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
ed9261733b Squish: Replace Qt 5.0 by Qt 5.3 
Change-Id: I2fb5ea259c523fce4e71f02ca087ed93fd9a0ae1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-29 18:15:05 +02:00
Christian Stenger
9b89379745 Squish: Revive WELP01 for Squish 5.1.1+ 
Change-Id: I1d1bc9334fe6c0fc1187b9bcde27d0b4ed3081b4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-28 14:50:41 +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
f5474a35e5 Squish: Fix detection of expected debuggers on Linux and Mac 
Change-Id: Ie3f1c291e9ba4646fb948bf30d38d8db9af31886
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-22 08:02:26 +02:00
Robert Loehning
7f6673eae7 Squish: Update tst_git_clone 
Task-number: QTCREATORBUG-12651
Change-Id: Ie9d9f8dfe50fd2751b77690ea1464f0ba91ee2fe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-18 14:18:59 +02:00
Robert Loehning
d07ee6a3d1 Squish: Update tst_session_handling 
Change-Id: I93fe52e59579958c85ecbe086f62ec067af214f7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-18 14:02:42 +02:00
Christian Stenger
eff566b3b2 Squish: Make sure the project has been opened 
Change-Id: I14119e1bc9498cc0fd722f5842f4275b644911fb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-10 15:55:27 +02:00
Christian Stenger
194f22c577 Squish: Add temporary workaround 
Without this workaround the build machines are messed up with lots of
exception handler windows.

Task-number: QTCREATORBUG-12644
Change-Id: I2075e85559314813b272cc6dbe7f068954b8c9dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-10 15:54:56 +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
Christian Stenger
881632c390 Squish: Fix expected values in tst_simple_analyze 
"Source code not available" is shown again - now they're displayed
from the view instead of being added explicitly to the model.
See ccf871aa20.

Change-Id: I8c370008005c9453cc86dacb410b310b972e03eb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-03 10:02:54 +02:00
Christian Stenger
776e6adda7 Squish: Remove platform limitation of snooze() call 
This AUT crash now happens frequently on Linux as well.

Change-Id: Iee44cc4f5ca45afc9e643a2745cabfbf3e6efcf4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-03 07:56:04 +02:00
Christian Stenger
e39b623c28 Squish: Fix tst_create_proj_wizard 
Change-Id: Ia34a9055aac52479a331f3c85557291b1c586221
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-02 13:43:39 +02:00
Christian Stenger
c40dc7674d Squish: Raise timeout to avoid LookupError 
Change-Id: Ia1718e67682623a6323411a8ad7e9240eb328bfb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-02 12:53:54 +02:00
Christian Stenger
ea81527773 Squish: Add workaround to test_QMLS03 
Task-number: QTCREATORBUG-11984
Change-Id: I4be9d605ee1f95f463fd0a16cb9b379949751203
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-01 10:46:39 +02:00
Christian Stenger
75da297e4d Squish: Disable pastebin.ca for now 
Pastebin.ca has issues which make this test unreliable.

Change-Id: Idae581822d9c2555e57fd91f5b1ae044666cdc4c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-01 10:45:14 +02:00
Christian Stenger
cf211e46cf Squish: Fix expected object 
Change-Id: I49eef9de0c635cd6618d05e0618ce6b0fe8d352e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-30 11:05:53 +02:00
Christian Stenger
93b53a4bb3 Squish: Add expected paths for 64bit debuggers on Win 
Change-Id: Id3f80097c38d6578ef647bb2d31aedad0f2a56dc
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-06-30 09:05:56 +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
b415cc3cac Squish: Update expected values of tst_simple_analyze 
Change-Id: I8b11ebe20cfa432a37858c582a1a36b9bd718ce2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-27 12:17:17 +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
Robert Loehning
a56fc82b0a Squish: Close QMessageBox using "OK" button 
Change-Id: Iead4267d0919ce4a8d7f9f5fdec61cd9ba8dd0db
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-13 11:33:39 +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
Christian Stenger
7a86928fbc Squish: Fix getEditorForFileSuffix() and simpleFileName()... 
...when using filenames coming from Squish's treeview syntax.

Change-Id: I0296dbabb09af11dde5ed4716b1b1f48f05c47e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-06-04 15:12:50 +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
Christian Stenger
d455f5f6dc Squish: Stabilize tests using getEditorForFileSuffix() 
This is especially useful when switching between files assigned to
the same type of editor. (e.g. cpp header <-> cpp source)

Change-Id: I0179e7086a6f25cb0ecc0b69da1f61adb21d8ac2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-06-03 16:46:46 +02:00
Robert Loehning
e167864063 Squish: Avoid pointless waiting and warning in selectBuildConfig() 
Change-Id: Ia092d7e7f9af78c23512fa193635ff52fead822d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-03 14:57:34 +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
Robert Loehning
a74dc14e67 Squish: Use dumpIndices() 
Change-Id: Iecfaec20c54014b361268947145f80409103388e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-02 15:21:53 +02:00
Christian Stenger
369c2f775a Squish: Add test for generic highlighter and MIME types 
Task-number: QTCREATORBUG-12097
Task-number: QTCREATORBUG-12149
Change-Id: Iebb5711c437415bcbb2b3bae72aaa7bc98c34905
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-06-02 14:49:32 +02:00