OSDN Git Service

qt-creator-jp/qt-creator-jp.git
13 years agoRefactoring changes: Cleanup and improvements.
Christian Kamm [Wed, 17 Aug 2011 09:35:57 +0000 (11:35 +0200)]
Refactoring changes: Cleanup and improvements.

Previously RefactoringFiles were usually passed around by value.
However, since a RefactoringFile may sometimes own a QTextDocument
(when it was read from a file), that's not great and caused the
file to be reread after every copy.

With this change RefactoringFile becomes noncopyable and is always
owned by a shared pointer.

This change also allowed having const RefactoringFiles which is
useful because they can be safely used from other threads. See
CppRefactoringChanges::fileNoEditor.

Change-Id: I9045921d6d0f6349f9558ff2a3d8317ea172193b
Reviewed-on: http://codereview.qt.nokia.com/3084
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoQuickFixes: Always show all matching quick fixes.
Christian Kamm [Fri, 19 Aug 2011 08:24:09 +0000 (10:24 +0200)]
QuickFixes: Always show all matching quick fixes.

Change-Id: Ifc23d047b3b267ca1369ecb6f9f5de18887d3e92
Reviewed-on: http://codereview.qt.nokia.com/3250
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoQmlJS: Fix semantic and non-semantic QML error reporting.
Christian Kamm [Tue, 16 Aug 2011 12:11:30 +0000 (14:11 +0200)]
QmlJS: Fix semantic and non-semantic QML error reporting.

The QML snapshot only ever contains valid Documents; to compile a list
of parser problems we need to get at the invalid documents.

To do that, the model manager now provides a Snapshot with up to date,
but potentially invalid documents. That should also be useful for other
things.

Change-Id: I67892f63771c221bf2fe2c2bf0240a0f4e523227
Reviewed-on: http://codereview.qt.nokia.com/3012
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoCompile fix Windows.
Friedemann Kleint [Thu, 18 Aug 2011 14:55:45 +0000 (16:55 +0200)]
Compile fix Windows.

Change-Id: Ia9f9afaf77c000503512a19ef7e4f33ae9cca041
Reviewed-on: http://codereview.qt.nokia.com/3217
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoHeader cleanup in Qt4ProjectManager.
Friedemann Kleint [Thu, 18 Aug 2011 14:46:44 +0000 (16:46 +0200)]
Header cleanup in Qt4ProjectManager.

Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.

Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoHeader cleanup in QML/JS and project manager.
Friedemann Kleint [Thu, 18 Aug 2011 14:46:26 +0000 (16:46 +0200)]
Header cleanup in QML/JS and project manager.

Change-Id: I40b41a3ef6189a99272e345e3251680edccecca0
Reviewed-on: http://codereview.qt.nokia.com/3215
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoQmlProfiler: make strings translatable
Christiaan Janssen [Thu, 18 Aug 2011 13:17:53 +0000 (15:17 +0200)]
QmlProfiler: make strings translatable

Task-number: QTCREATORBUG-5747

Change-Id: If15bb749e641ed181dbfee3400c18d52bc88e5fb
Reviewed-on: http://codereview.qt.nokia.com/3188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agodebugger: work on manual tests
hjk [Thu, 18 Aug 2011 14:14:34 +0000 (16:14 +0200)]
debugger: work on manual tests

Change-Id: Ifdcf4e9a09be0cc21ab9dc579dcae8dfbe91a9d2
Reviewed-on: http://codereview.qt.nokia.com/3212
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoGCC: Set LANG=C
Tobias Hunger [Thu, 18 Aug 2011 13:43:36 +0000 (13:43 +0000)]
GCC: Set LANG=C

Set LANG=C when building with GCC. This can be overridden in the
environment section of the project build settings.

This change should make sure that Qt Creator is able to properly
parse build issues.

Task-number: QTCREATORBUG-4011
Change-Id: Ibff57feff7945fc7e03acca3a86323b63c9d66ae
Reviewed-on: http://codereview.qt.nokia.com/3193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoProject: Allow for additional named settings
Tobias Hunger [Mon, 1 Aug 2011 13:21:01 +0000 (13:21 +0000)]
Project: Allow for additional named settings

Allow for additional named settings to be saved along with the project
data.

This allows plugins to save project-specific settings.

Change-Id: I6ed24089efad2eb466385ac9ca4c2dde8bf8c2eb
Reviewed-on: http://codereview.qt.nokia.com/2443
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoBaseTextEditor: Remove stray qDebug.
Christian Kamm [Thu, 18 Aug 2011 13:33:12 +0000 (15:33 +0200)]
BaseTextEditor: Remove stray qDebug.

