Oswald Buddenhagen
06acd82ada
derive TARGET from QTC_{LIB,PLUGIN}_NAME
...
the information is redundant now
Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-04-03 14:37:56 +02:00
Oswald Buddenhagen
66a3553107
make library and plugin dependencies declarative
...
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
2013-04-03 14:37:45 +02:00
Oswald Buddenhagen
9631fb88cf
centralize assignment of TEMPLATE = lib
...
Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-04-02 17:13:17 +02:00
Oswald Buddenhagen
7ce3362288
automatically include libs' and plugins' _dependencies.pri files
...
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-04-02 12:19:31 +02: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
Friedemann Kleint
8c97b21e2a
Fix Krazy warnings about includes/header guards in various plugins.
...
Change-Id: Iafd1b3be1ad43bb7519e14059ac2d33eb859c625
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2013-03-13 14:07:28 +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
jkobus
4c75dd71ed
Optimize painting of skipped lines, don't paint "..."
...
Change-Id: I4a803ca899438ea0067c9a6244dffc77bc7109dd
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-03-07 00:47:14 +01:00
jkobus
9abb8563e3
Standardize IEditor subclass names, don't capitalize namespaces
...
Change-Id: I13ac8d4286b292c03019a7a564feee2c36475bf9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2013-02-22 11:39:22 +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
Friedemann Kleint
34692eea2e
tr()-Fixes in Diff-Editor: Capitalization, add comment.
...
Change-Id: Ib6b1c15e6a8d3452e3d9d8dd769f500965f08473
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com >
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
2013-02-20 09:03:22 +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
