Eike Ziller 79bd453feb Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	src/plugins/winrt/winrtruncontrol.cpp
	src/plugins/winrt/winrtruncontrol.h

Change-Id: Idad0558e53e23debee8523586b681af4705e97f6

2014-06-24 14:52:00 +02:00

..

cplusplus

Incremented year in copyright info

2014-01-09 09:41:23 +01:00

debugger

Debugger: Add personaltypes.py as default location for local additions

2014-06-24 09:41:16 +02:00

designer

Fixes: Implement make install target, Step 1

2009-01-21 08:52:19 +01:00

generic-highlighter

Update generic highlighter definitions

2014-03-28 09:24:08 +01:00

glsl

Incremented year in copyright info

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

qml

QmlDesigner: Fix "unused argument" compiler warnings

2014-06-23 15:30:18 +02:00

qml-type-descriptions

qmljs: update import completion list

2014-05-17 13:28:01 +02:00

qmldesigner

QmlDesigner.PropertyEditor: Fix GeometrySection

2014-06-24 12:29:46 +02:00

qmlicons

PNG: Fix warning about sRGB information

2013-05-27 16:12:01 +02:00

schemes

Change the shortcut for ui form preview

2010-08-25 11:57:02 +02:00

scripts

consoleprocess: support Terminal.app on mac

2013-01-29 17:56:59 +01:00

snippets

Snippets: Allow lowercase/titlecase/uppercase modifiers for variables

2013-08-20 14:49:17 +02:00

styles

DiffEditor: Fix name for style constant

2013-07-03 07:42:12 +02:00

templates

Wizards: Use configured extensions for c++ sources and headers

2014-05-27 15:39:38 +02:00

translations

Update Czech translation

2014-06-19 16:57:23 +02:00

welcomescreen

Help: Open example documentation in extra window

2014-06-24 11:22:20 +02:00

static.pro

Add experimental clang code-model plug-in.

2013-12-20 17:05:09 +01:00