Change-Id: I544c23aa06d533933162bcc9623ef632981e5053
Reviewed-on: http://codereview.qt.nokia.com/3191
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoHeader cleanup in various plugins.
Friedemann Kleint [Thu, 18 Aug 2011 13:04:13 +0000 (15:04 +0200)]
Header cleanup in various plugins.

Change-Id: I16b273cc792bfd2035d35e7c67675f039cd387b9
Reviewed-on: http://codereview.qt.nokia.com/3185
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoHeader cleanup in TextEditor.
Friedemann Kleint [Thu, 18 Aug 2011 12:23:06 +0000 (14:23 +0200)]
Header cleanup in TextEditor.

Change-Id: I832d255a4d8f291426d54ad0353641db515a511a
Reviewed-on: http://codereview.qt.nokia.com/3182
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoCompile fix Windows.
Friedemann Kleint [Thu, 18 Aug 2011 11:58:23 +0000 (13:58 +0200)]
Compile fix Windows.

Change-Id: I93048cf9e4fda2d261037408967c30a0f5796110
Reviewed-on: http://codereview.qt.nokia.com/3181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoHeader cleanup in ProjectExplorer.
Friedemann Kleint [Thu, 18 Aug 2011 11:46:52 +0000 (13:46 +0200)]
Header cleanup in ProjectExplorer.

Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoC++ function link: Unbreak same-file links.
Christian Kamm [Thu, 18 Aug 2011 09:22:42 +0000 (11:22 +0200)]
C++ function link: Unbreak same-file links.

Change-Id: Icfb71278c796dfb8668de423a691c7dc90e9531f
Reviewed-on: http://codereview.qt.nokia.com/3170
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoDebugger[CDB]: Fix setting individual formats by iname.
Friedemann Kleint [Thu, 18 Aug 2011 10:12:07 +0000 (12:12 +0200)]
Debugger[CDB]: Fix setting individual formats by iname.

Do not hex-decode names.

Change-Id: I0b9b6df2524cdf66bc34958bbab5bbc28f8a73db
Reviewed-on: http://codereview.qt.nokia.com/3172
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoQmlLivePreview: fix crash when inserting node with no parents
Christiaan Janssen [Thu, 18 Aug 2011 09:41:42 +0000 (11:41 +0200)]
QmlLivePreview: fix crash when inserting node with no parents

Change-Id: Ib781f64aed11aafc106dc15b40689181fefd5dd3
Reviewed-on: http://codereview.qt.nokia.com/3171
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoGit: Fixed Omit Date
Orgad Shaneh [Thu, 18 Aug 2011 08:29:43 +0000 (08:29 +0000)]
Git: Fixed Omit Date

Issue: QTCREATORBUG-5429
Reviewed-by: pending
Change-Id: Id2bb7fa756b7d5f49e8d7a250431f8042d514fd2
Merge-request: 366
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3151

13 years agoC++ function link: Disable link if target editor changes.
Christian Kamm [Wed, 17 Aug 2011 10:21:04 +0000 (12:21 +0200)]
C++ function link: Disable link if target editor changes.

Change-Id: I7041f3c520e88b4376c5cbac08ed79aa44641f0f
Reviewed-on: http://codereview.qt.nokia.com/3088
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoDebugger: Re-enable char format tests.
Friedemann Kleint [Thu, 18 Aug 2011 08:23:50 +0000 (10:23 +0200)]
Debugger: Re-enable char format tests.

Change-Id: Ie4b86b4f0db3fd1d32218b03a16e9bb8853aa305
Reviewed-on: http://codereview.qt.nokia.com/3146
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoEditors: Enhance smart backspace behavior
Leandro Melo [Wed, 17 Aug 2011 10:31:15 +0000 (12:31 +0200)]
Editors: Enhance smart backspace behavior

Adds a new smart backspace behavior option. Now it's also possible
to simply unindent (like a backtab). This is particularly useful
when the cursor is not inside an "indentation area" but the user
still wants to go backwards by indent levels when possible (for
example before a comment that appears after the code line). The
option also allows the user to reach a new indent level which has
not been seen so far in previous lines.

The original follows indentation user setting will be lost with this
patch, but we consider this ok for not very "significant" settings.

Change-Id: I49efb6b0309d9b7d7ff2a589413446bc16fb753c
Reviewed-on: http://codereview.qt.nokia.com/3105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoRemoteLinux: Let application runners set the device configuration.
Christian Kandeler [Wed, 17 Aug 2011 14:02:00 +0000 (16:02 +0200)]
RemoteLinux: Let application runners set the device configuration.

