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>

QmlDesigner.propertyEditor: fix for Image

Task-Number: QTCREATORBUG-5700
Change-Id: I8f3c5db7740aa4a18e09b9b7445362a5cfb33941
Reviewed-on: http://codereview.qt.nokia.com/2504
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.propertyEditor: fix for border image

SourceSize is read only.

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

QmlDesigner.propertyEditor: crash fix

We did not handle the case that a gradient is a binding.

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

Update Polish translations

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

QmlDesigner.NodeInstances: Show binding in text if invalid

If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlProfiler: Fix warning about unused variable

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

filemanager: fix regression when trying to save read-only file

When saving a read-only file, a dialog should appear with
Make Writable / Save As / Cancel should open.
Avoids relying on permission error to detect read-only files as
qfsfileengine_unix.cpp treats errno == EACCESS as a QFile::OpenError.

Change-Id: Icdffdc4617c8ef2b58d58aeedbb2b454d0da9465
Task-Number: QTCREATORBUG-5066
Reviewed-on: http://codereview.qt.nokia.com/2442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

QmlDesigner.rewriter: string fix

Change-Id: I9a46704c24bdd9ddfd24ba2cf76eb2573f1cf5ef
Reviewed-on: http://codereview.qt.nokia.com/2441
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Avoid multiple context menus popping up.

On Mac in debug mode, right-clicking on extra text area would first open
the markers menu, and after that the menu where you select which debug
widgets to show (like Stack or Locals and Expressions).
Opening the markers menu in a context menu event on the extra area is
both the more sensible thing to do, and works around the Mac
inconsistency.

Task-number: QTCREATORBUG-4699
Change-Id: I38efaffac80a98773deeeada3d0e3ef4f872c03b
Reviewed-on: http://codereview.qt.nokia.com/2434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

Debugger[gdb]: Fix crash when stepping over QLocale initialization.

Check the index before the array is accessed in the call item.

Task-number: QTCREATORBUG-5576
Change-Id: I3f533ef76af42dad97c93087f2d434b58fdedd44
Reviewed-on: http://codereview.qt.nokia.com/2044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Make sensible use of global analyzer settings

Project settings now have the option to use the global settings (on by
default), or custom ones.

Task-number: QTCREATORBUG-5445

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

Remove superflous connect statement.

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

Remove warning about missing file.

The file is created only at qmake run.

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

L10n: German translation for 2.3.

Change-Id: I2a0ee7db27dba27d74a1d6a10a7e4ca7cb2d1282
Reviewed-on: http://codereview.qt.nokia.com/2428
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

tr()-Fix: 'Report bug' needs '...'

Acked-by: Eike Ziller <eike.ziller@nokia.com>
Change-Id: I892df68c1e9eb5f45275c1a441903279ca1ce665
Reviewed-on: http://codereview.qt.nokia.com/2427
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Disable debug output in QtVersionManager::updateFromInstaller()

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

QmlDbg: Don't wait infinitely for messages on application output

We only connect to the port when we get a 'Waiting for connection ...'
message on application output. This was done mainly to avoid lots
of failed connects, and therefore an unresponsive UI on Windows.

However, the application output might be redirected for various reasons.
Therefore fall back to busy connect after a certain time (4 seconds
for profiling, 8 seconds for debugging).

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

Provide qmlviewer in external tools menu

Quite a few people have asked for previewing a .qml file in qmlviewer,
independent of the current project format.

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

GCC: Fix parsing of gcc 4.6 output

 * Add unit test.
 * Tweak regexp to make the new unit test pass.

Task-number: QTCREATORBUG-5634
Change-Id: I31da8e3ac7fb1c3c5129b4fed6a228d0a73a09ea
Reviewed-on: http://codereview.qt.nokia.com/2395
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

QtVersion: Set qmakeIsExecutable to false if qmake crashes.

This prevents literally dozens of crash dialog boxes on Windows.
Check for a crash in the helper library and in updateVersionInfo
consistently whatever is called first.
Initialize qmakeIsExecutable in 2nd constructor as well.

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

QmlDbg: Fix behavior when re-running the same run control

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

GCC: detect compiler setting in C locale

Run detection of GCC compiler settings using the C locale. This
should fix detection of some settings in non english locales.

Task-number: QTCREATORBUG-5637
Change-Id: I3ea74ce5374fb03ea0cd43566ee302c635e02cd4
Reviewed-on: http://codereview.qt.nokia.com/2387
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Show baseEnvironment changes in QmlProjectRunConfigurations's widget

That react to editing qt versions and selecting a different qt version.
The environment also depends on the available toolchains, that is
not taken into account.

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

New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)

Warn if the condition fails, but otherwise don't change the execution
flow.

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

RemoteLinux: Fix key deployment dialog.

When aborting the file dialog, the deployment dialog would not close
on its own.

Change-Id: I614f199b9fd486593e12b18f7f536561e7edae1d
Reviewed-on: http://codereview.qt.nokia.com/2388
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Debugger[CDB]: Breakpoint pass (ignore) count needs decimal prefix.

Task-number: QTCREATORBUG-5654

Change-Id: Ia69c582c342b5e00b5d267320f85efeb49b449f2
Reviewed-on: http://codereview.qt.nokia.com/2379
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Add Help Menu Entry that points to the bug tracker.

