feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
51,647 Commits 108 Branches 368 Tags
e4a62670369f476cede692c3c71c8426206d2d43
Commit Graph

28 Commits

Author SHA1 Message Date
Montel Laurent
158ab3316e Use QString::*Ref method 
Change-Id: I63a10f274dd17e08b5b8a2577762cc9f7960b5af
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-04-21 12:04:38 +00:00
Montel Laurent
f976dc96fd Reserve some elements 
Change-Id: Iceef4e9a6f213a747045db3b06a5608d77652f98
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-04-14 13:18:17 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3 
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
 2017-03-14 16:20:14 +02:00
Samuel Gaist
4033471aa9 QRegExp include cleanup 
This patch adds the missing include statements for QRegExp.

Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-03-13 22:05:30 +00:00
Jarek Kobus
d34414b428 Make some variables const 
Change-Id: If0b6939d2c8446526f6d779486776bbea62fbc67
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-23 10:57:34 +00:00
Jarek Kobus
2c050f7750 Don't use static variables in differ 
Now the differ may run in parallel
in many threads. Static variables
may lead to crash.

Change-Id: Iae0d7678cdca3e57cb619141081250b458852bfb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-23 10:57:15 +00:00
Jarek Kobus
2144fb5949 Move diff calculation to the separate thread 
It doesn't freeze creator anymore.

Task-number: QTCREATORBUG-14255
Change-Id: I3d06ea7a848e321c6072e00a73b96e9ea9770b6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-21 15:43:03 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Nikita Baryshnikov
b0df9dc13b DiffEditor: avoid gcc warning 
overflow in implicit constant conversion

Change-Id: I8eaf55ab1e2108de44e7aa2dc832e1ee13814d3b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-07-01 12:41:34 +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
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
jkobus
8cad94534f Implement unified diff editor 
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-06 12:33:59 +02:00
Orgad Shaneh
e7a7c02b4d DiffEditor: Pass const lists and string by reference 
Change-Id: I6acdc4db61aeed1353bed2207736268dfabf3f17
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-05-20 12:36:19 +02:00
hjk
e47acb151b Compile fix with Qt 4 
Change-Id: I28b9a63a066521cdbe67ad9b51d795450b6d070a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-14 16:36:50 +01:00
Jarek Kobus
1c76e25fdc Move some functions to Differ, add unified diff 
Change-Id: Id8178fb84f25a18fda42e02954f28359d0ef4623
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 14:37:55 +01:00
jkobus
a4b00160bb Refactor diff editor widget, fix whitespaces handling 
Prepare for ignoreNewLine handling

Task-number: QTCREATORBUG-11002

Change-Id: I97fc0887ef27c821252283ccbad655ac0bc79f0a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 13:43:09 +01:00
jkobus
242ae4ce37 Fix return arg of Diff class getter 
Change-Id: I25dc6d2992831d79077e4d06f52018d6191e0bfb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 15:15:03 +01:00
jkobus
096bc3b0e1 Add default arg to Diff ctor 
Change-Id: I97d4b99250d55216ef866f7529ca423e2133db09
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 15:14:51 +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
Orgad Shaneh
4442a92729 Braces cleanup 
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-14 08:13:52 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
 2013-03-18 10:19:14 +01:00
jkobus
7d41817ec3 Add cleanupSemanticsLossless for even betten diff output 
This can format the output in a more human friendly format:
EQ("Th") INS("at c") EQ("at cartoon") -> EQ("That ") INS("cat ") EQ("cartoon")

Change-Id: Iab545c0c0bccffa379f346e482b17b574e05e88a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-15 14:32:58 +01:00
jkobus
41fa8c3528 Add cleanupSemantics method, produce nicer diff output 
Change-Id: I877e06c930c219ad23af4b7c6078d8c8db3706e9
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-14 09:36:15 +01:00
jkobus
2b11c75cad Add a comment about the sources of inspiration for diff algorithm 
Change-Id: I34123d6d9398bcb3afaa5bf8d043c3fd296f5f4d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-12 15:01:10 +01:00
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
Friedemann Kleint
9f7a1e3d65 Fix Krazy warnings about QString::null/clear(). 
Change-Id: I11faa5af0c186a9126c4af6f86e56250030d6cd9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-03-11 14:41:03 +01:00
Friedemann Kleint
6d3c271d53 Rename namespace DIFFEditor to DiffEditor. 
Change-Id: Ia87098de61f38530806e1cf87b69d0bfc66e250c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-21 17:13:06 +01:00
jkobus
0e91d10878 Experimental integration of DiffEditor 
After enabling the plugin go to Tools|Diff...

Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-18 18:15:51 +01:00