GitLab

Change-Id: Ia224cb5c164adae46b960a75d159d1f5a4e11d23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Task-Nr: QTCREATORBUG-6581

Change-Id: I391df32dc49a7ee7a34ba4b47bf02d1c1690647a
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

New Qt Quick application wizard now imports Qt Quick 1.1.

Change-Id: Id1433364b29a5f23d351d4cd07cc22e69b52f67c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

Change-Id: I77a9ac922ead256c3c58be39ad0383aef67f3133
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Task-number: QTCREATORBUG-5765
Change-Id: I24f4a0bab178f32da12dc6842945cff2f7ffa993
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

Override LC_ALL in the makestep, not LANG in the toolchain's
addToEnvironment.

Task-number: QTCREATORBUG-6488
Change-Id: Ic3de4f53f99b6b9d88a1337c65aa7f4839d4099d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Do the same as in case of "Deploy" string: after
restoring overwrite it with proper translated string.
Side note: tr("Build") and tr("Clean") have already
been used inside buildconfiguration.cpp so it will
not produce a new record in .ts file, i.e. this
change is not introducing a new message in string freeze
period.

Task-number: QTCREATORBUG-6595
Change-Id: I05040bba5066cbe0b55085cb2acbe43df34becd7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

In this way there is no additional item on taskbar

Change-Id: Ib946064f3d859a61eaa5495bc4fb7740b641e154
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: Id7b8fba6707b1eaabf8065854f357cf600c809c5
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
(cherry picked from commit 567e68a4)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Task-number: QTCREATORBUG-6562
Change-Id: I1630d7c13ab59d848626a4a4b8fb542765a16d6e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Id206ea5137e9b77e3b0e0d606de6f663c94f2450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: Ib67e2bf7cb04c708c09a0c8c811b30ae948276a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I8a56784d124137d51200bcb34ce063062f7645bd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>

Before creating AddFilesCommand we check if
files to be added are already in qrc file. If they all are in
we don't create AddFilesCommand.

Task-number: QTCREATORBUG-6508
Change-Id: I633f7393f1185023052ceaa0465282e1dc7957a2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: Iabf3c67570865859ae42e8deb9125a9c9fdcf957
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Task-number: QTCREATORBUG-6587
Change-Id: I0b7c65c1d7f613283e447293daf26673e88ba6e7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: Ia42fccff507fce1e999d4534656984b6ebf5180a
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 289a05a1)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Task-number: QTCREATORBUG-6558
Change-Id: I5e5719c7764df350f4e466b8f1e90bdeed872b3d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

"dll" and "shared" set each other, but too late to actually test for it
in the project files, so include both.
note that this will slightly modify the build of some of our imported qt
solutions.

Change-Id: I0bd4f41a68fd160f8e87eb0a0fa66096fe70ef3e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>

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

we cannot figure out what this code was supposed to be good for, and it
actually breaks stuff, so let's remove it.
patch actually by maurice.

Change-Id: I18a80af4c8b49f2a29b86ca0c0d0a08632019339
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>

...and add a comment to change it to QtQuick 1.0 if S60 5th Ed or
Maemo are supposed to be targeted.

Task-Number: QTCREATORBUG-6528
Change-Id: I1936f2a5c9725f34b5a8ad4469465f5e2b645957
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: Ib37bb88a472c8ba9f1fde097760b20e90f6bd1a2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: I4e95a63b730385bcb83d57b1e324b0edda321286

Change-Id: Ic298b3fb77589373fe5d70c6b44d0e73d76a7ed9
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Change-Id: Ib34050986433bf9010da2e8cf71fe6651559c015
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

The macro points to the wrong visual editor.

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

Task-number: QTCREATORBUG-6547
Change-Id: I567f6970ad2d89d862ed86fbaa69e7eecacb9738
Reviewed-by: hjk <qthjk@ovi.com>

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

Change-Id: Id1de9b0cbc4880a90415d4cc0aa8297b2bc51a24
Reviewed-by: Aleksi Uotila <aleksi.uotila@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

From a diff view, jumping into 'added' files wasn't working.
Actually file jumping was working only for 'modified' files.
This is fixed by using a more general diff regexp in class
BazaarEditor (attribute m_diffFileId)

This bugfix also allows to highlight all diff specs (rename, remove, ...)

Task-number: QTCREATORBUG-6531
Change-Id: I80bcbc0f77644c6caa7e7c750bd474a12263b589
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Task-number: QTCREATORBUG-6540
Change-Id: I4b5f7e73ee49e03621a9461d037e13c251959e84
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Commit d687d112 unfortunately caused
two severe regressions for MeeGo:

QTCREATORBUG-6473: The application creates two QDeclarativeViews
QTCREATORBUG-6490: QDView functions inaccessible. Existing apps broken

This commit removes most of d687d112
just leaving the boosted QApplication. Now, QmlApplicationViewer *is*
again the QDeclarativeView.

Change-Id: I219540353ff4dd1061221d6cbe69ce9a58500e91
Task-Id: QTCREATORBUG-6473
Task-Id: QTCREATORBUG-6490
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Update text and screenshots after the Link QML debugging library
check box label was removed and Enable QML debugging label is
always used.

Task-number: QTCREATORBUG-6541
Change-Id: Id53f5db2b9007a2e3c7b939cae61073b519fdb18
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-6527
Change-Id: I53e68dbf75d3a025d760d948a31c49f9cdf93919
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Iaa0f01db8f03d078437681d36e0b0e9ae29b7351

Change-Id: I8e5e47e1fcc620c823e7d3e1c5a643fb09d4b392
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

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

Change-Id: I094aac57640588f1bc8f73b36217273b9736a3cf
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-6441

Change-Id: I1d18c81f76cda71654a85c23b7b53b4aae0d51c6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>