Conflicts:
	share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.h

Change-Id: I268072db01064d71bc4828942d71fc772ddd3539

With this patch it's possible to not only hook into the
QmlApplicationViewer (although nothing else is currently done)
and additionally to not only send the closing event to the
sub-process. You can now define a function that will be executed
on the sub-process.
Both modified tests show an example how to use it.

Change-Id: I39b9959f2cf1d519b8afeb0c479ac2d68ea20ca6
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

Change-Id: I9453abd43299416e8d8535f9567fe96ff976e413
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ife3830e12cd3f44c29dc3e531f104ffb894efe0f
Reviewed-by: hjk <qthjk@ovi.com>

The cropping coordinates are stored in a file
images_areasofinterest.xml. A tool to create/maintain the cropping
coordinates is included in this patch.

Then changes to Delegate.qml prevent QML from scaling the image.
If scaling is needed it is now the job of the Image provider.
dropshadow.png had to be adjusted because the border had different
widths and heights.

Change-Id: Ib25db896d40eeec0e0a373c971931dc5cabf3cbe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Change-Id: If6cfec0f836cf1ca31a194461e55e2fdd04b2250
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Change-Id: I33bd046eca253130049d0a80de7a1a3f3e442307
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ia1a5cbe1ace8e4bed0500e7c46fcff90a10cc7ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

Change-Id: I8ad167cca8c878efd67eca9ac48b4df237d31726
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

With cc11186b starting a new search
would not move focus to the search term.

Change-Id: Ibf84e632e99902d4a06d998271b49ebe614b79d8
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I0628254ff9ff37ba2d524ef9462a125692aef9a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: I7e97af90cb7cd4c93abe2330cfbd92581b2be22e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: If1df106677a575a646c8ff2c4860cd366882077a
Reviewed-by: Steve King <steve_king_1974@yahoo.co.uk>
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I98953503fcb7b79b76927c50f39b82f2ceb6508d
Reviewed-by: hjk <qthjk@ovi.com>

Adding customized thumbnails for tutorials

Change-Id: Ide75daadff24180f7d3274c5a6b08bbce630281c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Using a proper logo now

Change-Id: I57da3e046e7b662d034632a530ab9aaf6ec6eafe
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: Iec0d827040f1ac679c8a34a3292c3fc91067e70c
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ib1659da5f41c51675274bdd0780d060eb3a737be
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

That is set the argument to "clean" and ensure that the return value is
ignored.

Change-Id: I1f15ad464e6f4608d7eb698365846a4c765f1d22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>

* Don't build all default values (including the global object)
  separately for each ValueOwner instance.
* Instead, keep all global, immutable values in a single, shared
  instance.

While refactoring, some cases where we *modified* the global object had
to be removed:

* C++ context properties no longer get injected into the global object,
  instead they now have their own scope just above the global one.
* The Qt object's prototype no longer gets modified in Link. Instead,
  it's now a reference to the "Qt" object provided in a qmltypes file.
* The whole concept of a function 'Activation' that could potentially
  affect the global object was removed.

Change-Id: Id382faf965efa747fcc7a9b0bc2c90429d84d61b
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>

Before, we didn't transform the code style settings
if they were defaults (so no entries were written
for them in the settings). In case someone
changed global tab settings and didn't touch
code style settings in 2.3, the code style settings
were not transformed. Now, we transform them too
so that legacy code style settings in 2.4
(named: "Old Creator") contains old global tab settings.
We also take care of not creating legacy settings
in case neither textTabPreferences nor CppTabPreferences
nor CppCodeStyleSettings were saved (when creator 2.3 used only
defaults or when it's a first run of creator 2.4 without
old settings).
Handle legacy transformation for qml too.
Make a code bit more readable.

Task-number: QTCREATORBUG-6614
Change-Id: I37b8dd4d1170f397b7d304c59575d9ae37884564
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1

Change-Id: Ic65e1500c3727c26919050cdd5834dc904ad80d0

Change-Id: I9d0791ed519949be820e737d43669ca899a5cef6
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Clear up Context documentation a little.

Change-Id: I2ede3dc0f15a972d2748cef1aa579a04f0786106
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>

Change-Id: I718a74ecdbe24db917bbc2d8f3c9abddf051e134
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>

Change-Id: Iac7de58ca8681a60a4b6c9d0e717eb57753898b5
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I1f0d48712f5ec081fa323e929dabaeee1dbf9b63
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

Task-number: QTCREATORBUG-6579
Change-Id: Ia1d629df24e1a4c7f4f830f575d1be4adc552409
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Having them behave differently depending on the locked mode was
confusing.  This patch moves that functionality to the event labels,
thus next and prev just select next and previous events in the
timeline, in strict chronological order.

Change-Id: I5bd996199dd6a4af4c65e3205493f17495d0135b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

New structure and images.
Create a new page for tutorials.

This should have actually been part of the previous commit
"resolve merge conflicts".

Change-Id: I2138569c551fa55a978ee4ac4554544b04a671e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Apparently, packages installed by dpkg are not uninstallable via the
home screen.

Change-Id: Ibe22b0ecde983ad3dfafb374eabff18db9055b74
Task-number: QTCREATORBUG-6603
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Change-Id: Id08dab3128b9ff943c68b442e8cadf14caaee204
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I02543af2ce90dfa5bda88533ead39a7dbede90d4
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>

Do not define USE_QT_GUI.

Change-Id: I9af5659d26f6a4634109987a1e69454348f730a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: I5d79394529f3ba303e7353a60df77f59bbe38a12
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

Change-Id: I97bb5f03fffc306035ab6e4b4c2d7ec5e434be2e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

The search result pane set a minimum size for the "New Search"
panel which forced this relative big minimum size on all panels
and made it impossible to make the output pane area small.
Now, the new search is wrapped into a scroll area, doesn't
enforce a minimum size anymore, and, instead, when initiating
a new search (via shortcut or menu action) resizes the pane
so the panel fits nicely.

Change-Id: I9afe67e66f324111a10a97f33c203846231e6a93
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I9e566781d719292a6881d040385bd5ce649d398a
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>