Merge branch '2.3'

Conflicts:
qtcreator.pri
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
src/plugins/remotelinux/maemodeploystepfactory.cpp
src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e

Revert "RemoteLinux: Temporary changes for RDADeployment plugin." for master merge.

This reverts commit e6dbfb2d1a31bb6fdb8cb99463387b974a066f26.

Generic Project: Propagate toolchain changes

Change-Id: I629101990fb041aa421803dc5485e59acc8a7dd2
Reviewed-on: http://codereview.qt.nokia.com/1525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

RemoteLinux: Move constants and functions to more suitable locations.

Mostly to facilitate splitting up generic Linux und Maemo-specific
things.

Change-Id: I6072ae7deaea013219e8969d6a5254e6c5c96693
Reviewed-on: http://codereview.qt.nokia.com/2098
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlDesigner.contextMenu: disable reset if properties are not defined

Reset Size is now disabled if the item(s) has no property "width" and "height".
The same for Reset Position and "x" and "y".

I added const QList<ModelNode> &selectedModelNodes =  m_view->selectedModelNodes();
to clean up the code.

Task-number: QTCREATORBUG-5573
Change-Id: I7383e28a7b304bcfa27a5687e84d9f489dfc8a02
Reviewed-on: http://codereview.qt.nokia.com/2094
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

WelcomeScreen: Clean up tag browser

- Always show tag browser button
- Make tag browser button a toggle (popup semantics)
- Remove "Clear" Button

Change-Id: Ic1f6894103fdc14973c230764ffb06574dd1897b
Reviewed-on: http://codereview.qt.nokia.com/2048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

WelcomeScreen: Implementing proper search lexer/parser for the lineedit.

Now copes with quotes and "tag:" prefixes.

Change-Id: I348e533ab290242fd05a034a2912cc95f0a9a3da
Done-with: Roberto Raggi
Reviewed-on: http://codereview.qt.nokia.com/2038
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

RemoteLinux: Internal settings pages improvements.

- Use better strings for category and id.
- Don't set display category and icon again in Qemu settings page.

Change-Id: I054d70bbd59521ca22f528ecb42eee35ecb73ecd
Reviewed-on: http://codereview.qt.nokia.com/2049
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

RemoteLinux: Temporary changes for RDADeployment plugin.

Export some classes.

Change-Id: Ib959273f4204854b7ce4834afaf84c8222efa9aa
Reviewed-on: http://codereview.qt.nokia.com/2047
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

L10n: German translation for 2.3.

Change-Id: Ifef3c7042bafbcdf03d1c434d1bf971aa57ceba5
Reviewed-on: http://codereview.qt.nokia.com/2046
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

RemoteLinux: Split up settings pages files.

We need to have separate ones for remote Linux in general
and Maemo-specific stuff.

Change-Id: Ib3aa5f0abb90446f356a6c75b8754388346eacb0
Reviewed-on: http://codereview.qt.nokia.com/2045
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

RemoteLinux: Remove unneeded #include from header file...

... and add it to all the files which inadvertantly relied on it.

Change-Id: Icc5bb12592fb32c79d19c720de69e405a50b375f
Reviewed-on: http://codereview.qt.nokia.com/2043
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

RemoteLinux: Rename and export MaemoUsedPortsGatherer.

Class is not Maemo-specific.

Change-Id: I14473cb329e4955d24dae1a1a4961eb6ebff869c
Reviewed-on: http://codereview.qt.nokia.com/2042
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlProfiler: refactored warning messagebox

Change-Id: I41e361fc2dc1cab0f103eccbb15b9c38cc78cb77
Reviewed-on: http://codereview.qt.nokia.com/2041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

WelcomeScreen: fix Regression

Dropping files on the welcome screen would not open them.

Change-Id: I8ea6b4a55abdec47e40fdeb02d97f45d22db2fb1
Reviewed-on: http://codereview.qt.nokia.com/1992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

Git: Ignore more generated files

