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

..

build_utils.py

Merge remote-tracking branch 'origin/2.7'

2013-05-03 09:49:28 +02:00

classes.py

Squish: Add helper functions to Target class

2013-04-10 13:39:10 +02:00

debugger.py

Squish: Made tst_simple_debug more strict

2013-03-08 12:39:33 +01:00

editor_utils.py

Squish: Stabilize invoking context menu items on Mac

2013-05-06 12:46:18 +02:00

fs_utils.py

Squish: Test handling of read only files

2012-11-01 17:09:40 +01:00

hook_utils.py

Squish: Prepare re-usage of batch editing...

2013-05-15 08:59:16 +02:00

project_explorer.py

Squish: Fixed typo in getQtInformationForBuildSettings()

2013-04-04 11:30:27 +02:00

project.py

Merge remote-tracking branch 'origin/2.7'

2013-05-03 09:49:28 +02:00

qtcreator.py

Squish: Fix detection of ABIs on Mac

2013-03-28 09:22:43 +01:00

suites_qtta.py

Squish: Prepare tst_simple_analyze for Qt5

2013-04-05 13:52:14 +02:00

utils.py

Squish: Updated progressBarWait()

2013-05-15 10:12:02 +02:00

workarounds.py

Squish: Changed handling of workarounds

2013-04-25 12:39:50 +02:00