Reviewed-By: Leena Miettinen
(cherry picked from commit 294dfd10)

Reviewed-by: Robert Loehning
(cherry picked from commit 0ad6dfe0)

Merge-request: 167
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit eb707d1a)

git rebase is evil (if you don't recompile afterwards ;)

 * Update list of S60 header pathes to match up with what is put into the
   Makefile by QMake (minus ../tmp directories).
(cherry picked from commit 0aea1325)

(cherry picked from commit bbee4a63)

This is a team work by shiroki@cuteqt.com, chloerei@gmail.com and
xtfllbl@hotmail.com .

Merge-request: 2173
(cherry picked from commit c5b027cd)

(cherry picked from commit 214f1978)

Merge-request: 2170
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit e253896b)

Merge-request: 2171
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 316b7e80)

Merge-request: 162
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 55164561)

Reviewed-by: ossi
(cherry picked from commit 1099fc32)

Thanks to RT200 for noticing this one.
(cherry picked from commit 4f52f576)

Merge-request: 157
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 9f76d93e)

(cherry picked from commit 10475124)

Conflicts:

	tests/manual/gdbdebugger/simple/app.cpp

(cherry picked from commit 695ff52e)

(cherry picked from commit e98282fc)

Reviewed-by: Leena Miettinen

due to it causing Windows gdb to crash.
Reviewed-by: hjk
(cherry picked from commit faa38be8)

An error dialog would be more explicit, but too late because of string
freeze.
(cherry picked from commit ceca9d9d)

The executable has been renamed to 'qmlviewer' months ago
(cherry picked from commit e28e1f0c)

Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherry picked from commit b44efd09)

This is a backport of 5d645bfd
(cherry picked from commit ae55b43c)

http://bugreports.qt.nokia.com/browse/QTCREATORBUG-1342
(cherry picked from commit 91c90912)

(cherry picked from commit 99adbf15)

The code relies on getting the dialog accepted after the editFinished
singnals. This does not work on MacOS.

Reviewed-by: ck
(cherry picked from commit 1c095f88)

(cherry picked from commit b334002f)

Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Task-number: QTCREATORBUG-2002
(cherry picked from commit 9bad0c01)

Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
(cherry picked from commit 111b89d7)

(cherry picked from commit 5841b6ac)

Reviewed-by: Thomas Hartmann
(cherry picked from commit 308b4629)