Change-Id: Ic640fcf4f266de92077c733727f5bc8aa08625e2
Reviewed-on: http://codereview.qt.nokia.com/1939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

QmlProfiler: show warning when no executable given

Task-number: QTCREATORBUG-5266
Change-Id: If1639e322f4ab0d7065e3394129c6649f17e98c9
Reviewed-on: http://codereview.qt.nokia.com/2039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

Wrap "Click here for more" label.

In case other languages show longer text.

Change-Id: Ied7ddc40d43f8c5c473345ee30d2ca63662a25e6
Reviewed-on: http://codereview.qt.nokia.com/2025
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Doc: fix the Battery Status example code

Add example source files to the repository and use snippets in the doc.

Change-Id: I7ce13c2d5d0994a92d1b001e19af28aec8049e8e
Reviewed-on: http://codereview.qt.nokia.com/2030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>

RemoteLinux: Rename a bunch of classes.

They still had "Maemo" in their names, even though
they are not Maemo-specific (and will not move
to the respective plugin).

Change-Id: I5eec0de27db8340f2a987a6ed685b3ae46ec17b0
Reviewed-on: http://codereview.qt.nokia.com/2036
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlDesigner.propertyEditor: fixing restoring values for anchors

Restoring values properly after removing anchors.
Some code cleanup.

Task-number: QTCREATORBUG-4837
Task-number: QTCREATORBUG-5303
Change-Id: Ibb3223b696b6ac0298d746223f5a6e90562f3db0
Reviewed-on: http://codereview.qt.nokia.com/2034
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: reduce delay

Since we changed the slection behaivour after drag and drop
this makes the designer more responsive.

Change-Id: I21c14a126ff0b63151002ac51e841a624b43e879
Reviewed-on: http://codereview.qt.nokia.com/2033
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.rewriter: fixing compare function

Comparing doubles is hard.
I forgot to round properly.
I also added some early rejects.

Task-number: QTCREATORBUG-5503
Change-Id: I959abbe28a312aea63a170d9c769b5555ac6a30e
Reviewed-on: http://codereview.qt.nokia.com/2032
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

DebuggingHelper: Use right toolchain

Don't just use an arbitrary toolchain, which might break esp. for Symbian.
Instead, retrieve the toolchain from the project, or in the case of the Qt Options
page let the user choose.

Change-Id: I6d271c485420e609d223d8cece754ef84e573745
Reviewed-on: http://codereview.qt.nokia.com/1978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Harmattan: Use "single-instance" in default desktop file.

Change-Id: I30b6fe90ea37cc28f93710efcb4233028ca0f90d
Reviewed-on: http://codereview.qt.nokia.com/2029
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlDesigner.rewriter: fix for linebreaks

fixing escape() and descape()

Task-number: QTCREATORBUG-5528
Change-Id: Ia51aee21875c912685d38b61fcda6c048ca1e246
Reviewed-on: http://codereview.qt.nokia.com/2027
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: support for line breaks in text edit

Also fixing a crash regarding translation.

Task-number: QTCREATORBUG-5528
Task-number: QTCREATORBUG-5527
Change-Id: I478d72c3fc5e79919011ff709fcf363054fbca4e
Reviewed-on: http://codereview.qt.nokia.com/2028
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Clean up before building debugging helpers

Task-number: QTCREATORBUG-5532
Change-Id: Ic00b486c8bad9b7f4abc61cbd55893b236c4c8cc
Reviewed-on: http://codereview.qt.nokia.com/1880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

RemoteLinux: Split up "remote processes" functionality...

... into generic and Maemo-specific parts.

Change-Id: If1f3664ed7320d3e51655cc092cea36be1a9fe66
Reviewed-on: http://codereview.qt.nokia.com/2026
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

WelcomeScreen: Fix compilation with namespaced Qt.

Change-Id: Ia5695feaebba959f84ab4d2707a2d5f1667ad3c7
Reviewed-on: http://codereview.qt.nokia.com/1960
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

FileUtils: Add some safety checks to removeRecursively().

