Eike Ziller 0a1bdf4257 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6

2012-10-25 10:45:58 +02:00

..

aggregation

Adjust license headers

2012-10-05 17:12:56 +02:00

changeset

Adjust license headers

2012-10-05 17:12:56 +02:00

cplusplus

Merge remote-tracking branch 'origin/2.6'

2012-10-25 10:45:58 +02:00

debugger

Adjust license headers

2012-10-05 17:12:56 +02:00

environment

Adjust license headers

2012-10-05 17:12:56 +02:00

extensionsystem

Adjust license headers

2012-10-05 17:12:56 +02:00

externaltool

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +02:00

fakevim

Adjust license headers

2012-10-05 17:12:56 +02:00

filesearch

Adjust license headers

2012-10-05 17:12:56 +02:00

generichighlighter

Adjust license headers

2012-10-05 17:12:56 +02:00

ioutils

Adjust license headers

2012-10-05 17:12:56 +02:00

profilewriter

Merge remote-tracking branch 'origin/2.6'

2012-10-05 21:20:50 +02:00

qml

Merge remote-tracking branch 'origin/2.6'

2012-10-25 10:45:58 +02:00

qtcprocess

Adjust license headers

2012-10-05 17:12:56 +02:00

utils

Adjust license headers

2012-10-05 17:12:56 +02:00

utils_stringutils

Adjust license headers

2012-10-05 17:12:56 +02:00

auto.pro

Remove "icheck build" test.

2012-09-07 12:30:25 +02:00

qttest.pri

Qt5: Fix warning "qtestlib is deprecated".

2012-10-24 13:51:16 +02:00

qttestrpath.pri

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +02:00