QtQuickApp: Tweak template to enable Meego booster

Add support for the meego booster. This requires
 - Telling qmake to link to right libraries
 - Exporting main method
 - using QApplication, QDeclarativeView objects from cache
 - avoiding QCoreApplication::applicationDirPath()

To keep compatibility, QmlApplicationViewer is still derived from QDeclarativeView.
However, if the app booster is used it merely acts as a proxy to the view from the
cache.

Change-Id: I83e285d9ca3c2cfd86d1711e1fb93c72589ba14d
Reviewed-on: http://codereview.qt.nokia.com/3730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Harmattan: Include Aegis manifest in list of files to add to  project.

Change-Id: I04f8787e6a334ad801af2e3b8006c000a1fa0546
Reviewed-on: http://codereview.qt.nokia.com/3823
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Symbian: Warn if EPOCROOT is on different drive from the sources

... even when using SBSv2

Task-Number: QTCREATORBUG-5907
Change-Id: Ibb79dc798b8146f9e5658e186f499bfd47fb3d9e
Reviewed-on: http://codereview.qt.nokia.com/3660
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
(cherry picked from commit 059e5f30deacdec5ad9449c6247b609be5cf9727)

Remove CONFIG+=declarative_debug from imported build line

Prevent CONFIG+=declarative_debug to show up in "custom arguments"
of an imported build.

Change-Id: Ib598addcb31b65853eea430a086f614c6dd498fd
Reviewed-on: http://codereview.qt.nokia.com/4044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

QmlProject: Fix debugging with C++ language

