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

..

build_utils.py

Squish: Avoid pointless waiting and warning in selectBuildConfig()

2014-06-03 14:57:34 +02:00

clang.py

Squish: Add shared file for clang-related code

2014-09-25 16:00:50 +02:00

classes.py

Squish: Replace Qt 5.0 by Qt 5.3

2014-07-29 18:15:05 +02:00

debugger.py

Squish: Fix getEditorForFileSuffix() and simpleFileName()...

2014-06-04 15:12:50 +02:00

editor_utils.py

Squish: Update getEditorForFileSuffix()

2014-09-18 11:00:40 +02:00

fs_utils.py

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

hook_utils.py

Squish: Fix expected object

2014-06-30 11:05:53 +02:00

project_explorer.py

Squish: Update getQtInformationForBuildSettings()

2014-06-27 13:27:47 +02:00

project.py

Squish: Updates to keep suite_debugger running

2014-09-17 16:45:04 +02:00

qtcreator.py

Squish: Add shared file for clang-related code

2014-09-25 16:00:50 +02:00

suites_qtta.py

Squish: Revive WELP01 for Squish 5.1.1+

2014-07-28 14:50:41 +02:00

utils.py

Squish: Use small letters in shortcuts

2014-08-18 15:20:27 +02:00

workarounds.py

Squish: Remove workaround

2014-04-04 12:18:00 +02:00