3 Commits

Author	SHA1	Message	Date
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
jkobus	5c6b1373c4	DiffEditor: Use settings' foreground color for highlights ... Simplify drawing highlights by passing selections into a drawing function. Reduce selections which are covered completely by other selections. Task-number: QTCREATORBUG-12844 Change-Id: If282d5c881d25cac1b8db4ac8dfc45d47b0b8580 Reviewed-by: Orgad Shaneh <orgads@gmail.com>	2014-09-29 08:21:34 +02:00
hjk	953cdb971f	TextEditor: More BaseText* -> Text* renamings ... *Document* and *Layout* classes, all basetext* files Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde Reviewed-by: Eike Ziller <eike.ziller@digia.com>	2014-09-26 10:12:51 +02:00