qt-creator-jp

Fork

Fix typo.

Merge branch '2.3-jp' of git.sourceforge.jp:/gitroot/qt-creator-jp/qt-creator-jp into 2.3-jp

Merge branch '2.3' of git://gitorious.org/qt-creator/qt-creator into 2.3-jp

Fix unconsistent Japanese translations.

Update Japanese translations.

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>

Update japanese translations for 2.3.[5876/5985]

Merge branch '2.3' of git://gitorious.org/qt-creator/qt-creator into 2.3-jp

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>