Could conceivably make sense during doDeviceSetup().

Change-Id: I6a30d44561dbe75566e48c6db9604ff72075b8dd
Reviewed-on: http://codereview.qt.nokia.com/3114
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agocore: compile fix with namespaces
hjk [Wed, 17 Aug 2011 13:16:54 +0000 (15:16 +0200)]
core: compile fix with namespaces

Change-Id: Ibbf2711d7d7ce2b0ec56c93bb0ceac3dfa785756
Reviewed-on: http://codereview.qt.nokia.com/3106
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: set print object _on_
hjk [Wed, 17 Aug 2011 12:55:11 +0000 (14:55 +0200)]
debugger: set print object _on_

Change-Id: Ic9d87d480cbb54dbd8ef431ef062150e11f89834
Reviewed-on: http://codereview.qt.nokia.com/3102
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: update manual tests
hjk [Wed, 17 Aug 2011 12:54:31 +0000 (14:54 +0200)]
debugger: update manual tests

Change-Id: I88b980d4bd8c6ad7af34b6cf28cdea196d1e56d2
Reviewed-on: http://codereview.qt.nokia.com/3101
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoNotify disconnect to debug server when inferiorshutdownrequested
Aurindam Jana [Wed, 17 Aug 2011 11:42:41 +0000 (13:42 +0200)]
Notify disconnect to debug server when inferiorshutdownrequested

Change-Id: I15bb1342f647362cb00e4b0d0453b663a2d3f637
Reviewed-on: http://codereview.qt.nokia.com/3095
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoAnalyzer: Clean headers.
Friedemann Kleint [Wed, 17 Aug 2011 11:37:52 +0000 (13:37 +0200)]
Analyzer: Clean headers.

Change-Id: Ib190e46e3b8b9b3331f9c5170059b6453ac839b4
Reviewed-on: http://codereview.qt.nokia.com/3094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoDisable gcc warning about always-true Q_ASSERT check
Kai Koehne [Wed, 17 Aug 2011 07:23:20 +0000 (09:23 +0200)]
Disable gcc warning about always-true Q_ASSERT check

gcc 4.5.1 warned about the Q_ASSERT in QStringRef::at() being
always false for isCompleteStringLiteral, isCompleteCharLiteral.

Change-Id: Idb20f81f92876eff685166c8deeebd6e151303b1
Reviewed-on: http://codereview.qt.nokia.com/3070
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoChanged the behaviour of setting breakpoints in qml files.
Aurindam Jana [Wed, 17 Aug 2011 09:47:42 +0000 (11:47 +0200)]
Changed the behaviour of setting breakpoints in qml files.

Delegates setting of breakpoints to functions that set/reset/change the breakpoint one at a time.
Change-Id: I553a74b05cf19c9d2436344db67bc962da18457f
Reviewed-on: http://codereview.qt.nokia.com/3082
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoUtils/Coreplugin: Clean headers.
Friedemann Kleint [Wed, 17 Aug 2011 10:54:58 +0000 (12:54 +0200)]
Utils/Coreplugin: Clean headers.

Change-Id: I1e0d432127651622d40ff990e1866eac9fac46a0
Reviewed-on: http://codereview.qt.nokia.com/3091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoImproved editor menus
Robert Loehning [Tue, 16 Aug 2011 16:55:23 +0000 (18:55 +0200)]
Improved editor menus

Access native filemanager and terminal from Open documents view
and Editor menu

Task-number: QTCREATORBUG-389

Change-Id: Id6cd8839cdbd270a4ac53ccad1ae1db94d48e900
Reviewed-on: http://codereview.qt.nokia.com/2974
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoQmlProfiler: New event list with caching, load, save
Christiaan Janssen [Tue, 26 Jul 2011 11:56:14 +0000 (13:56 +0200)]
QmlProfiler: New event list with caching, load, save

Change-Id: I640a16649156a49f2d7e7006d6b2ea38fe218620
Reviewed-on: http://codereview.qt.nokia.com/3043
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlJS: Fix warnings about duplicate and empty file watchers.
Christian Kamm [Wed, 17 Aug 2011 09:59:15 +0000 (11:59 +0200)]
QmlJS: Fix warnings about duplicate and empty file watchers.

Change-Id: Ia2d5f7588f1a5eb4192526e85b2569b4b175dad2
Reviewed-on: http://codereview.qt.nokia.com/3085
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoHeader cleanup in QtSupport.
Friedemann Kleint [Wed, 17 Aug 2011 09:34:57 +0000 (11:34 +0200)]
Header cleanup in QtSupport.

