Reviewed-by: Christiaan Janssen
(cherry picked from commit e871b7e3)

(cherry picked from commit ca8b342a)

Workaround for proxy problems on Windows (Qt bug?).

Reviewed-by: kh1
(cherry picked from commit f3ac8e43)

Reviewed-by: kh1
(cherry picked from commit f1cb362d)

(cherry picked from commit b73b0fb0)

Reviewed-by: Alessandro Portale

Task-Nr: QTCREATORBUG-2382

Reviewed-By: Alessandro Portale

(cherry picked from commit b049937ae013b47e9b86aacd60325dbd382319ed)

(cherry picked from commit 519f1d11947ff3109850e559fae868c4a55deb43)

(cherry picked from commit 3ff803d7e2543b64358755702d3c74318bc01736)

(cherry picked from commit 6e1ef8df2faa3a88673094a619f6cefe60ffd2f2)

Task-number: QTCREATORBUG-2459
(cherry picked from commit d09b5e9d365e3ce54078fb172c93b9584908bcad)

Reviewed-by: Friedemann Kleint

Reviewed-by: Friedemann Kleint

Ups were wrong in the last commit

This incorporates the last hunk of qt-creator/merge_requests/180 by Nikita V.

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

The Qt4ProjectManager still depends on the QMLJsEditor for building.
Since the Qt4ProjectManager does cope correctly with not
finding a ModelManager, the Qt4ProjectManager will continue to work even
without the qmljseditor.

Note: The load order between qt4projectmanager and qmljseditor is undefined
now. This is not a problem for this particular patch, but might break
future code in subtle ways.

This reverts commit f8c50013.

ids are now checked if they are a qml keyword

sci files are now supportted for BorderImage

Add XML-elements allowing for Javascript-based
validation rules along with error messages.
Rubber-stamped-by: Erik Verbruggen <erik.verbruggen@nokia.com>

Add legacy to retrieve old values.

Task-number: QTCREATORBUG-2456

In some cases snippets have a description. Due to the sorting this
already places them after keywords. So this is just to be consistent
for all cases.

Reviewed-by: Roberto Raggi