Change-Id: Ie8d2adaa2b20473d2e3e16d1f44ad951ff2744be
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42

Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ifd55ab4ea504d75996a350274dcaf62a1d08db04
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Under Windows there is no executable flag in the filesystem.
So take the information that we got, which file
is an executable and set the executable flag if needed.

Change-Id: I0a7026911d1f7791434c39cc0917d6e49cfa1667
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: I486c5c5c7c7330593ea7812dff172ba70d0fe86b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Idfe672691b6b412074d3170c5dc5354aabb8ea05
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

It was doing more harm than it helped.

Change-Id: I670c4669f18ec0ed833bea6f7d5e9834c130210c
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Reviewed-by: Niels Weber <niels.weber@digia.com>

Additionally:
* extracted iterateKits() for better re-use
* added parameter to iterateQtVersions() for easier usage
  when using iterateKits() as well

Change-Id: I8bec8ca8e1e37a233c121dbcfbf1c89104f79a7d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Change-Id: Iaf39b5240bf2878051c0442c15ff1b82bcb55bfd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Store settings in QtProject, not Nokia. Move them over to the new
place if any settings in Nokia exist.

Task-number: QTCREATOR-7976
Change-Id: I5af77923aa51016add9079b21e78d94d46f20010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I0669ae1e2aacb0088af8619c19a54a16fa568ea3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

This will launch a new instance of Qt Creator attaching to the crashed
instance.

The 'Restart' functionality is now represented as a check box since it
would be confusing to have one button that restarts the app and quits
the crash handler and another one that starts a debugger but keeps the
crash handler open (which is necessary, otherwise the crashed app will
quit).

Change-Id: Id88f418ff73ab7bc72b05753ce2b61bbef8f30cf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

The icons are referred to with the name QtProject-qtcreator in the
desktop file.

Task-number: QTCREATORBUG-7955
Change-Id: Iaf6e270acdf0ac3259169dc39943bc78e33e0d96
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I3a3292b8576fe36107335e07e9f125fbd1478b80
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Task-number: QTCREATORBUG-7977
Change-Id: I35c3e6f916a690595a6fc03ad3a995b361c76f54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I5d81ede970340e11d789564d9153284236ea426d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I2e5e31d2d744203d2a0834a3169a73c43e61447d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I66a91303d7ad683e83aae57fd8d3465ec8506ae3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Change-Id: If99dede63cb2fc138de0aa82dc1a41e0fc41a655
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: Ia2e439a068dff75ebfa18c36f749967200961fd5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: Ib15120c846187bd37cf22fae88ae6ece20d2417a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Removing declarative includes.

Change-Id: Iac398fe881506cb3be07513562e864c5931d349e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

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

The old implementation readed the file and converted the QString toUtf8,
which seems wrong. Now use Creators default encoding.

This fixes at least wrong macro offsets that leaded to highlighting
errors in Find Usages, if there were non-ASCII characters before the
macro definition.

This should also partially solve QTCREATORBUG-7122.

Change-Id: Ic4a5add5f4769bd3d5b62fc2d67598e7abf352d9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

The projects have been moved to non-Qt projects.

Change-Id: I98721458114c9cc92f7416ac37d6a37c4d77279b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

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

Change-Id: I18669823c5bd06e288e24afd4925a38ca8480095
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: I3d20ad6efe4c6ed8cd87717ef4fdd58a739ad634
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Add missing dependency to QmlJsTools introduced by
9ac25a29.

Change-Id: Ifa622ccd2acf162a46d4a0cdd3fe57904102e7b0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

'desigm' should be 'design'

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

Change-Id: I971f19c9b521e97b04b2a06019fd47a105e6260a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: Ic0e746a053522d494d03e9add6cc4813072d0ec3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Task-number: QTCREATORBUG-7931

I had to fix a bug in the QmlJsParser.
The source location for the
propertyTypeToken was not initialized in all cases.

I also updated qmljs.g.

Change-Id: Idd0880f70578867cf5f97666aede654e00cfc744
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Christian Kamm <kamm@incasoftware.de>

Now the formatting in the help viewer looks as usual again.

Webkit was disabled to make creator compile with Qt5 in the Nov 2011
days.

Change-Id: Ic926cc94bda4a4953360f2daee414ba17aa4037b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580

Change-Id: I9369dc8811bd2a4caab1de8910020e6cce563831
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da

Change-Id: Ia5930fbbaf5af4b5d92f64101fa0a8e6f1d4d15f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>