Change-Id: I681bab48aafb029f4869209382493dfa36233a2d
Reviewed-on: http://codereview.qt.nokia.com/3081
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoanalyzer: code cosmetics
hjk [Fri, 5 Aug 2011 16:03:37 +0000 (18:03 +0200)]
analyzer: code cosmetics

Change-Id: Id00cf1be9d07e47f7b61b8cc7e940629c84a48c1
Reviewed-on: http://codereview.qt.nokia.com/2707
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: work on manual tests
hjk [Wed, 17 Aug 2011 08:46:08 +0000 (10:46 +0200)]
debugger: work on manual tests

Change-Id: I4498aa4023c83a6c5ae687aede9eb497afa9fd37
Reviewed-on: http://codereview.qt.nokia.com/3076
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoPass Abi when attaching debugger to application launched via 'Run'.
Friedemann Kleint [Wed, 17 Aug 2011 07:06:59 +0000 (09:06 +0200)]
Pass Abi when attaching debugger to application launched via 'Run'.

Task-number: QTCREATORBUG-5808

Change-Id: Id35e13fd71f4de7912070e90cda6add07200c7ae
Reviewed-on: http://codereview.qt.nokia.com/3069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoC++: Fix function signature link for foo(void).
Christian Kamm [Tue, 16 Aug 2011 12:31:15 +0000 (14:31 +0200)]
C++: Fix function signature link for foo(void).

Change-Id: Icc8861a5127272750c5aa0b6340967ddf0a5a085
Reviewed-on: http://codereview.qt.nokia.com/3016
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agodebugger: work on manual tests, rearrange format computation
hjk [Tue, 16 Aug 2011 15:32:34 +0000 (17:32 +0200)]
debugger: work on manual tests, rearrange format computation

Change-Id: Ia1dc9f134fe19fc1607c150051381c61c0ad1469
Reviewed-on: http://codereview.qt.nokia.com/3053
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: simplify unreachable branch in dumper code
hjk [Tue, 16 Aug 2011 15:05:17 +0000 (17:05 +0200)]
debugger: simplify unreachable branch in dumper code

Change-Id: I00e7fdf3008119ec1b2fbd8acecdbb71b099dfc9
Reviewed-on: http://codereview.qt.nokia.com/3050
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: remove "alien" debugger support
hjk [Tue, 16 Aug 2011 14:59:09 +0000 (16:59 +0200)]
debugger: remove "alien" debugger support

Change-Id: Ib007c8cb7ef96f59a738c6b59b81a5894c133f98
Reviewed-on: http://codereview.qt.nokia.com/3049
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: also pretty-print typedefs to references
hjk [Tue, 16 Aug 2011 14:57:53 +0000 (16:57 +0200)]
debugger: also pretty-print typedefs to references

Change-Id: Id845d9cf412efb6797feadcb4d83286d16db7123
Reviewed-on: http://codereview.qt.nokia.com/3048
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoBuild progress: Show only compile and build errors.
Christian Kamm [Tue, 16 Aug 2011 12:16:48 +0000 (14:16 +0200)]
Build progress: Show only compile and build errors.

Change-Id: Ic20131048c1b5846fa626051499a1e437d6fd266
Reviewed-on: http://codereview.qt.nokia.com/3013
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agodebugger: add manual test
hjk [Tue, 16 Aug 2011 10:25:54 +0000 (12:25 +0200)]
debugger: add manual test

Task-number: QTCREATORBUG-5799
Change-Id: I5577fc2f19e200d6d360e4d1237ed9f55808ed73
Reviewed-on: http://codereview.qt.nokia.com/3001
Reviewed-by: hjk <qthjk@ovi.com>
13 years agofix a crash if no qt version is set for a project
Benito van der Zander [Tue, 16 Aug 2011 10:20:44 +0000 (10:20 +0000)]
fix a crash if no qt version is set for a project

Change-Id: I554288078fb472352a3a93e689c859e05d72e67e
Merge-request: 337
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3000

13 years agovcsbase: fix confusing error when no binary specified
cerf [Tue, 16 Aug 2011 08:29:37 +0000 (08:29 +0000)]
vcsbase: fix confusing error when no binary specified

A special case is now supported when no VCS binary is specified (left
blank in options) then a default (fallback) binary is used instead.
Class VCSBaseClientSettings is now equipped with defaultBinary() and
setDefaultBinary(). Descendant classes can define the default binary
to be used when needed (see BazaarClientSettings for example).

Task-number: QTCREATORBUG-5666

Change-Id: I74c79df03f820996b31a1cd05201bd88ba5dd081
Merge-request: 364
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2996