Task-Number: QTCREATORBUG-5098
Change-Id: Ibed9e8eea98cb716f2eff29582a39e133c7d8607
Reviewed-on: http://codereview.qt.nokia.com/2221
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>

Debugger: Fix crash in stack frame layout display.

The option is also enabled when the index is invalid.

Task-number: QTCREATORBUG-5650
Change-Id: If1efb900d29724e5c43db1589c797197fae67bd2
Reviewed-on: http://codereview.qt.nokia.com/2342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

Only show the infobar once

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

QmlDesigner.itemLibrary: adding status bar

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

Windows: Don't print 'cannot retrieve debugging output' signal multiple times

Disconnect from the WinDebugInterface instance, because every new
run control started will emit the same 'cannotRetrieveDebugOutput()'
signal again.

Change-Id: I94d591e0fa1664f7f7ca0ed4b1d9e021d23cd3e3
Task-number: QTCREATORBUG-5443
Reviewed-on: http://codereview.qt.nokia.com/2327
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Debugger: Only warn once about unhandled breakpoints

Don't show the dialog for every single breakpoint

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

VCS: Do not increase the number of VCSes in ProjectLoadWizard

Do not increase the number of VCSes by readding the same entries when going
back/next on the summary page of the project load wizard.

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

QmlProfiler: Fix warnings about hiding overloaded virtual functions

toolSelected() & toolDeselected are const methods in the base class.
But anyway the attach Action isn't used any more, so let's remove it
completely ...

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

QmlProfiler: Fix compiler warning

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

QmlDesigner.NodeInstances: Add version to puppet

Change-Id: Id101295520418975a4f569f57709875d7213e9bf
Reviewed-on: http://codereview.qt.nokia.com/2304
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.NodeInstances: Add a default dummy context

Task-number: QTCREATORBUG-5631

Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b
Reviewed-on: http://codereview.qt.nokia.com/2300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.NodeInstances: Move context object to a context directory

filename_contextdummy.qml -> context/filename.qml

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

QmlDesigner.rewriter:  ignore Component if is is the root item

Task-number: QTCREATORBUG-1828
Change-Id: Iba5d2e93a905c2a3c32730c4342b78ef4adfe8bc
Reviewed-on: http://codereview.qt.nokia.com/2301
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Help requests must be done in main thread.

Fixes an occassional assert "Cannot send events to objects owned by a
different thread." with receiver QHelpEngineCorePrivate.

Change-Id: I77ffd663a055c493607907374f7a4d775f6aac6c
Reviewed-on: http://codereview.qt.nokia.com/2289
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlProfiler: Fix profiling Symbian apps over WLAN

Use IP address from deploy configuration, not localhost

Change-Id: I1a5fcf6dc07a0d98404fdfb3a230c04f4062a57e
Reviewed-on: http://codereview.qt.nokia.com/2268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

Debugger: Prevent message boxes for every output to stderr

The use of QErrorMessage::qtHandle() installs a message handler
that from then on pops up a warning for each qWarning().

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

QmlDesigner.propertyEditor: layout fix

Adding an expanding widget to the layout

Task-number: QTCREATORBUG-5567
Change-Id: I6b52804af2bc798559661620605e2f8922a79ff0
Reviewed-on: http://codereview.qt.nokia.com/2286
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.NodeInstance: Update the screen object if the root item size changed

Change-Id: Ifc06131f4a57a30ab9b20687372150b23c8416cb
Reviewed-on: http://codereview.qt.nokia.com/2285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.NodeInstance: Reset items if the aux size is invalid

Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlDesigner.FormEditor: Skip all move events between a 30 ms time frame

To many move events will stall the local sockets.

Change-Id: Iec9a072a6c2e217d19c656d5596c40167ca97675
Reviewed-on: http://codereview.qt.nokia.com/2222
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

QmlJSDebugger: Fix crash when stopping debugger

The destructor of QmlAdapter deletes the QDeclarativeDebugConnection,
which in turn results in status changes to the QmLJSInspectorClient. This
again leads to QmlAdapter::logServiceStatusChange() being called for the
already half-destructed object ... break this change by guarding the pointer
to QmlAdapter in QmlJSClientProxy.

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

QmlDesigner.itemLibrary: use QFileSystemModel

QDirModel is depricated.
Task-number: QTCREATORBUG-3134

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

Fix crash on editing qmake path

Invalid qmake's would lead to crashes

Task-Nr: QTCREATORBUG-5544

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

QmlCppDebugging: handling Harmattan mixed debugging

Change-Id: Idfc0a6d48bcc1c42aac58ea03b5a51ad6e661f25
Reviewed-on: http://codereview.qt.nokia.com/2275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QmlJsDbg: Fix compilation for Symbian

Despite of '-k' passed to make, the 'all' target might still fail prematurely
because make doesn't forward the '-k' to sbs. Anyway, now that we
know the exact toolchain we can do better and only compile the
targets that fit to the toolchain.

If not Symbian, use the 'all' target everywhere, which ensures
we're both compiling debug and release versions of all helpers.

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

QMlProfiler: Print logging / errors while connecting to General Messages pane

Actually the error message should ideally show up in Application Output, but
that would require a translation. Left for 2.4.

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

QtQuickToolBar: fix positioning

Instead of hiding the widget we move it accordingly.

Task-number: QTCREATORBUG-2958
Change-Id: I45deafab33ea928d4c4d6ff199ec542c1ee6ef3e
Reviewed-on: http://codereview.qt.nokia.com/2266
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>