feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,532 Commits 108 Branches 368 Tags
cc05c1637778db8210ea901b8da71aeef1bde05e
Commit Graph

8014 Commits

Author SHA1 Message Date
jkobus
2433ee7da0 Add autotests for diff editor 
Change-Id: I46c1d5c623b0ffd8c0dc16d218094d05c9975ea5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-12 13:56:54 +01:00
Robert Loehning
530b2f79eb Squish: Reduced timeouts in tst_memberoperator 
Change-Id: I0945c1752500a32b45320497e12d96fa7d8f623f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 12:39:51 +01:00
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
 2013-03-12 10:56:52 +01:00
David Schulz
b46ec1db9d Debugger: Dumpertest: Add getter for autoremove property 
... to the TemporaryDir class for Qt4.

Change-Id: I5cecb4dd0af640485cdb3e4d7222ea675e060e01
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 10:48:24 +01:00
David Schulz
ec724f9a46 Debugger: DumperTest: Stop on failure. 
Change-Id: Ie56d1c746013b21037291208ab51fdee8e01a8cd
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 10:48:07 +01:00
Christian Stenger
4c877c70b5 tests: Fix compile with Qt4 
Change-Id: Ibad7e607ced1c6acdad829af82e1b874ddacb871
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-12 09:29:41 +01:00
Nikolai Kosjar
ceb314b3ec C++: Tests: More lexer tests for doxygen comments 
Change-Id: Ib031eb791f0a089376d02cc75a62fcc7d1f859cb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-03-12 09:04:07 +01:00
Nikolai Kosjar
47d60ae89a C++: Consider '^//[/!][^\n]*' as doxygen comment 
Now everything following '///' or '//!' is a doxygen comment.

This simplification fixes also the bug ('\n' was considered as part of
the doxygen comment and led to strange highlighting).

Task-number: QTCREATORBUG-8921

Change-Id: I6dae3b80ec11400f2f623897257782a80860a7f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-03-12 08:31:05 +01:00
Nikolai Kosjar
29055f9f43 C++: Fix crash due to dangling pointer 
ResolveExpression used the wrong Control object, which was deleted by
~LookupContext() in TypeOfExpression::operator()). ~Control() led to the
dangling pointer.

Task-number: QTCREATORBUG-8890
Done-with: Erik Verbruggen <erik.verbruggen@digia.com>

Change-Id: Ic07947ee54087446b730e4d3ec4bef29defa4495
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-03-12 08:29:48 +01:00
Robert Loehning
0d9822ae80 Squish: snooze before restarting Creator in tst_installed_languages 
Change-Id: Ie548e034f74eeb201e9475950487fc636576ce10
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-11 17:34:52 +01:00
Oswald Buddenhagen
eb93ad3553 fix arguments in parsedProBlock() calls 
Task-number: QTCREATORBUG-8934
Change-Id: Ifcf0de22d8beed692fccc5fca162ec9fa5d97a7f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-11 17:15:27 +01:00
Christian Stenger
9734fc4f4c Squish: Fix tst_modify_readonly 
* Fix handling of modified files (if a file is read-only but not
expected as such the test crashed)
* Hopefully fix the permanent crash on the build machine while
waiting for the not expected message box while Creator shuts down

Change-Id: I84af2d25633f24256c20ada82acd9e13b743b4bf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-11 16:01:19 +01:00
Orgad Shaneh
17dca2450a Tests: Fix unused value warning 
Change-Id: Iee5274235f034bc3bbb2688f6cfaa6a4a2430530
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-11 11:29:14 +01:00
hjk
d44bac6f43 FakeVim: Make plugin standalone if necessary 
It's possible to use FakeVim as standalone plugin for a QTextEdit or
QPlainTextEdit widget, so there should be minimum dependencies on
Qt Creator code.