Change-Id: I657f8416081ce7d253f4a3ef9722a39ac34b5f24
Reviewed-on: http://codereview.qt.nokia.com/1955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Doc: using Qt Quick Components for Symbian with Qt Mobility

Change-Id: Ie143e560f67cb99b7b4a70736071eefd57a2e381
Reviewed-on: http://codereview.qt.nokia.com/1954
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>

QMLProject: Use cancel button.

Change-Id: I2c9b3d3fb6b48428a0b8b9c46c5c994eb8941e13
Reviewed-on: http://codereview.qt.nokia.com/1979
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

QmlDesigner.NodeInstances: Reparent after value setting

Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlProfiler: semitransparent gap in zoom indicator

Change-Id: I0dcb7dabdb2f276d509a8c4eb09e02f8af56cbed
Reviewed-on: http://codereview.qt.nokia.com/1953
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

QmlDesigner: Fix qreal is not double

Task-number: QTCREATORBUG-5547

Change-Id: Id23737f292de00232deac792d3db2bd36bda0efe
Reviewed-on: http://codereview.qt.nokia.com/1947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesiger.propertyEditor: fix for opacity

Task-number: QTCREATORBUG-5517
Change-Id: I76ce708a4bcad0afe4716877d4c826d1a1a74537
Reviewed-on: http://codereview.qt.nokia.com/1963
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.documentController: fix for subcomponents

The change to master model has to be before extractText().

Change-Id: I7e791098ddec8cbc8bd597e4ef4fdb97ef01a6e4
Reviewed-on: http://codereview.qt.nokia.com/1961
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

MobileAppWizards: Use correct line endings on Windows

Make sure the generated .cpp, .pro files use CRLF on Windows.

Task-number QTCREATORBUG-5124

Change-Id: I3b47a347f1da62f3c654a91720ccc23024b774be
Reviewed-on: http://codereview.qt.nokia.com/1931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

FileInProjectFinder: Fix compilation with 4.7.4

Don't depend on QUrl::isLocalFile, which only exists in 4.8.

Change-Id: I67a8e35c8754396424c5578216bc6deb02ae0d50
Reviewed-on: http://codereview.qt.nokia.com/1959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

DebuggingHelper: Log the toolchain that is used to debugging output

Change-Id: Ia78c2b1cad4135cf3325eb612ccc81d6c3c4fc67
Reviewed-on: http://codereview.qt.nokia.com/1945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlProfiler: rendering event information popup next to cursor

Task-number: QTCREATORBUG-5538
Change-Id: I6cb4ac6924eda2588657dbea0d51166ad0c01340
Reviewed-on: http://codereview.qt.nokia.com/1948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlDebugging: Force build for all Symbian targets

Don't stop if e.g. the build for the very first target winscw fails.

Change-Id: I9a8e06045340f2921018bcbe8d2587d848f9aa3f
Reviewed-on: http://codereview.qt.nokia.com/1944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

Analyzer: show correct displayName when StartParameters not used

Change-Id: I8c1dd66bca57e043fabed3d9d7726a58513cbcf9
Reviewed-on: http://codereview.qt.nokia.com/1942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

QmlDesigner.propertyEditor: fix ui for borders and colors

Hiding controls was a bad idea. It is better to disable them and give
them sensible tooltips.

Task-number: QTCREATORBUG-4667
Task-number: QTCREATORBUG-5433
Change-Id: I2361fbbd3c28a5b9c07787abedf0439d6a7d1ad1
Reviewed-on: http://codereview.qt.nokia.com/1946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: layout fix

Task-number: QTCREATORBUG-5522
Change-Id: I932a40e459ef1160fc362185b22e7dcd0db3237d
Reviewed-on: http://codereview.qt.nokia.com/1940
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Qml Tooling: Fix debugging & profiling of .qml files loaded from resources

Don't expect that every url specifying a file is a local file url. Instead
let FileInProjectFinder handle urls with other schemes gracefully, too.