13 years agovcsbase: fix bug causing redundant output
cerf [Tue, 16 Aug 2011 08:29:38 +0000 (08:29 +0000)]
vcsbase: fix bug causing redundant output

In VCSJobRunner::task() some execution paths left a signal/slot
connection, causing redundant output emission.
This would occur for example after a VCS job fails : if the next
job succeeds then its output is emitted twice, because the previous
connection for signal output() was not destroyed.
The bug is now fixed by ensuring disconnect is done for all execution
paths (thanks to helper DisconnectSignalHelper).

Change-Id: I67a7ba2829208f7e71158cb17a99575d79c9f9f7
Merge-request: 364
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2997

13 years agoC++: Fix ::A name handling in findMatchingDeclaration.
Christian Kamm [Mon, 15 Aug 2011 07:50:36 +0000 (09:50 +0200)]
C++: Fix ::A name handling in findMatchingDeclaration.

Change-Id: Id158be80c42056c145c2b787d4f569e2c0a0b66e
Reviewed-on: http://codereview.qt.nokia.com/2932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoImplement close all application outputs action
Jarek Kobus [Fri, 5 Aug 2011 10:27:26 +0000 (12:27 +0200)]
Implement close all application outputs action

Task-number: QTCREATORBUG-3465

Change-Id: Iff96ece9d6b74199cc3667079b99d587099b85e9
Reviewed-on: http://codereview.qt.nokia.com/2685
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoC++: Synchronize function decl/def refactoring.
Christian Kamm [Wed, 10 Aug 2011 07:50:04 +0000 (09:50 +0200)]
C++: Synchronize function decl/def refactoring.

When editing a function declaration or definition the code model
may realize the same changes have to be applied somewhere else. A
refactoring marker will pop up that can be clicked to perform the
changes. Alternatively, press enter to apply.

Change-Id: I2299a2ecfb6a8f87d4853fc7cfa99486f890a1d3
Reviewed-on: http://codereview.qt.nokia.com/2909
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoBuildManager: Only pop up build issues if there are relevant issues.
Christian Kamm [Wed, 10 Aug 2011 06:21:10 +0000 (08:21 +0200)]
BuildManager: Only pop up build issues if there are relevant issues.

Previously it also poped up and showed a build failure if there were
any error-type tasks in 'My Tasks', 'Analyser' or 'QML'.

Change-Id: Ie86be0afe1f0b7571b2cb764b7c53f282183b513
Reviewed-on: http://codereview.qt.nokia.com/2807
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoMerge remote-tracking branch 'origin/2.3'
Eike Ziller [Tue, 16 Aug 2011 08:21:55 +0000 (10:21 +0200)]
Merge remote-tracking branch 'origin/2.3'

Conflicts:
qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd

13 years agoVersion bump
Eike Ziller [Tue, 16 Aug 2011 08:20:21 +0000 (10:20 +0200)]
Version bump

Change-Id: I62c13a4f70aacd083884316f997c049fd4202353

13 years agoQtQuick wizard: Fix compilation for QT_USE_FAST_CONCATENATION
Kai Koehne [Mon, 15 Aug 2011 08:41:31 +0000 (10:41 +0200)]
QtQuick wizard: Fix compilation for QT_USE_FAST_CONCATENATION

Use QString().arg() instead of + , which might be undefined if the
user adds QT_USE_FAST_CONCATENATION to the .pro file.

Task-number: QTCREATORBUG-5796
Change-Id: Ic842cae650c8fa898d72065f3a1c672f5eb893d4
Reviewed-on: http://codereview.qt.nokia.com/2939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoC++: Make Source::revision unsigned instead of int.
Christian Kamm [Mon, 15 Aug 2011 11:10:08 +0000 (13:10 +0200)]
C++: Make Source::revision unsigned instead of int.

All places that use it deal with unsigned revisions:
* SemanticInfo::revision
* Document::revision
* CPPEditorWidget::editorRevision

Even though QTextDocument::revision is int.

Change-Id: I2b3a94056d15fd02539d14c7cec35511abed57b5
Reviewed-on: http://codereview.qt.nokia.com/2954
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoQmlJS: Show semantic messages on request.
Christian Kamm [Tue, 9 Aug 2011 12:40:04 +0000 (14:40 +0200)]
QmlJS: Show semantic messages on request.

* Add 'Run Checks' action (Ctrl-Shift-C) to perform checks on
  all projects.
* Add 'QML Analysis' build issues category to separate
  clear errors from semantic analysis results.
* Disabled automatic updating of analysis results.