Because no ABI was specified, gdb bailed out with 'File format not
recognized'. Instead just use the ABI from one of the toolchains
available for the Qt version (assuming that they're all compatible).

Task-number: QTCREATORBUG-5957
Change-Id: I7db9bd45c6a015c6236ae1b672909e013fad1d65
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Version bump

Change-Id: I9ef0aa6d47dca86fdd3169a40b9642c898607a05

Doc: update screenshots and UI text to match Qt Simulator 1.2

Change-Id: I1d05e82ffdd17b89963aa4d1ebde4d47d8dffb7f
Reviewed-on: http://codereview.qt.nokia.com/3736
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>

Qt Quick App: Make sure showFullScreen is used for Harmattan

Make sure that the MEEGO_EDITION_HARMATTAN define is actually
picked up for harmattan (it's defined in qplatformdefs.h)

Change-Id: I3a0710992b5fa3e081821a66e32ed4a73eb5dd6e
Reviewed-on: http://codereview.qt.nokia.com/3595
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlCpp debugger: Fix clicking on QML stack traces

Change-Id: I1e83dfc490bc871d106fb44357759829b3a1a6c4
Reviewed-on: http://codereview.qt.nokia.com/3593
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Added some of the missing translations

Task-number: QTCREATORBUG-5912

Change-Id: Ib0df4038e2bdafd2536d068964557575e1b14617
Reviewed-on: http://codereview.qt.nokia.com/3531
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fixes and improvements in German translation

Done-with: Thomas Murach

Change-Id: Iac23c85c9b328943329918dd0a73958f04b958c4
Reviewed-on: http://codereview.qt.nokia.com/3530
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Doc: fix image filename

Change-Id: Ice18f0689b38d05f86fdc7c643fb310a4db58cc7
Reviewed-on: http://codereview.qt.nokia.com/3527
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: Qt Mobility Libraries are preinstalled on MeeGo Harmattan devices

Change-Id: I25f5540588387111ed4d7ec3220dbc9d55ec44e9
Reviewed-on: http://codereview.qt.nokia.com/3523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Show 'what's new in Qt Creator' as fallback

...if the network connection to the servers containing the rss cannot be obtained.

Change-Id: I39a5706221eaa68e97b4f0abb58bea46a364dce1
Reviewed-on: http://codereview.qt.nokia.com/3424
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

DebuggingHelper: Update UI even if compilation failed

This fixes all the buttons staying in disabled mode after an (unsuccessful)
compilation. Problem was that in the end, the finished() call informed
the option page that the build was over, while the updateQtVersions()
call updated the UI. The patch fixes the order, but also updates the UI
as reaction to the finished call, because relying on the delivery order of
two independent signals via Qt::QueuedConnection is fragile per se.

Change-Id: Ifdd03e3cb9d9bf96b30053e5e8aa0a3f0232ab1c
Task-number: QTCREATORBUG-5906
Reviewed-on: http://codereview.qt.nokia.com/3485
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Detailswidget: Force minimum height

Task-number: QTCREATORBUG-5782
Change-Id: I3cd3584ca1f9878c36d75118302b76980cd8b4bc
Reviewed-on: http://codereview.qt.nokia.com/3506
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Doc: use Qt Quick Application template in the tutorial

Task-number: https://bugreports.qt.nokia.com/browse/QTCREATORBUG-5707
Change-Id: I3b6ae9dec8d65bfbf2eeeadf21da6f4a363c0a4c
Reviewed-on: http://codereview.qt.nokia.com/3489
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

WelcomeScreen: Don't move ScrollBar beyond scroll area.

Change-Id: I931256ced736c9d5514e50e7a2bd383d2e3fcfd0
Reviewed-on: http://codereview.qt.nokia.com/3398
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

WelcomeScreen: Re-add lost hover-state on tabs

Change-Id: I373544cd1fc6ad3b1518571f0a4c36ea160e9600
Reviewed-on: http://codereview.qt.nokia.com/3340
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

WelcomeScreen: Make Show all checkbox more prominent by moving it to the left.

Change-Id: I3d163abbe58e7588eaec3698757a2a1547219967
Reviewed-on: http://codereview.qt.nokia.com/3186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Compile

Change-Id: If1e0fe61ea873cf9ae6715a4758170acb97cdc21
Reviewed-on: http://codereview.qt.nokia.com/3479
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Fix action ids of analyzer tools.

Change-Id: I7ea034b39e3b44eb58564a835034c17f9cfe61c1
Reviewed-on: http://codereview.qt.nokia.com/3476
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Fix crash with no generator selected

Change-Id: If1e09d4f6fda3b266de17087aa9b1aa0014ecaf7
Task-Nr: QTCREATORBUG-5883
Reviewed-on: http://codereview.qt.nokia.com/3410
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Partially revert -lastsession fix

Change-Id: I965c8e51ca38b343e65764f77fe1d204ff793f23
Reviewed-on: http://codereview.qt.nokia.com/3411
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

QmlCpp Debugging: Only set C++ breakpoints after QML is connected (CDB)

Apply the change we did in 7c31bd6604 also for CDB. The mixed engine
directly calls attemptBreakpointSynchronization as soon as the QML engine
is connected.

Change-Id: I764f785bb5f0575a9a624e29632d21caf5dde39c
Reviewed-on: http://codereview.qt.nokia.com/3468
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Doc: using dummy data and context

Change-Id: Ia054de58fd1ae6204c327c2a17001a5050128732
Reviewed-on: http://codereview.qt.nokia.com/3405
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

version bump 2.2.85 -> 2.3.0

Change-Id: I0c62f4f1f637b48ae9d332ac4d6a255a9792ad28
Reviewed-on: http://codereview.qt.nokia.com/3394
Reviewed-by: hjk <qthjk@ovi.com>

QmlDesigner.propertyEditor: crash fix

If the anchor target does not have a corresponding model node
we had a crash. This happens for e.g. Flickable because children
is redefined.

Task-number: QTCREATORBUG-5829
Change-Id: Ib3f609fe7c29778dd4fdd8ed1ac8526afbb36fe0
Reviewed-on: http://codereview.qt.nokia.com/3327
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

disable poor hungarian translation

Change-Id: Ib7a4c7548024ac6a056f2d2e1baf4697f912f929

QmlDesigner.itemLibrary: Use com.nokia.meego for Meego/Harmattan components

Also fixing the documentation.

Change-Id: Ib40f7cea0be7f800b40272c4aed0babfc53ae433
Reviewed-on: http://codereview.qt.nokia.com/3301
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QtQuick wizard: Use com.nokia.meego for Meego/Harmattan components

This is the namespace also used in the documentation. On the device, the
components are available both under com.meego and com.nokia.meego, but
mixing these two in one application results in runtime errors.

Task-number: QTCREATORBUG-5850
Change-Id: Ia5db9456c0dd1052042af5a8e8760a34d58b93ab
Reviewed-on: http://codereview.qt.nokia.com/3296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Complete japanese translation for 2.3.

Merge-request: 371
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Ibe500957e4fdd5c34700662f2621bee733179507

Doc: update debugging example

Change-Id: I7424f24561c91057be2f10bb0009dbe94e4db2fb
Reviewed-on: http://codereview.qt.nokia.com/3275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Doc: opening bug tracker for Qt Creator

Change-Id: I083deb81ed746e39751ff5bd55a509d1d34914da
Reviewed-on: http://codereview.qt.nokia.com/3257
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Doc: update screen shots

Task-number: QTCREATORBUG-5435
Change-Id: I098372261ff216e28a00254956cc2f643e899f26
Reviewed-on: http://codereview.qt.nokia.com/3090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Doc: starting QML Viewer from external tools

Change-Id: Idb9daecc8cd9b81864f59ddc07ceca434618a1f5
Reviewed-on: http://codereview.qt.nokia.com/3177
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: replace dynamic links with fixed links

Change-Id: Ib99ca3b9b93ca62ec4fa63aa03e99a2260d9cb78
Reviewed-on: http://codereview.qt.nokia.com/3080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Doc: update screenshots

Task-number: QTCREATORBUG-5439
Change-Id: Id6828d76fb8c3f2e2efbe6692dc6eb2c25480a03
Reviewed-on: http://codereview.qt.nokia.com/3079
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

WelcomeScreen: Minimize height of delegates

Calculate the image height based on the height of all
text in the delegate. This ensures that the delegate
does not grow in height out of proportion simply due
to a large image.

Change-Id: Iae3053a520ef29764ac9ee2553e68025b2ea7edd
Reviewed-on: http://codereview.qt.nokia.com/3112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

WelcomeScreen: Add new tutorial, adjust names of existing

Change-Id: I867dad4e1e0b18298e44870239d4a975b737307d
Reviewed-on: http://codereview.qt.nokia.com/3113
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Fix argument parsing in projectexplorer, fixing -lastsession

Change-Id: I942c08b5dde0c014f223247bc77f65effcd45787
Task-Nr: QTCREATORBUG-5773
Reviewed-on: http://codereview.qt.nokia.com/3194
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Keep MultiFeedRssModel private in the context of C++

Change-Id: I9ec1948005928682cbaab39c5bc0f4e96b675bfe
Reviewed-on: http://codereview.qt.nokia.com/3195
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

re-add LD_LIBRARY_PATH script

we need to override RUNPATHs from possible plugins.

due to d7d23226, this should not re-introduce QTCREATORBUG-1646.

unlike in the previous incarnation, we don't replace the binary with the
script, but give the script an extension. this is nicer for packagers
and less confusing in creator's own run configurations. the .desktop
files created by our installers need to be adjusted for that.

Task-number: QTCREATORBUG-5565
Change-Id: Icd2fa55456754a05257376b8288e8bdf423c62db
Reviewed-on: http://codereview.qt.nokia.com/3180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

SDK Integration for Example Manifests

Change-Id: I3cdf8e299267b0cb2c21322bb9cd147f43dfb851
Reviewed-on: http://codereview.qt.nokia.com/2573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

French translations for 2.3.

This is the squashed result of work done by Thibaut Cuvelier
and Jonathan Courtois from developpez.com and myself (barely).

Full history is available on the team's repository:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr

Change-Id: Ia9317f894f2df7096cc6a9c39093b417d0a2ba35
Merge-request: 370
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3056
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Doc: generating core files while debugging

Task-number: QTCREATORBUG-5740
Change-Id: I5426cb5adfc3943416c9fc24f86f54045784629e
Reviewed-on: http://codereview.qt.nokia.com/3010
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

Show images also for examples

Change-Id: Ic67eea8abb19ab9e398d68cf568a1c99acfb6564
Reviewed-on: http://codereview.qt.nokia.com/3033
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Doc: update screenshot and instructions for opening examples

Change-Id: I01760cd26f5ac814ee3ce2f7985a08bd172fbf98
Reviewed-on: http://codereview.qt.nokia.com/3002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>

Help: Remove margins around the visual root elements.

Fixed updating of translations for external tools

Merge-request: 368
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Ic7d33860b072d2a905cf28459e1da10e46d584db

Updated Russian translation

Merge-request: 369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I51d19c6bcb8c30128500af5d9f7c7afb3360a570

Version bump

Change-Id: I62c13a4f70aacd083884316f997c049fd4202353

Debugger: Fix "Run to Line", "Jump to Line".

Change-Id: I33d7d6e0ef2f10d9198491e0562118687726d2aa
Reviewed-on: http://codereview.qt.nokia.com/2979
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

C++: Fix BaseSpecifierAST::firstToken return

Change-Id: I105d94f543d22319571320cd88f791278aac3239
Reviewed-on: http://codereview.qt.nokia.com/2734
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

Fix translation of external tools.

Change-Id: I21541c579f3be75537763ad65b63f6804c329e50
Reviewed-on: http://codereview.qt.nokia.com/2951
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fixed typo in French translation

Task-number: QTCREATORBUG-5794

Change-Id: Iacb63b2069a6601a2350d358b985eed86f17f50d
Reviewed-on: http://codereview.qt.nokia.com/2948
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fix possible crash in git branch dialog

Do not crash when checking out a branch while not currently
on any branch.

Task-number: QTCREATORBUG-5784
Change-Id: I5d007e91c1778e6f09a5d543990d948bc1427599
Reviewed-on: http://codereview.qt.nokia.com/2958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

DebuggingHelpers: Pass mkspec on command line

We didn't pass actually the targetMode and mkspec to qmake. E.g.
on Mac, debugging helpers therefore couldn't compile if the default
qmake mkspec is xcode.

Task-number: QTCREATORBUG-5806
Change-Id: I575012386983e1e285a500f99a34b7f21dcba29d
Reviewed-on: http://codereview.qt.nokia.com/2947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

fakevim: fix action used in Edit->Advanced

Variable was uses in wrong scope.

Change-Id: I0c9343742cf75b118c14cbf8bf4cec9f983c32d5
Reviewed-on: http://codereview.qt.nokia.com/2941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Editors: Make sure folded blocks remain consistent

When folding indents change and a block becomes no longer
folded we need to update the user data. This patch tries
to handle general inconsistencies that might arise in such
situations. Notice however that there are stil other problems
to be addressed (including issues in Qt).

Task-number: QTCREATORBUG-5771
Change-Id: I38b869832159598d46cde00058308c218ca31f1a
Reviewed-on: http://codereview.qt.nokia.com/2908
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Matthias Ettrich

Updated Russian translation

Merge-request: 359
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Iea721437f2615acb8fec5dabca34b0922bf551ee

Update chinese translation for 2.3

Merge-request: 360
Reviewed-by: ossi
Change-Id: Ia6e6303dabcda2bf3b7abc44fdfde2d359bb61a7

Update japanese translations for 2.3.

Merge-request: 361
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I384b845fd586a90a7209fc22c8a1f7d2170feac5

QmlDebugging: Fix on-device debugging for people with a default proxy

Qt Creator by default honors the proxy settings of the environment.
This is the wrong choice when connecting to your device, leading to
'Cannot connect to in-process debugger' errors.

Change-Id: Ie0b822dec601463ba3a620efe1a1e35bb24b6c5a
Reviewed-on: http://codereview.qt.nokia.com/2846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

QmlDebugger: Fix QML Script Console for mixed debugging

Both the Debugger View and the QML Script Console use
executeDebuggerCommand(...). Forward this to QmlEngine if
the QmlEngine is stopped (because only then teh QML Script Console
is enabled), to C++ otherwise.

Change-Id: I4ba72b56a6205db5346e167b85e9353d05adae41
Reviewed-on: http://codereview.qt.nokia.com/2829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Revert "fakevim: also set foreground color for search matches"

This reverts commit c1f225fd8f3020957c3326782b02ae41e4ad2aed.

This does not cover the case where the cursor is in the marked
text, which then blinks black-on-black.

Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad1
Reviewed-on: http://codereview.qt.nokia.com/2698
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Fix running applications in Windows SDK 7.1.

Fix start of applications with varying Qt-versions when Qt Creator
is launched from an Windows SDK command prompt (prevent
PATH from being reset by setenv.cmd).

Change-Id: I74f75f3663be4836c368a4b9d8c7f8fc5ec351d7
Reviewed-on: http://codereview.qt.nokia.com/2818
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

C++: Fix crash when typing illegal class names

Such as class ~A {} or class operator+ {}.

Done by Roberto Raggi

Change-Id: I4fdad6d27aaa997e651f2d08de36fe675fc78814
Reviewed-on: http://codereview.qt.nokia.com/2778
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

Remove unnecessary import, removes a warning

Change-Id: If89bec794fe3fe5315b69ad283d35c2ba0abced3
Reviewed-on: http://codereview.qt.nokia.com/2779
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

QmlDebugger: Hit breakpoints for simple bindings also for .qmlproject

Make sure QML_DISABLE_OPTIMIZER is set also when debugging with
qmlobserver

Change-Id: I33aa4cd50ae184e339e3783488ba236eecdf7b33
Reviewed-on: http://codereview.qt.nokia.com/2753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

MeeGo: Adapt package name to changed OVI store requirements.

Fremantle needed the application version as x_y_z, for Harmattan it must
be x.y.z, otherwise the package will not be accepted by the store.
Obviously.

Task-Number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=276021

Change-Id: I93b8fd7f1c95b9ef26df97f817e3b8b610c4e932
Reviewed-on: http://codereview.qt.nokia.com/2697
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

debugger: change default value for 'break on qFatal' to 'false'

Change-Id: Ief1879c1e8009d1a60575180d4132d8f03a88b08
Reviewed-on: http://codereview.qt.nokia.com/2690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Polish Polish translation

Change-Id: I5c48cd5cc5fcb8298dabb4a612a3fbb35ae6f491
Reviewed-on: http://codereview.qt.nokia.com/2679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>

QmlDesigner.navigator: fixes crash for context menu

We have to add a check if the item we want to set visibility on
is really an item. See: isItem()

For general safety I added try catch blocks for RewritingExceptions

Task-Number: QTCREATORBUG-5731
Change-Id: I72f4f5ae69067a04b09880ae071265c83f880b4c
Reviewed-on: http://codereview.qt.nokia.com/2637
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QtQuickApp wizard: Deactivate .qml file selector by default

Change-Id: If7b94a0c5ddad7c06ffb41df1b0678181b0702fa
Reviewed-on: http://codereview.qt.nokia.com/2635
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

QmlProfiler: fixed sorting of "event type" field

Change-Id: Ibaa321c65f44c4ca9c87bb312659173bb2f26d64
Reviewed-on: http://codereview.qt.nokia.com/2634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Enable some cursor keys for binary editor again.

Change-Id: I0e0136a205fa6ca6ed9c8d0d745803488337dd37
Reviewed-on: http://codereview.qt.nokia.com/2626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

QmlDesigner.propertyEditor: fix for alpha == 0

"transparent" is an extra case.

Task-Number: QTCREATORBUG-5727
Change-Id: If28e8735aacb3dd464b61fb7ed65918d8ea465b2
Reviewed-on: http://codereview.qt.nokia.com/2627
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

QmlDesigner.statesEditor: crashfix for focus handling

Ignore changes to the TextEdit if focus gets lost.
Reason: an error message (illegal state name) would lead to a crash.
For details see the task.

Task-Number: QTCREATORBUG-5729
Change-Id: I0f0ad7a416ba59d958b3ae5d8809ccb51f42fe5e
Reviewed-on: http://codereview.qt.nokia.com/2624
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlCpp Debugging: Only set C++ breakpoints after QML is connected

If one hits a C++ breakpoint before the QmlEngine is properly set up
the debugging actions are all disabled. Patch 58faedc4e tried to
fix this by automatically executing continue in these cases, but
this let to errors on Mac OS X. Instead just delay the setting of
C++ breakpoints.

Task-number: QTCREATORBUG-5681
Change-Id: I149dea9b453ed7abd33a1a93b5b546d7c6cda8fd
Reviewed-on: http://codereview.qt.nokia.com/2568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

QmlProject: Don't crash if no qt version is available

Change-Id: I1737ca26b29d366f4f326c534af1528776f2bfdd
Reviewed-on: http://codereview.qt.nokia.com/2607
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Export qmakestep and makestep

Needed by plugins implementing their own qt4 targets.
Backport was asked for on IRC.

Change-Id: Idad09914f95259443c06ecdf458e9ce63c802cc3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from commit a838d4ac0191de63e3a3a17290ffa6d14457c4d2)
Reviewed-on: http://codereview.qt.nokia.com/2587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

fakevim: v in visual mode actually leave visual mode

Task-number: QTCREATORBUG-5603
Change-Id: I239837b1d8ad30fdc157a6eaec05a026c294a750
(cherry picked from commit 764f902cf39da75260a1771d6d55a2f41be8dcca)
Reviewed-on: http://codereview.qt.nokia.com/2578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

fakevim: handle cursor keys in Replace mode

Task-number: QTCREATORBUG-5647
Change-Id: I06bf6b859ac5111b5692c003aab2d003a0c7b110
(cherry picked from commit 18b74f087bc9d898f30b21478c09b8897dc1d444)
Reviewed-on: http://codereview.qt.nokia.com/2577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

fakevim: also set foreground color for search matches

Task-number: QTCREATORBUG-5604
Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad0
(cherry picked from commit 00be04e1ea3b91849f963c9bca4d633fbdc352bc)
Reviewed-on: http://codereview.qt.nokia.com/2576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

fakevim: fix endless loop in certain search&replace operations

Task-number: QTCREATORBUG-5697
Change-Id: I25e9ef4ef042efa2b4dd670f5177e5e170fbaaf0
(cherry picked from commit d8fdd0acdc59a02788c23b18680b47da51cf1c56)
Reviewed-on: http://codereview.qt.nokia.com/2574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

debugger: allow insertion of evaluated expressions for core files

Task-number: QTCREATORBUG-5693
Change-Id: I8b6a5e0cd7956dab92270cae8994da3303fcf8e0
(cherry picked from commit 9f82bc25a4d0a8e33cb9f984b7786f617a3f66f2)
Reviewed-on: http://codereview.qt.nokia.com/2575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

compile fix

Change-Id: I6bea04e8e4a6bf74fcfe7c70459924ff2443176d
Reviewed-on: http://codereview.qt.nokia.com/2584
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Version bump

Change-Id: Ie922c0ccada7b20f452812ca0cf53f9085774c54

Make Components installable. Fix Shadow Build.

Task-Number: QTCREATORBUG-5672
Done-with: Oswald Buddenhagen
Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004
Reviewed-on: http://codereview.qt.nokia.com/2451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

QmlDesigner.rewriter: bugfix for components

Simplifying synchronisation of m_componentEndOffset. Fixes several
rewriting issues.

Change-Id: I53a7f4ae8af1acb05e4daff6afdeec9522d35a79
Reviewed-on: http://codereview.qt.nokia.com/2572
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.rewriter: allow more debuging info

Change-Id: I8e4571ac5a8a0ee57823e2e54a2c63f5bbe4538f
Reviewed-on: http://codereview.qt.nokia.com/2571
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Make session rows half as big in height as pojects rows.

Change-Id: I8c24d4e939d2701c10444bb2c37921a095fe636b
Reviewed-on: http://codereview.qt.nokia.com/2523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

QmlDesigner.propertyEditor: preserve alpha value

Task-number: QTCREATORBUG-5683
Change-Id: I5101eb4bdb73938628c0f0acc3ebf16868b53cb2
Reviewed-on: http://codereview.qt.nokia.com/2522
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QtQuickApp template: Don't enable qml debugging for every debug build

This can be confusing, since there is also the switch in the qmake step,
which is on by default for debug builds too. However, if one disables it
you expect that debugging has in fact been disabled.

Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2
Reviewed-on: http://codereview.qt.nokia.com/2511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Clear minimum Qt version and required features when needed

When the user chooses back button and select something
different than Symbian or Meego the above fields
should be cleared.

Task-number: QTCREATORBUG-5708
Change-Id: I2a8557cd1ab60dfc309c585399cd5b2210b44cc9
Reviewed-on: http://codereview.qt.nokia.com/2513
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

QmlProfiler: Fix documentation link for setting up debugging

Link directly to the page where the setup is described (qml profiler
page just links to it).

Change-Id: Ibe88f1b2269c90e868aab5272b01e337956d8e46
Reviewed-on: http://codereview.qt.nokia.com/2510
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Fix crash when spliting GLSL editor

Not a good idea to keep the editor stored since when removing
a split, for example, the editor will go away and the highlighter
is not aware of it anyhow since it actually belongs to the document.

Although it's not necessary for the fix this patch add another
constructor to SyntaxHighlighter which takes the BaseTextDocument.
This is convenient.

Task-number: QTCREATORBUG-5695
Change-Id: Ic91837b7d91ebd3a44c16e2fd589d7f6c5c0c002
Reviewed-on: http://codereview.qt.nokia.com/2508
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

Git: Fix ignore whitespaces/patience

Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: fix for Image (2)

Task-Number: QTCREATORBUG-5699
Change-Id: I819e50a6dd3f1a78112bc29b7c4c44284d25f21a
Reviewed-on: http://codereview.qt.nokia.com/2505
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>