GitLab

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

Task-number: QTCREATORBUG-6643

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

Broke with ebb9e252



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

In addition to using an empty file as in 2.3, the user can now also put
a magic string at the start of the manifest file. This way, we can use
this as the default while also documenting it in-place.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797


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

Task-number: QTCREATORBUG-6657

Change-Id: I1b7b9f6e84b4e81ed1c81c70c9a0b4e3dce360e3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

This prevents event loop issues (e.g. connection timeout).

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

When invalid documents or documents without idEnvironment or rootScope
get added to a QmlComponentChain.

Change-Id: I64b7062881f19777ba20efda6efa2e7bab02571e
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(cherry picked from commit 9b411ed5

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

Change-Id: Ib81d5e6baabf5ac8d18411e8936098908de2c2bb
Task-number: QTCREATORBUG-6635
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(cherry picked from commit 25842cb1

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

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

In the case when they are part of the project. The project's
EditorConfiguration had an wrongly initialized default editor setting.

Change-Id: If6e39ed3efca39d726c28b8278a059c8bbe7c3fc
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>

Remove unused variable.

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

With this patch it's possible to not only hook into the
QmlApplicationViewer (although nothing else is currently done)
and additionally to not only send the closing event to the
sub-process. You can now define a function that will be executed
on the sub-process.
Both modified tests show an example how to use it.

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

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

With cc11186b

 starting a new search
would not move focus to the search term.

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

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>