Change-Id: I4c948b1bd39f55655073e56c5e3ca7837f727665
Reviewed-on: http://codereview.qt.nokia.com/2850
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoDebugger: Fix "Run to Line", "Jump to Line".
Friedemann Kleint [Mon, 15 Aug 2011 14:52:08 +0000 (16:52 +0200)]
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>
13 years agoC++: Fix BaseSpecifierAST::firstToken return
Leandro Melo [Mon, 8 Aug 2011 07:54:06 +0000 (09:54 +0200)]
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>
13 years agoFix translation of external tools.
Eike Ziller [Mon, 15 Aug 2011 10:51:16 +0000 (12:51 +0200)]
Fix translation of external tools.

Change-Id: I21541c579f3be75537763ad65b63f6804c329e50
Reviewed-on: http://codereview.qt.nokia.com/2951
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agodebugger: compile fix on windows
hjk [Mon, 15 Aug 2011 14:28:41 +0000 (16:28 +0200)]
debugger: compile fix on windows

Change-Id: I6d4780129eb34fa69ae88d15b276a250a3d552c6
Reviewed-on: http://codereview.qt.nokia.com/2978
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoprocess_ctrlc_stub: more intelligent removal of first argument
Joerg Bornemann [Mon, 15 Aug 2011 10:39:59 +0000 (12:39 +0200)]
process_ctrlc_stub: more intelligent removal of first argument

Change-Id: I693f5974a1c3f90a5d2f93d048c9a96504c44939
Reviewed-on: http://codereview.qt.nokia.com/2950
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFixed typo in French translation
Robert Loehning [Mon, 15 Aug 2011 10:29:38 +0000 (12:29 +0200)]
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>
13 years agoAdd Close/Close Others/Close All items to editor list's context menu
Eike Ziller [Mon, 15 Aug 2011 13:21:02 +0000 (15:21 +0200)]
Add Close/Close Others/Close All items to editor list's context menu

Move the context menu actions from the "Open Documents" pane to the
editor manager and use these for both the open documents pane and the
editor combo box in the editor tool bar.

Change-Id: If2a8cb4cf0498c78bd06053919b3cb74692b7cd8
Reviewed-on: http://codereview.qt.nokia.com/2973
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agodebugger: update manual tests
hjk [Mon, 15 Aug 2011 11:32:46 +0000 (13:32 +0200)]
debugger: update manual tests

Change-Id: Ifed298d5257e02e3df1cde947419ab999be116af
Reviewed-on: http://codereview.qt.nokia.com/2971
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: reduce namespace line noise
hjk [Mon, 15 Aug 2011 11:32:23 +0000 (13:32 +0200)]
debugger: reduce namespace line noise

Change-Id: I8e4cabd8bd4a4378590daf92a647ecbbe7d0a28b
Reviewed-on: http://codereview.qt.nokia.com/2970
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoFix possible crash in git branch dialog
Tobias Hunger [Mon, 15 Aug 2011 11:37:04 +0000 (11:37 +0000)]
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>
13 years agoC++: Use minimal names in 'insert local declaration' quickfix.
Christian Kamm [Mon, 15 Aug 2011 11:02:51 +0000 (13:02 +0200)]
C++: Use minimal names in 'insert local declaration' quickfix.

Change-Id: Ia8362bc9a4b319ab4bb65f3fb1a36dc769e28ccd
Reviewed-on: http://codereview.qt.nokia.com/2953
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
13 years agoQmlJS: Allow for more markers than just Qt Quick Toolbar.
Christian Kamm [Fri, 12 Aug 2011 07:25:01 +0000 (09:25 +0200)]
QmlJS: Allow for more markers than just Qt Quick Toolbar.

Change-Id: Id132b2fd42034a354baa548760083ca47d62697b
Reviewed-on: http://codereview.qt.nokia.com/2904
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoremove superfluous move from process_ctrlc_stub
Joerg Bornemann [Mon, 15 Aug 2011 09:44:08 +0000 (11:44 +0200)]
remove superfluous move from process_ctrlc_stub

Change-Id: Id4458dcf29893a007ee85c0ce85a500617f02b6d
Reviewed-on: http://codereview.qt.nokia.com/2946
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agofix incomplete renaming of qtcbuildhelper to qtcreator_ctrlc_stub
Joerg Bornemann [Mon, 15 Aug 2011 09:31:42 +0000 (11:31 +0200)]
fix incomplete renaming of qtcbuildhelper to qtcreator_ctrlc_stub

