Eike Ziller 767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb

2015-02-25 10:15:28 +01:00

..

analyze

Allow QML profiling when using Qt Quick compiler

2015-02-19 10:09:07 +00:00

android

Update License

2015-01-16 12:37:56 +01:00

baremetal

Update License

2015-01-16 12:37:56 +01:00

debugger

Allow QML profiling when using Qt Quick compiler

2015-02-19 10:09:07 +00:00

editors

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

howto

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

ios

Update License

2015-01-16 12:37:56 +01:00

linux-mobile

Update License

2015-01-16 12:37:56 +01:00

overview

Update License

2015-01-16 12:37:56 +01:00

projects

Merge remote-tracking branch 'origin/3.3' into 3.4

2015-02-25 10:15:28 +01:00

qnx

Doc: use \uicontrol command instead of \gui macro

2014-12-12 10:26:59 +01:00

qtquick

Merge remote-tracking branch 'origin/3.3'

2015-02-12 17:36:29 +01:00

widgets

Update License

2015-01-16 12:37:56 +01:00

winrt

Update License

2015-01-16 12:37:56 +01:00

qtcreator.qdoc

Update License

2015-01-16 12:37:56 +01:00