feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,241 Commits 108 Branches 368 Tags
c20c20f01277d1d0f7e452ee6ad7fd5f2bc34f3d
Commit Graph

823 Commits

Author SHA1 Message Date
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
a4321bbfe1 Squish: Run tst_memberoperator with Clang code model, too 
Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:09:12 +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
6447eb9cbf Squish: Run tst_CSUP04 with Clang code model, too 
Change-Id: I3a2f029e0f1c85ecbd3c161b097f4e975014f714
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:02:38 +02:00
Robert Loehning
4957137ef6 Squish: Run tst_CSUP03 with Clang code model, too 
Change-Id: I5b240b2fbd7999b2228871ddf8faa72509c49465
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:01:54 +02:00
Robert Loehning
4d8002a973 Squish: Add shared file for clang-related code 
Change-Id: I2eaa39afbfeb0031f191ce9adead80c0d0960542
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:00:50 +02:00
Eike Ziller
d6c73653ed Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
	src/plugins/texteditor/basetexteditor.h

Change-Id: I556a7661872b90b329a46694e335e18cddc28677
 2014-09-23 10:10:09 +02:00
Christian Stenger
149f420550 Squish: Fix tst_tasks_handling 
Change-Id: I58a818864b495d1ecf2923abd50cf848ba368195
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-09-23 07:16:58 +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
Robert Loehning
dd1bc1f607 Squish: Avoid crash of tst_CSUP06 
Change-Id: I76318223443ec2e0cc8ddd887a8ac70a6993c0c4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-19 11:05:13 +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
98c3a1c331 Squish: Update getEditorForFileSuffix() 
Change-Id: Ib052d2dd655117492cbb26f03eaa63c8b61466bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-18 11:00:40 +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
fdfb9338b6 Squish: Stabilize tst_CSUP06 
Change-Id: I68071a5e8964c89a61a4dfe310fdbd7bb5fd1b8a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-05 13:00:12 +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
Christian Stenger
690153786e Squish: Provide test for ClangCodeModel plugin 
Change-Id: I4bf45cf838baa89b558292ca9d08ec184e80c20d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-09-04 07:24:55 +02:00
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