Eike Ziller a47fbb8309 Merge remote-tracking branch 'origin/3.3' ...

Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e

2014-11-24 15:43:48 +01:00

..

commands

License update

2014-10-09 11:41:44 +02:00

container

License update

2014-10-09 11:41:44 +02:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

instances

License update

2014-10-09 11:41:44 +02:00

interfaces

License update

2014-10-09 11:41:44 +02:00

mockfiles

QmlDesigner.Puppet: Adding size hints to Window mockup

2014-09-09 10:38:07 +02:00

qml2puppet

Merge remote-tracking branch 'origin/3.3'

2014-11-24 15:43:48 +01:00

qmlpuppet

Fix linking with the Intel Compiler for OS X

2014-11-05 19:48:18 +01:00

types

License update

2014-10-09 11:41:44 +02:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.qrc

QmlDesigner: read window mock from file

2014-07-30 13:44:01 +02:00