GitLab

Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea
Reviewed-by: Christian Kandeler
Reviewed-on: http://codereview.qt.nokia.com/641

Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I2b71cba2ab19a15a834976e3ce953e992ca4b124
Reviewed-by: David Boddie
Reviewed-on: http://codereview.qt.nokia.com/640

Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Reviewed-by: Christian Kandeler

Change-Id: Ica62fc3f04bbc4b0fea84ff44399ac12ea44c0da
Reviewed-on: http://codereview.qt.nokia.com/587

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: I31b0f9cc55763d22dbf6ff75252c6e10e5a1b0f2
Reviewed-on: http://codereview.qt.nokia.com/481

Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

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

Change-Id: Ied278c283575809b54f4bfb4e8fcda9fe38eb56b

If the Qt Version is incomaptible (e. g. mingw) we have to use
the qml file for a component shipped with Creator.

Otherwise a import "." statement will break the component.

Change-Id: I7e354a15205567407533579f92e65f2be73a614ex
Reviewed-on: http://codereview.qt.nokia.com/474

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ie9db48ce3524491d4dd8b17fb79e26a1ecd8bd77
Reviewed-on: http://codereview.qt.nokia.com/471

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Reviewed-by: Thomas Hartmann
Change-Id: I4116e63da6633bebb21ba08084e2d8edde4aaaaax
Reviewed-on: http://codereview.qt.nokia.com/468

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

A new extra component plugin.
(cherry picked from commit fbcbac5a)
(cherry picked from commit 0e3f13e921f3812f8944a22375131b4e2fd87f87)

Change-Id: Ifbcbac5aq
Reviewed-on: http://codereview.qt.nokia.com/467

Reviewed-by: hjk <qthjk@ovi.com>

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

Change-Id: Ie49d1abad19c69278767bf32f2a7fa908234293d

(cherry picked from commit 517aef8b8bc705b055b10ef0b7b0b234fd80b920)

Change-Id: I517aef8b8bc705b055b10ef0b7b0b234fd80b920x
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/398

Reviewed-by: hjk <qthjk@ovi.com>

(cherry picked from commit 3112c23c702ee36ba1c25ccb526240ab7dda5b2e)

Change-Id: I3112c23c702ee36ba1c25ccb526240ab7dda5b2ex
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/397

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

QtVersion targetIds and abis set are forced
updateAbiAndMkspec() wont reset them
(cherry picked from commit 1c86ab05a73838e8127984f1cc0220d4de90eea5)

Change-Id: I1c86ab05a73838e8127984f1cc0220d4de90eea5x
Merge-request: 2193
Reviewed-on: http://codereview.qt.nokia.com/396

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

The Symbian components wizard would like to hide e.g. the Orientation
page. Re-implementing nextId() will allow to do so.

Change-Id: Id748d88bbc28b93aba4ffe8fccebf540d0946686x
Reviewed-on: http://codereview.qt.nokia.com/395

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Needed for Symbian.

Task-number: QTCREATORBUG-3507
Reviewed-by: Tim Jenssen
Reviewed-by: Alessandro Portale
Change-Id: I35799cd388e44353d6890fe79a411fbed2fb2ef3x
Reviewed-on: http://codereview.qt.nokia.com/394

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

In addition for the report below, the cmake highlighter
now uses the keyword color for functions. This was done
in the previous commit: 5ecd885af3d25acfd8f688428268da2d9198a1bd

Task-number: QTCREATORBUG-5037
Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2x
Reviewed-on: http://codereview.qt.nokia.com/274

Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit c09c8702)
Reviewed-on: http://codereview.qt.nokia.com/393

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

The Link color from inkpot still needs to be changed.
This will be done in a following commit.

Task-number: QTCREATORBUG-5037
Change-Id: Ia8a5203067761ff6622258fd16f2027667637583x
Reviewed-on: http://codereview.qt.nokia.com/273

Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
(cherry picked from commit a3daedc7)
Reviewed-on: http://codereview.qt.nokia.com/392

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Reviewed-by: Erik Verbruggen
(cherry picked from commit 769b21b4)
Change-Id: I769b21b4x
Reviewed-on: http://codereview.qt.nokia.com/391

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