Change-Id: I72457d502ff1caf52f588e8ec41ab260882d1cf5
Reviewed-on: http://codereview.qt.nokia.com/1840
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Attach tags to bottom of description.

Change-Id: Idbd219ec17ba36c14565c08be4c7cd2e1246f1b1
Reviewed-on: http://codereview.qt.nokia.com/1933
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Use push button instead of tool button.

Looks really ugly on Mac otherwise.

Change-Id: I062f5ab4a585c88db4a955079545ff023e677ea4
Reviewed-on: http://codereview.qt.nokia.com/1932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

QmlProfiler: avoid reference to connection in UI

The reference to the "connection" instance can become a dangling pointer.

Change-Id: Icde6fed39d19f35420904f718d12931d297d1511
Reviewed-on: http://codereview.qt.nokia.com/1934
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlDesigner.propertyEditor: layout fixes for expression editing

Task-number: QTCREATORBUG-5045
Change-Id: Ie3ab670edef3aa82187ca0e4cfb1124218ff6a29
Reviewed-on: http://codereview.qt.nokia.com/1936
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.property: small fix for font size

Allow font sizes up to 400

Task-number: QTCREATORBUG-5555
Change-Id: I78fb5983353e0c45d6472b3af3142c8eee597643
Reviewed-on: http://codereview.qt.nokia.com/1938
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: fixes name of property

Change-Id: I40861eb2bffa542578d69d4648ae358abea0aa4f
Reviewed-on: http://codereview.qt.nokia.com/1937
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Remove empty tab above news section.

Change-Id: I5f7a05ebc7f7c44d55e916fec02eec7420b83f1d
Reviewed-on: http://codereview.qt.nokia.com/1921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

RemoteLinux: Split up generic and Maemo/MeeGo-specific device tests.

Change-Id: I45154021e85727db746d33ab6ca53f8005d1c55b
Reviewed-on: http://codereview.qt.nokia.com/1935
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlProfiler: show warning when no observer is present

Task-number: QTCREATORBUG-5536
Change-Id: I2cd1e62f78af3b1b18a3e318ad29ee0343c48b29
Reviewed-on: http://codereview.qt.nokia.com/1930
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlProjectManager: moved the no-observer warning dialog to qmlprojectplugin

Change-Id: I6ce724e0db17d22616adcdf058d1f05af7124b64
Reviewed-on: http://codereview.qt.nokia.com/1929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlJsTools: Add missing dependency.

Change-Id: I60a5db0d9927fa51662f944462fb0b776de48662
Reviewed-on: http://codereview.qt.nokia.com/1924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Fix release build warnings about unitialized variables.

Change-Id: I1a6ba631b0626969b328276a91561c34154c9a1c
Reviewed-on: http://codereview.qt.nokia.com/1920
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Utils::NetworkAccessManager: Fix typo in generic unix case.

Change-Id: I25d11af5bff0cca3ed6f0bf2f11e928c4e75a423
Reviewed-on: http://codereview.qt.nokia.com/1903
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Refactor: Move NAM to utils, rss model to welcome.

Change-Id: I0dddedd820e75df05c3a028e7fbb02b642c79659
Reviewed-on: http://codereview.qt.nokia.com/1902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

QmlDesigner.NodeInstances: Better handling of qml puppet problems

Task-number: QTCREATORBUG-4909

Change-Id: I4cad62e379ba66c3ab9eddb2d770f39eb1e07ff8
Reviewed-on: http://codereview.qt.nokia.com/1901
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Fixes and UI-Changes:

- Swap Recent Sessions and Recent Projects
- Fix tooltip error
- Change column width ratio in develop screen from 50/50 to 40/60
- reapply fix for off-by-one pixel error in the tab widget

Change-Id: Ibbcea66262723fed1a54ac63b735bc25241d1846
Reviewed-on: http://codereview.qt.nokia.com/1891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Reapply 0461150b852351dd1a9f76b9b1b257706d8ad5a5.

After conflict resolution.