Change-Id: I415ed87f5e4d97ea78d9d25a8f0c82701ef1f70d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-08 17:53:14 +01:00
hjk
e1f0840820 Debugger: Allow specification of gdb version constraints in tests 
Change-Id: Ida6ada411ec818d7570f36d1d58576a93b8262ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-08 17:31:23 +01:00
Christian Stenger
20c53542dc Squish: Wait a bit before checking settings 
Fails on the build machines from time to time because Squish does not
wait for Creator to quit it just invokes the menu item and checks
afterwards.

Change-Id: Ieedc2437006f5af3074c155e514489fe911e815d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-08 13:16:13 +01:00
Christian Stenger
e044e7cc69 Squish: Stabilize test for build machines 
Change-Id: I8701c6a46ef749e4c2b905554efc16746a991e56
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-08 13:16:04 +01:00
Robert Loehning
f09ce82e23 Squish: Made tst_simple_debug more strict 
Change-Id: Iac438c8a55c8ea144c682257e140f9370e999e69
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:33 +01:00
Robert Loehning
b2ef08a5c0 Squish: Shortened verifyBreakPoint() 
Change-Id: I98ed094ec4a6ad2545ee804934fe1674c4b97d9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:14 +01:00
Eike Ziller
f60873a24f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
 2013-03-08 11:39:33 +01:00
Christian Stenger
bebf8d50a9 tests: let tst_dumpers compile with Qt4 
Change-Id: I34851ebfc054f0f8265e5ce1623e0db956aab085
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-06 15:12:20 +01:00
Christian Stenger
cc454d11fc Squish: Improve cleanup on Win 
Change-Id: If39af63b6b65cb09c351bef6158c8ae8b9837668
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-06 14:13:04 +01:00
Christian Stenger
2ed55c8076 Squish: Provide function for writing out results 
...in preparation for adding these to the automatic statistic thingy.

Change-Id: Ieeab062b426ac3b9053d0499fdb38f0abacb89c9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-06 08:49:38 +01:00
Orgad Shaneh
ef8787e59f Fix tests compilation 
Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-03-05 09:01:18 +01:00
Christian Stenger
4e6c539685 tests: allow execution of test from outside 
It shouldn't be necessary to be located inside the pluginspec
folder to execute this test.

Change-Id: I11661760a4d80a4f36980ad6e0077345c56b26e5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-04 15:36:03 +01:00
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
 2013-03-04 15:07:19 +01:00
Erik Verbruggen
4cf1ccd161 C++: Fix semantic highlighter and tests. 
Fixed the chunk size calculation, made the sorting more stable, and
fixed the tests.

Change-Id: I81fcffbf2ce9b63dd81f1a0e251200a31220db88
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-03-04 13:16:50 +01:00
Christian Stenger
d101a3609c Squish: Fix hook into QtQuick and QtQuick UI 
Change-Id: I168ee74464cfc1ae9efbd69f8e0f3cb10cbbf2d4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-04 12:53:08 +01:00
Jan Kundrát
4250b86a73 Fix build error (missing Q_DECLARE_METATYPE) 
Change-Id: Iaba3ebbb3960dc6fe07b8382be29071ce7af5bfb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-03-04 10:25:52 +01:00
Robert Loehning
4f74e04ec4 Squish: Recommending 4.2.3 
Change-Id: I6514b015afffaa15d36103b269b0775ff063c3a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-01 17:04:56 +01:00
Robert Loehning
65a07823ac Squish: Report error in selectFromFileDialog() 
Change-Id: Ib32a1b78106a298996e1d29207998fc8f312208e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-01 12:49:14 +01:00
Christian Stenger
6ef0c4093b tests: Fix compile for tst_pluginspec 
Change-Id: Ie15dd6834c196ef95eb1899e71fed92a0519f9c2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-01 12:26:36 +01:00
Robert Loehning
497eb16455 Squish: Make sure file was opened in tst_select_all 
Change-Id: Iad2c590fd7cc87d8267ecdca515dbef48480e9ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 17:47:25 +01:00
Robert Loehning
482c8c0f6b Squish: Downgraded fatal to warning 
Change-Id: I8bf3e3d562daddd80ece4c23cc1b5373bfe7eefd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 13:51:12 +01:00
Robert Loehning
7cb50891dd Squish: Don't use global variable for __isWinFirewallRunning__() 
Change-Id: Iaad1da549addbb856515ae95ece4ae43246637fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 13:33:46 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
 2013-02-28 12:02:40 +01:00