This gives at least some syntax highlighting.
(cherry picked from commit 04c5425d)

Change-Id: I04c5425dx
Reviewed-on: http://codereview.qt.nokia.com/390

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

(cherry picked from commit 752066d0)

Change-Id: If24dfee05b8039b1f091e8f88e8d59155f2bd7dx
Reviewed-on: http://codereview.qt.nokia.com/389

Reviewed-by: hjk <qthjk@ovi.com>

Patch by Orgad Shaneh

Task-number: QTCREATORBUG-3813
Change-Id: I7ff88946981ef210bb53e20d7e462055199a30e2x
Reviewed-on: http://codereview.qt.nokia.com/388

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

When QML modules with many source files were loaded, the
rehighlight from the found library was done before the files
contained in the library were done parsing.

This way any updated document will eventually lead to the
current editor rehighlighting.

Reviewed-by: Erik Verbruggen
Change-Id: I0f4d18390d3e0ee17cd255c68496f61479f82f05x
Reviewed-on: http://codereview.qt.nokia.com/382

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Fixes the problem 5426c3ac and
7b25f438 worked around.

Reviewed-by: Erik Verbruggen
(cherry picked from commit e2131113)
Change-Id: I5426c3acxx
Reviewed-on: http://codereview.qt.nokia.com/381

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

That means
import Foo 2.1
can resolve to
/path/Foo.2.1 or
/path/Foo.2 or
/path/Foo

Task-number: QTCREATORBUG-4607
Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1ax
Reviewed-on: http://codereview.qt.nokia.com/194

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
(cherry picked from commit 87420263)
Reviewed-on: http://codereview.qt.nokia.com/380

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

now we uniformly increment the read pointer only if we encountered a
terminator (which also implies that we were not at non-eol yet).

Task-number: QTCREATORBUG-5022
Change-Id: If4a4e7aec7423684297393fa10e50a69773b2048
Reviewed-on: http://codereview.qt.nokia.com/222

Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I54aadfbafd18601a3b0d6420b8ebb00cb082d803s
Reviewed-on: http://codereview.qt.nokia.com/150

Reviewed-by: hjk <qthjk@ovi.com>

- createRightPaneContextViewer() needs to be called up-front. In the old
order, it would fail the first time.

- Queue opening of help, because we need the editor window to be drawn
  before it can be assessed wether to show the help in split mode

Change-Id: Ib2054285efb07ccbfaf3faf089085c16ba432be8z
(cherry picked from commit c86e81c3)
Reviewed-on: http://codereview.qt.nokia.com/149

Reviewed-by: hjk <qthjk@ovi.com>

Task-Number: QTCREATORBUG-4414
Change-Id: I0272091d185fe6a9ac23022eb4efb723eb541494x
(cherry picked from commit 15ac4f0e)
Reviewed-on: http://codereview.qt.nokia.com/148

Reviewed-by: hjk <qthjk@ovi.com>

Task-number: QTCREATORBUG-4362
Reviewed-by: Roberto Raggi
(cherry picked from commit b8393270)

_Ptr is used for large values instead of _Buf.

Reviewed-by: hjk

Attach to suspended application and doing resume manually
does not work. Use special options for console.

Reviewed-by: hjk
Tested-by: Alessandro Portale <alessandro.portale@nokia.com>

Merge-request: 2197
Reviewed-by: ossi

This is a team work by:
Jonathan Courtois <jonathan.courtois@gmail.com>
Thibaut Cuvelier <tcuvelier@redaction-developpez.com>
Verdvaine Yan <yan.verdavaine@redaction-developpez.com>
Pierre Rossi <pierre.rossi@nokia.com>

Merge-request: 2194
Merge-request: 2196
Merge-request: 321
Reviewed-by: ossi

Determine ABI correctly.

Reviewed-by: hjk

Task-number: QTCREATORBUG-4832

(cherry picked from commit ac18e201)

amends 64cfa461

Task-number: QTCREATORBUG-4806
Reviewed-by: dt

Task-number: QTCREATORBUG-4771
(cherry picked from commit fcf82b74)

If the current state is deleted we have to go to the base state
to stay in a valid state.

Task-Nr: QTCREATORBUG-4339
Reviewed-by: Kai Koehne