GitLab

Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp

Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Reviewed-by: Kai Koehne

Gridlines were removed from several dialogs.

Reviewed-by: Christian Kandeler

toolbutton is not used, while formeditorstylesheet and outputpane-style
are used but were not actually linked.

Merge-request: 2190
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Always export SBS_HOME when building with SBSv2, even though that
is no longer required. Not doing so breaks Qt 4.6.3 support in the
SDK for some people.

Task-number: QTCREATORBUG-4487
Reviewed-by: Robert Loehning

Took inactive targets into account.

External functions need to access the real device config,
internal ones need the cached one during deployment.

Task-number: QTCREATORBUG-4514

Set up UI elements before they are used. No crash since the elements
are guarded by QTC_ASSERTs, but annoying output.

Update the projects mode on tool chain changes.

Task-number: QTCREATORBUG-4431

We changed the semantics of an empty 'mainScript' in the .user file:
In 2.1 it translated to 'use current file', while in 2.2 the default is now
to use the file specified in .qmlproject.

However, if there is no mainFile specified in .qmlproject we should
fall back to the current file in editor.

Reviewed-by: Christiaan Janssen

Can't use MADDE, because it is outdated.

Reviewed-by: Tobias Hunger
Task-number: QTCREATORBUG-4299

The MADDE in the SDK is six months old...

Also add function lines as comment.
Fix offset display.

Parse CDB's ASM output, set it up with source line.
Move convenience to add source lines into DisassemblerLines
(cached).

Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Task-number: QTCREATORBUG-4127

Reviewed-By: hunger

We never noticed that we had run cmake

Reviewed-By: hunger

Reviewed-By: hunger

Do really disable the symbian emulator if there's no toolchain
supporting it.

Reviewed-By: hunger

Reviewed-By: hunger

Snapped back to source mode as the pending variable was not set.

Reviewed-by: hjk

Use the debugger set up by the Qt SDK instead of the one shipped
with Maemo/Meego.

Task-number: QTCREATORBUG-4299
Reviewed-by: Christian Kandeler