feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
48,420 Commits 108 Branches 368 Tags
be9c7d6929d3c89b613088fe79f6f3e199563860
Commit Graph

143 Commits

Author SHA1 Message Date
Christian Stenger
be9c7d6929 Squish: Fix triggering items listed under "Recent Files" 
UI has changed again, so adapt the test to reflect this.

Change-Id: I5d6bcf2b48b8b625f6086f5a1101041a73d7e329
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-14 06:53:31 +00:00
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2 
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
 2016-10-12 16:02:47 +02:00
Robert Loehning
169723dd87 Squish: Fix openVcsLog() when an OutputWindow is already shown 
Change-Id: I47432b7367f238a92921bffb030eada902327bd5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:27 +00:00
Eike Ziller
841778ed69 Merge remote-tracking branch 'origin/4.1' 
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
 2016-08-22 16:30:56 +02:00
Robert Loehning
585cc0703c Squish: Remove unused declaration of global variable 
Should have been done in
39103dee4f and
e2adf9b7bb respectively.

Change-Id: I4e16abf8820ed4f1e287505259d71d15e739e996
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-08-17 13:35:29 +00:00
Christian Stenger
5f5d23c389 Squish: Fix triggering "Recent ..." menu items 
These items nowadays have a leading number and colon.

Change-Id: Ib274a7bc601cd06cf7b226f43b011c2b105cc12b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-08-17 12:22:33 +00:00
Robert Loehning
c8e83d0adb Squish: Remove outdated version check 
To build Creator, you need Qt 5.6 at least.
To test Qt 5.6 you need Squish 6 at least.

Change-Id: I5b4c08da64df749961544c25f3ed691ff56d2cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-13 11:10:02 +00:00
Robert Loehning
e0b05758c0 Squish: Fix getHelpViewer() for Qt 5.6 
Change-Id: Ica23ec912f95fe10e838e2055d8294be33ef959b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-28 16:13:40 +00:00
Robert Loehning
7e9aa9c908 Squish: Silence warnings in tst_default_settings 
Change-Id: I668cc7b1fcb569b50d2178fe792f566721c9d4d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 10:40:12 +00:00
Robert Loehning
c1e7cf84e4 Squish: Do not use shell in getOutputFromCmdline 
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 09:13:04 +00:00
Christian Stenger
e564abdd9a Squish: Use more stable subprocess code 
Change-Id: I9a895831f9d57562a9eeb8491cc7f46c1da2eba1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-27 04:35:49 +00:00
Christian Stenger
b1e9290b73 Squish: Raise some timeouts a bit... 
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 05:08:23 +00:00
Christian Stenger
0aff733a91 Squish: Stabilize clickOnTab() on OSX 
Change-Id: I984a6a2012668e0b0095b2118b9d7001c7cda616
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-25 04:41:31 +00:00
Christian Stenger
c9dac0fa61 Squish: Raise waiting time when using FileDialog on OSX 
Necessary especially when trying to open big files for which the
system file dialog of OSX is creating a preview.

Change-Id: I6d352b78f76571fbb7224902b05e228d584c443a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-24 09:59:13 +00:00
Christian Stenger
07ba87349d Squish: Fix accessing Options on OSX 
Accessing the application menu inside the menubar of OSX
does not work properly since using Qt5.
For some time using default keysequences worked fine, but
for the Preferences (Options menu) this stopped working,
so make the used hack even more crude.

Change-Id: I48ed37dc69b8c64f649f0130d48d4deb02afb87e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-13 11:08:06 +00:00
Robert Loehning
3b9f1659eb Squish: Update type of VCS log 
Change-Id: Ia7359be2061a752a3e6957405b0150cd604b3bc7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-11 10:08:40 +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
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
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
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
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
506c0685a3 Squish: Avoid menu problems with Squish 6.0.0 
Change-Id: I43219d36f07e2b5636f84f891f94220148f4dd7f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-09 10:27:26 +00:00
Christian Stenger
029b83b8dc Squish: Fix suite_general 
Change-Id: I4e1458555a971d21e42a071e2fc0b135b0b1e91c
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-14 11:19:54 +00:00
Robert Loehning
50c6343615 Squish: Remove outdated kit handling code 
Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-16 14:44:25 +00:00
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Robert Loehning
e11caa793a Squish: Remove outdated code 
Change-Id: I765374645bb6176028416e7ad8e4ce69df65723d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:45:44 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Robert Loehning
07a52d1ae6 Squish: Remove Qt4 compatibility code 
Thank you Qt4 for all the good times we had together.
Farewell.

Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-31 14:52:03 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +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
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
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
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
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
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
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
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
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
Christian Stenger
7b6da4b7f2 Squish: Fix verifyEnabled() 
If verifyEnabled() was used with an object's real name it failed due
to using invalid syntax.

Change-Id: Ie88ffbda3ab1601fbd781955146b6600ba5104a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-29 15:27:47 +02:00
Christian Stenger
1b6b0b9506 Squish: Stabilize tst_default_settings on Mac 
This also reverts 1605b788e6.

Change-Id: I45b1b856eb6bd0acba43a10866faf2a9726aaa54
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-20 15:43:10 +01:00
Christian Stenger
edf7557749 Squish: Fix and improve __selectQtVersionDesktop__ 
Change-Id: I05e0038f8baf134e6d01d829bd52812b9128dd60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-19 17:19:12 +01:00
Robert Loehning
b071a0ad07 Squish: Update tst_git_clone 
Command line information appears in Version Control view,
not in the dialog anymore.

Task-number: QTCREATORBUG-10531

Change-Id: Ib3a501e32d6105a78d8e4f4f1ad019de22e3ef3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-13 19:23:51 +01:00
Sergio Ahumada
c375436847 Fix some typos 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-05 09:39:42 +01:00
Christian Stenger
48770e5785 Squish: Remove gdb debugging helper stuff 
Change-Id: Ib437d65da31546c8705b64d5ab320f7a7e226bc7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:50:12 +01:00
Robert Loehning
52bff97cfa Squish: Replaced lot of signal code by one simple function 
Change-Id: Idb6b663a8b2be217d8769fab5e2f6f9290f37990
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-22 10:13:02 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +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