GitLab

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

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

Before, we didn't transform the code style settings
if they were defaults (so no entries were written
for them in the settings). In case someone
changed global tab settings and didn't touch
code style settings in 2.3, the code style settings
were not transformed. Now, we transform them too
so that legacy code style settings in 2.4
(named: "Old Creator") contains old global tab settings.
We also take care of not creating legacy settings
in case neither textTabPreferences nor CppTabPreferences
nor CppCodeStyleSettings were saved (when creator 2.3 used only
defaults or when it's a first run of creator 2.4 without
old settings).
Handle legacy transformation for qml too.
Make a code bit more readable.

Task-number: QTCREATORBUG-6614
Change-Id: I37b8dd4d1170f397b7d304c59575d9ae37884564
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Change-Id: Ic65e1500c3727c26919050cdd5834dc904ad80d0

Change-Id: I1f0d48712f5ec081fa323e929dabaeee1dbf9b63
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

Task-number: QTCREATORBUG-6579
Change-Id: Ia1d629df24e1a4c7f4f830f575d1be4adc552409
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

The search result pane set a minimum size for the "New Search"
panel which forced this relative big minimum size on all panels
and made it impossible to make the output pane area small.
Now, the new search is wrapped into a scroll area, doesn't
enforce a minimum size anymore, and, instead, when initiating
a new search (via shortcut or menu action) resizes the pane
so the panel fits nicely.

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

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

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

From now, just validation work still to do

Change-Id: I64d44b9d9d6ac9fcfe4a843b78bcc0481955b70d
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

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

Change-Id: If26048320f6a140ef079b40000fefa1f8452d01a
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

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

Change-Id: I3b6b6fc0b5c6520e767a7c923be9bd3f3b3b6517
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

Change-Id: Ic1ae2a8341d01e179f9d52b7c7ad3cbe24995bd1
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

Change-Id: If7082613d90e79af74d7116ab53cceff10e9fa93
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>

The qmlplugindump tool is only shipped with Qt since 4.8.0.

Change-Id: I05c77da2bcfc9e1dbf055c45add78543cacce79c
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Task-number: QTCREATORBUG-6319
Change-Id: I5a2cc1845104bb16f912fe258ba25473ba85cefd
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit b3ae7d7e)

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

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>