Change-Id: Ie70c61770efc056c70a84c298100fec33295afb5
Reviewed-on: http://codereview.qt.nokia.com/2945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoDebuggingHelpers: Pass mkspec on command line
Kai Koehne [Mon, 15 Aug 2011 09:59:20 +0000 (11:59 +0200)]
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>
13 years agoRemoteLinux: Export LinuxDeviceConfigurations.
Christian Kandeler [Mon, 15 Aug 2011 09:23:14 +0000 (11:23 +0200)]
RemoteLinux: Export LinuxDeviceConfigurations.

Specialized plug-ins might want to manipulate the device list
themselves, e.g. to add auto-detected devices.

Change-Id: I29b9bfd70c03bc83be86fc55c2023aed90f8ed62
Reviewed-on: http://codereview.qt.nokia.com/2944
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRemoteLinux: Add support for auto-detected devices.
Christian Kandeler [Mon, 15 Aug 2011 08:36:53 +0000 (10:36 +0200)]
RemoteLinux: Add support for auto-detected devices.

We assume them to be transient, which means they do not get saved.

Change-Id: Ia9016172737d6e2547e3db5faf35d81c5c8cb91a
Reviewed-on: http://codereview.qt.nokia.com/2943
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQtcProcess: Windows compile fix
Joerg Bornemann [Mon, 15 Aug 2011 09:12:00 +0000 (11:12 +0200)]
QtcProcess: Windows compile fix

Change-Id: I5f5882fe4ae2ab84c6e5668c560290b6b0cd30c7
Reviewed-on: http://codereview.qt.nokia.com/2942
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoDebugger: Don't warn about never-hit breakpoints when loading a coredumps
Kai Koehne [Mon, 8 Aug 2011 13:38:05 +0000 (15:38 +0200)]
Debugger: Don't warn about never-hit breakpoints when loading a coredumps

Only check the breakpoints when app was started internally.

Change-Id: I38f0af08a2c137d44a127b254283574277b57eff
Reviewed-on: http://codereview.qt.nokia.com/2751
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agofakevim: fix action used in Edit->Advanced
hjk [Mon, 15 Aug 2011 08:52:28 +0000 (10:52 +0200)]
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>
13 years agomove qtcbuildhelper where it belongs and rename it accordingly
Oswald Buddenhagen [Fri, 12 Aug 2011 19:06:05 +0000 (21:06 +0200)]
move qtcbuildhelper where it belongs and rename it accordingly

this is not a creator tool, but a helper of qtcprocess, just like the
existing stub.

Change-Id: Ice7c60a1dee0b132c6063747f82ea35699f4127d
Reviewed-on: http://codereview.qt.nokia.com/2918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agouseCtrlCStub is windows-only. make #ifdefs reflect that consistently
Oswald Buddenhagen [Fri, 12 Aug 2011 18:51:54 +0000 (20:51 +0200)]
useCtrlCStub is windows-only. make #ifdefs reflect that consistently

Change-Id: I9504df9a2a0d6381c66ec71f40799d185461731a
Reviewed-on: http://codereview.qt.nokia.com/2917
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agounscrew argument quoting in qtcbuildhelper call
Oswald Buddenhagen [Fri, 12 Aug 2011 18:49:50 +0000 (20:49 +0200)]
unscrew argument quoting in qtcbuildhelper call

Change-Id: I4f389e32d540d49e886e7db02b6332d2ad2372f7
Reviewed-on: http://codereview.qt.nokia.com/2916
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoEditors: Make sure folded blocks remain consistent
Leandro Melo [Fri, 12 Aug 2011 10:13:23 +0000 (12:13 +0200)]
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
13 years agoUpdated Russian translation
Sergey Belyashov [Fri, 12 Aug 2011 17:28:31 +0000 (19:28 +0200)]
Updated Russian translation

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

13 years agoUpdate chinese translation for 2.3
Beaver Xu [Fri, 12 Aug 2011 17:17:24 +0000 (19:17 +0200)]
Update chinese translation for 2.3

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

13 years agoUpdate japanese translations for 2.3.
axasia [Fri, 12 Aug 2011 15:27:11 +0000 (17:27 +0200)]
Update japanese translations for 2.3.

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

13 years agoAvoid warning from MSVC
Robert Loehning [Fri, 12 Aug 2011 12:55:49 +0000 (14:55 +0200)]
Avoid warning from MSVC

MSVC will warn if it finds */ outside of a comment

Change-Id: Ie25fd0d2793946817abfa778a6d475e881df1859
Reviewed-on: http://codereview.qt.nokia.com/2914
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoFix MSVC's class/vs struct warning.
Friedemann Kleint [Fri, 12 Aug 2011 11:44:30 +0000 (13:44 +0200)]
Fix MSVC's class/vs struct warning.