Change-Id: I888b0d110d20df88e1cb96424717e914a9a613de
Reviewed-on: http://codereview.qt.nokia.com/1890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Silence (false) warnings from QtDeclarativeEngine

Change-Id: Ice8b6624c6aed41869617adaae59a509eaea7268
Reviewed-on: http://codereview.qt.nokia.com/1892
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Reapply 22d6dfa45abe3d8edcc3fb92a627ee06fd3e85a9

without 'manage sessions' button after Jens' relayouting.

Change-Id: Ida3e2e01a2ecae258be026bab22c76ede26020f6
Reviewed-on: http://codereview.qt.nokia.com/1889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

QmlDesigner.FormEditor: Fix root item visibility

Task-number: QTCREATORBUG-5504

Change-Id: I8ecf06c221d9e69bf25785940b390d744386f6a5
Reviewed-on: http://codereview.qt.nokia.com/1896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Fix tooltip and prettified Develop tab

Change-Id: I422a15558305a805af5a037f7537daaddd866a92
Reviewed-on: http://codereview.qt.nokia.com/1651
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Make use of splitters

Change-Id: I02f0d4af1aedc45914424f68a32d3970bf936806
Reviewed-on: http://codereview.qt.nokia.com/1650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Fixed tabs and missing pixmap

Change-Id: Ieaf7956f90a269cc582af5c6e8f08faa4b624b8e
Reviewed-on: http://codereview.qt.nokia.com/1649
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Re-order the feedback buttons

Change-Id: Ie10a5bc9394753aed5e13e772364d0357f577db1
Reviewed-on: http://codereview.qt.nokia.com/1587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Improved resizing behavior

Change-Id: I9f2156e996ea233cbe5424ad2e615e936b729443
Reviewed-on: http://codereview.qt.nokia.com/1578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Roll back some of the diff

Change-Id: Id36db8de505be94ca2005280d16d767bafc21a23
Reviewed-on: http://codereview.qt.nokia.com/1573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Add missing hand cursor

Change-Id: If94aaa48c7ede340d7886ba8fe5be140124ab562
Reviewed-on: http://codereview.qt.nokia.com/1572
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Revert to old tabs

Change-Id: I5da2c6c0fceb91a4e91e4ce7128d36f53f7af327
Reviewed-on: http://codereview.qt.nokia.com/1571
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Welcome page makeover

Change-Id: I4077960ed029eaf3c48164ea44448325b506e402
Reviewed-on: http://codereview.qt.nokia.com/1570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Center vertical text

Change-Id: I2c20b4f0dabdeb1af7c6df9383df343d05dd2a09
Reviewed-on: http://codereview.qt.nokia.com/1569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Make TextField placeholder text elide

Change-Id: Iac36b0b103890c031c7622fc13663fcfa6ba8b85
Reviewed-on: http://codereview.qt.nokia.com/1568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Add hint property to TextField

Change-Id: Ic6777928fbd4e561f9ae070ba9ea8b07d7943452
Reviewed-on: http://codereview.qt.nokia.com/1567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Updated qwheelarea

Change-Id: I1c64902b03b31cb92cce8e83cd2d7a9633d37a08
Reviewed-on: http://codereview.qt.nokia.com/1566
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Updated scrollbar with pagestep behavior

Change-Id: I67b78d878fbf7f895231b5e98f6fe0dc5ed8b8e0
Reviewed-on: http://codereview.qt.nokia.com/1565
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Use sizehint for QML buttons

Change-Id: I12500b87f34081f0e27829a88525c4a8fc52bae9
Reviewed-on: http://codereview.qt.nokia.com/1564
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Editors: Introduce option to constrain tooltips

It's now possible to have tooltips popup only when the Shift key is down.
This has been requested quite a lot.

Task-number: QTCREATORBUG-5282
Change-Id: Ibc8568737fecbeff981ba97d9f155a70f6072413
Reviewed-on: http://codereview.qt.nokia.com/1881
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: add FSF GDB to the table that summarizes debugger support

Also add download link.