Robert Loehning
fac11973af Squish: Syntax fix 
Change-Id: I33dcde34b176b5918d976c3e474a7702b53a2fa3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 11:55:40 +01:00
Lukas Holecek
d5261a763d FakeVim: Removed old tests 
New tests are part of the plugin implemented in "fakevim_test.cpp" file.

To run the new tests, FakeVim must be built with "qmake TEST=1".

Test invocation examples:

  qtcreator -test FakeVim
  qtcreator -test FakeVim test_vim_movement

Change-Id: I40bfe7e9e9031719201909ef97cbd4b82caa002f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-26 20:21:02 +01:00
Robert Loehning
4d7e1c43db Squish: Tuning tst_select_all 
Change-Id: I14ba2d2eee033a6e779cd1cca47e25572020dc40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-26 12:58:53 +01:00
Jan Kundrát
b9a4cac0b3 Fix building with -DQT_NO_CAST_TO_ASCII 
Change-Id: Ie919eff17c3122a70f4a8f3349b399e0a62017aa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-26 09:20:12 +01:00
Jan Kundrát
eb97b2b1cb tests: fakevim: fix building with QT_NO_CAST_FROM_ASCII 
This is apparently the default in my build environment.

Change-Id: I7bcb971a0e819b9a7693c08e95fe73a0b6ff7bbc
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-26 08:10:03 +01:00
Christian Stenger
86d3e075ff Squish: catch plugin loader error if it occurs 
...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:52:13 +01:00
Christian Stenger
4a78d4da3f Squish: Fix wrong signal handler call 
Change-Id: I94020e0afa85a86f5eb80fe4cf1cbb4c58edb6a6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:43:40 +01:00
Robert Loehning
7c9d2e3a1a Squish: Fix invoking context menu sub items 
Change-Id: I7d498ac3d4e2e2d25b3c504a95f96e434d0d1619
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-21 13:55:45 +01:00
Robert Loehning
40a1b4afb7 Squish: Updated updated expectedText in tst_QMLS02 
Change-Id: I7177e8b1b84fb780c5e1706a2979b6da8c71edda
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-20 15:35:04 +01:00
Nikolai Kosjar
61460951ce C++: Fix highlighting of doxygen's "///" 
The color scheme changed for "///\n" lines:

 "///\n"       - "Doxygen Comment" (was "Comment")
 "/// hello\n" - "Doxygen Comment" (as before)
 "////...\n"   - "Comment" (as before)

Change-Id: I6bdaf471760bb05547385fd4821eded6cefed4d7
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-02-19 10:17:55 +01:00
Christian Stenger
80263a5221 Squish: Fix some Mac/Squish issues 
Details:
* wrong shortcut usage replaced
* timing issues fixed
* re-used the editor-focus-on-mac workaround for some tests

Change-Id: Ie0d65d941c999d545bd50e1cf4794624c4110247
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-18 12:56:46 +01:00
Robert Loehning
dd32d14a55 Squish: Removed unused functions 
Change-Id: Ia9b63b9d4846b425cfa52ded0a0f5f54f4c4f0ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-18 12:16:04 +01:00
Christian Stenger
85ec0cdfbe Squish: Improve ensureChecked() 
...to avoid misbehaviour especially on Mac.

Change-Id: I25053ea34b180a60d9a260798f7758df8a1224e2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-15 14:31:55 +01:00
Christian Stenger
cbb934455a Squish: Fix QMLS04 on Mac 
Change-Id: Id5f5fd0dbd77ad8ad39cfa3e482ec688c35f932d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-15 09:17:23 +01:00