Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104

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

This is a recent regression introduced by the delayed python dumper
initialization.

Task-number: QTCREATORBUG-8615
Change-Id: I3b5dbe5b04c68cf873e3a2597edc60fe2888b3c9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

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

This was only possible in theory but not in pratice.

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

Task-number: QTCREATORBUG-8617
Change-Id: I2883e2528ea59673e7f6658021e7f5f88faa3fa4
Reviewed-by: Cristian Adam <cristian.adam@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Task-number: QTCREATORBUG-8638

Change-Id: Ie5b9c237459f4e6d503121331a51821cd812bee8
Reviewed-by: Matthias Blaicher <matthias@blaicher.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Task-number: QTCREATORBUG-7320

Change-Id: I78bf8cf63fa892f2a6771911333c246839439bf4
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I9edd5410896401810b5106049832c36221b155d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

* Prepend / for directories expected to be in the root directory
* Append / (and remove trailing *) for entries which are expected
  to be directories
* Add some qmake-generated directories (.obj, .moc, .uic)
* Include all exe files in a single rule
* Add cpaster, sdktool and qtcreator_crash_handler
* Add all tests binaries

Change-Id: Ic8640cfe2222bc18a16bf18f96ba6733cf50eaa8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I0969bbbc39863e0981b5af81feced10d0fbbecac
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I602aa3758817026c8b4cbda1cc9fa9eff95fc691
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ie46af65a76c8da847d0f8b12ca4d3e8f5beb61dc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I12053784d9d897525e29c40ea806f680577c6c09
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: Iab9acd6124c70397a3eff0a697fc8df4b663cc1a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

That only happens in the current qt5 dev branch, but this is saner.

Task-number: QTCREATORBUG-8664

Change-Id: I024e07ec10e10c2ff3fe294b7a7ea17ce91ff532
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

No longer require some text additional text.

Change-Id: I0bc1f64e6cbc9577cd4d79e04ce95b24a614ac7f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

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

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

Change-Id: I3ead86ba50d1d68a46cdc58c06684b2ac8c091c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Added separated qbs, qmltypes, QtQuick1, and QtQuick2
and "generic" Qml languages.
Cleaned up the mime types a bit, preparing for registered mime
types.

Change-Id: I0e484c93e003176cd659acc546baa6d024defa19
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Change-Id: Ib753cb421361abcfa1f55bc8a0d43e8aa2d43dfd
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ia96a4a000cac1dde0f660e5f58141a73c7625a1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: I8eb6f67ee342c88bc0f1b15874e37e130fa719a1
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Iceac2082e1939844da68bf4474dac632c0536ece
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

It works for full specialization. Instantiate of the partial
specialization has to be implemented(finding appropriate partial
specialization-on going)

Added unit test.

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

The macros were removed in
07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 .

Change-Id: I4a43106ca85dc9ed97f75a4505888cb550305a8d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: I9b199df863b404e4cb2ce3c76c920b9010c09260
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

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

Change-Id: Idf6d0cc5a038d8203d5ad4fd4ce2f001b9fc1647
Reviewed-by: hjk <hjk121@nokiamail.com>

El Mehdi Fekari authored 12 years ago and Nicolas Arnaud-Cormos committed 12 years ago

For some reasons this was not merged properly into master

Change-Id: I634c9ecde6de27aec1531371fd2d9f7535177595
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

Change-Id: If927cbed7b2638ad9468be8f092a7b896f8fc162
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I4ffbaa9dd33b5466ebc0868040ceaba804d09864
Reviewed-by: Aleksei Timofeyev <aleksei.timofeyev@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Change-Id: I2b6d6882bfdb0d2622c3fc9d4628ad3d65f73062
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Icc5de3ee0b44a178d6de7a37ce48d5b08fcec5fb
Reviewed-by: hjk <hjk121@nokiamail.com>

Expand variables to demonstrate what the arguments will be like

Change-Id: I32aed8aed38ada32b0ac6590772ed4d054bd463f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I0f1b46ffb621384663a2fa3a76f70ec04ddfa717
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

This was done in 72db7a8f.

Change-Id: I9b5d2b50de5dbd929c53e2ca0a70bce239c878ad
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

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

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