Change-Id: I5839f979b6fc8687b55dc46917dfc72abd3122a9
Reviewed-on: http://codereview.qt.nokia.com/2913
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoVCS: Add a 'Apply patch chunk' pairing 'Revert chunk' to VCS editor.
Friedemann Kleint [Fri, 12 Aug 2011 11:42:21 +0000 (13:42 +0200)]
VCS: Add a 'Apply patch chunk' pairing 'Revert chunk' to VCS editor.

Fix "Open With" editor-by-mimetype search to return all (diff) editors.

Change-Id: I8d9d3cee9e5fcee5555d6e301818ed22ad4390ac
Reviewed-on: http://codereview.qt.nokia.com/2912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix gcc warnings about signed/unsigned comparison
Kai Koehne [Thu, 11 Aug 2011 11:16:09 +0000 (13:16 +0200)]
Fix gcc warnings about signed/unsigned comparison

Change-Id: I43f0de47dccf67da2f4b622f70c76a69198286d5
Reviewed-on: http://codereview.qt.nokia.com/2860
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlJS: Rename SemanticHighlighter -> SemanticInfoUpdater.
Christian Kamm [Thu, 11 Aug 2011 11:52:02 +0000 (13:52 +0200)]
QmlJS: Rename SemanticHighlighter -> SemanticInfoUpdater.

Since it doesn't do any highlighting...

Change-Id: I45d20735535fa1885153a725d0ca894326ce53db
Reviewed-on: http://codereview.qt.nokia.com/2862
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoQmlDebugger: Remove unused code
Kai Koehne [Tue, 9 Aug 2011 14:06:48 +0000 (16:06 +0200)]
QmlDebugger: Remove unused code

Change-Id: I0b92c281e0d1cfd3e4d5a4e56544fde41a0f22a6
Reviewed-on: http://codereview.qt.nokia.com/2788
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlDebugging: Fix on-device debugging for people with a default proxy
Kai Koehne [Thu, 11 Aug 2011 07:57:44 +0000 (09:57 +0200)]
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>
13 years agoQmlJSDebugger: Remove unused toolbar
Kai Koehne [Tue, 9 Aug 2011 10:33:00 +0000 (12:33 +0200)]
QmlJSDebugger: Remove unused toolbar

This got disabled ages ago, but we never cleaned up the sources.

Change-Id: I3d172708002627c29816a6dc1e68b19b15fda372
Reviewed-on: http://codereview.qt.nokia.com/2776
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlDebugger: Fix QML Script Console for mixed debugging
Kai Koehne [Wed, 10 Aug 2011 15:03:33 +0000 (17:03 +0200)]
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>
13 years agoRevert "fakevim: also set foreground color for search matches"
hjk [Fri, 5 Aug 2011 14:00:40 +0000 (16:00 +0200)]
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>
13 years agoName watchutils encoding types consistently.
Friedemann Kleint [Mon, 8 Aug 2011 13:03:34 +0000 (15:03 +0200)]
Name watchutils encoding types consistently.

Change-Id: I26d92ffc6fdbe67bf0cbbb0dde40211330ef8e34
Reviewed-on: http://codereview.qt.nokia.com/2748
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoMerge remote-tracking branch 'origin/2.3'
Eike Ziller [Wed, 10 Aug 2011 14:03:57 +0000 (16:03 +0200)]
Merge remote-tracking branch 'origin/2.3'

Conflicts:
qtcreator.pri
src/libs/libs.pro
src/plugins/debugger/watchwindow.cpp
src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639

13 years agoC++: Fix off-by-one in scopeAt.
Christian Kamm [Wed, 10 Aug 2011 10:16:25 +0000 (12:16 +0200)]
C++: Fix off-by-one in scopeAt.

The only Scope that set the end offset to *before* the last token
was ObjCClassDeclaration.

Change-Id: Icbdb5bcdd72d96087ac586ad51510fed74a633eb
Reviewed-on: http://codereview.qt.nokia.com/2820
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoChanged links to bugtracker to https
Robert Loehning [Tue, 9 Aug 2011 15:32:46 +0000 (17:32 +0200)]
Changed links to bugtracker to https

Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9
Reviewed-on: http://codereview.qt.nokia.com/2791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoAdd absolute paths to environment.
Friedemann Kleint [Wed, 10 Aug 2011 10:13:31 +0000 (12:13 +0200)]
Add absolute paths to environment.

Change-Id: I0f23f8d372f3ceb3d4af301196e6fdea5f969998
Reviewed-on: http://codereview.qt.nokia.com/2819
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoFix running applications in Windows SDK 7.1.
Friedemann Kleint [Wed, 10 Aug 2011 10:10:35 +0000 (12:10 +0200)]
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>