Change-Id: Iee22f964c03e812e7e9c73fc036c467a657f6ca7
Reviewed-on: http://codereview.qt.nokia.com/1835
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>

Kill process correctly in PerforceChecker dtor.

Caused a warning from QProcess when closing Creator right after
start and p4 would time out due to incorrect settings.

Change-Id: I3407d900522f86f12dfedb8c1aeda361017a3e89
Reviewed-on: http://codereview.qt.nokia.com/1884
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QmlDesigner.rewriter: fix for assert

In some cases we get a string and have to convert the string explicitly.
Task-number: QTCREATORBUG-5503

Change-Id: I1008deffeb8ede54911f1a7031edd41b5827c010
Reviewed-on: http://codereview.qt.nokia.com/1842
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: adding tooltips

Task-number: QTCREATORBUG-5521
Change-Id: I7331e1eb76093bceb16062d9826a37a459876344
Reviewed-on: http://codereview.qt.nokia.com/1879
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: layout fix

This is a possible fix for: QTCREATORBUG-5484

Change-Id: I9cf95c8a35615b55fa2bf299df758b62c9ad71c1
Reviewed-on: http://codereview.qt.nokia.com/1878
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.model: avoid assert when setting current state (again)

Task-number: QTCREATORBUG-5503
Change-Id: Ib6469b584e82f6b0cb579d5ab81658f918fd8690
Reviewed-on: http://codereview.qt.nokia.com/1877
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Qt4Runconfiguration needs to work with Simulator target

Change-Id: I153bfb5cc7da59f177a9ed390730e2411b7f7b1e
Reviewed-on: http://codereview.qt.nokia.com/1663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlDesigner: enable F2 to go into a component

Change-Id: I23b298b184a9a17e19206db6086fce073b12a592
Reviewed-on: http://codereview.qt.nokia.com/1876
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Fix suggested folder for New File from context menu on project tree.

If a virtual category folder had files directly below them and a single
subdirectory, the suggestion was the subdirectory.

Change-Id: I185c7e6e9f64764664f5858d95aea57082161b82
Reviewed-on: http://codereview.qt.nokia.com/1871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Make showInGraphicalShell select a file on Win + Mac again.

Change-Id: I25e93f9f51ba8589d308700e9478ca31efbcc9c1
Reviewed-on: http://codereview.qt.nokia.com/1869
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QmlExtension wizard: Use $$[QT_INSTALL_IMPORTS] for desktop targets

Change-Id: I1d3dc0c148a5f05d81f6cc0d22c3b13c504a1edb
Reviewed-on: http://codereview.qt.nokia.com/1875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlDesigner.NodeInstances: Fix line feed handling

Task-number: QTCREATORBUG-4161

Change-Id: I61d765bedffde4d1f15e763d92b771f22dbcd4a2
Reviewed-on: http://codereview.qt.nokia.com/1849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner: Fix positioner handling

Change-Id: I519bbbfee939d4568a0de5bbe5c01912a08c6fb1
Reviewed-on: http://codereview.qt.nokia.com/1848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

RemoteLinux: Use QTC_ASSERT instead of idiosyncratic macros.

Change-Id: I57393197d87d54c4b08f457e1dd50d0cbcfaa1f0
Reviewed-on: http://codereview.qt.nokia.com/1872
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Fix Qt Quick Wizard, allow 4.7.0

Task-number: QTCREATORBUG-5473
Change-Id: I41e16d4a8a22e9c5ffa44711a33a71248a8bd993
Reviewed-on: http://codereview.qt.nokia.com/1846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Show warning if qmlviewer is missing

Change-Id: Ie6275ebf6a49f0b1732cc146abeaa23c7b6eafd4
Reviewed-on: http://codereview.qt.nokia.com/1843
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

RemoteLinux: Rename MaemoPackageUploader.

There is no Maemo dependency in this class.
Also use better assertions.

Change-Id: I28f055e35f17ed41535fd76a45fe1a06b9567953
Reviewed-on: http://codereview.qt.nokia.com/1868
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>