Oswald Buddenhagen 6fb94a7b10 Merge branch '2.7' ...

Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88

2013-05-15 10:21:47 +02:00

..

checkInstalledFiles.py

Fixes for checkInstalledFiles script

2012-01-13 10:09:40 +01:00

createSrcAndDocPackage.sh

Create source zip with windows line endings.

2013-03-11 12:04:13 +01:00

deployqt.py

Fix deployqt for qt4

2013-05-03 16:31:56 +02:00

deployqtHelper_mac.sh

Mac: Deploy and patch qml imports and qml2puppet

2013-04-30 09:18:43 +02:00

fix_makefile_header_dependencies.sh

Fixes: - Move scripts and adapt

2009-02-24 12:29:26 +01:00

fixCopyright.sh

Update copyright check script

2012-10-05 11:49:06 +02:00

hasCopyright.pl

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

krazy2tasks.pl

Quote arguments in krazy2tasks, add usage.

2011-08-29 13:13:52 +02:00

makedmg.sh

Try to workaround issue when creating Mac dmg image

2013-03-15 09:09:07 +01:00

mytasks.pl

Make mytasks script take a origin to diff against

2012-04-24 10:16:09 +02:00

packageIfw.py

Use .run for standalone packages.

2013-03-25 11:32:13 +01:00

test2tasks.pl

test2task.pl: Mark XPASS as an error as well.

2012-07-26 23:05:48 +02:00

unixdeployqt.sh

Incremented year in copyright info

2013-01-29 16:27:03 +01:00