OSDN Git Service
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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
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>
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>
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>
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>
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
Eike Ziller [Tue, 16 Aug 2011 08:20:21 +0000 (10:20 +0200)]
Version bump
Change-Id: I62c13a4f70aacd083884316f997c049fd4202353
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
Christian Kamm [Tue, 9 Aug 2011 09:10:53 +0000 (11:10 +0200)]
QmlJS: String literals with file names link to files.
Task-number: QTCREATORBUG-5701
Change-Id: If8e0cf2ba685de6fb5d2d11cff05d0dd5893ff82
Reviewed-on: http://codereview.qt.nokia.com/2775
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Tue, 9 Aug 2011 10:18:56 +0000 (12:18 +0200)]
QmlJS: Make the astPath available.
Change-Id: Ice51730ee118723dbd755467dd221eb9940775fd
Reviewed-on: http://codereview.qt.nokia.com/2774
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Friedemann Kleint [Wed, 10 Aug 2011 07:38:40 +0000 (09:38 +0200)]
Build qtcbuildhelper with MinGW.
Change-Id: I0c6898bd6672c9d3a05c636d9712d9b75a9b6f3b
Reviewed-on: http://codereview.qt.nokia.com/2815
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kamm [Wed, 10 Aug 2011 07:00:40 +0000 (09:00 +0200)]
QmlJS: Move 'file not found' error message from Bind to Link.
Change-Id: I701fc179f377581b87e31630eaa4231688152f5e
Reviewed-on: http://codereview.qt.nokia.com/2813
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kandeler [Wed, 10 Aug 2011 07:04:23 +0000 (09:04 +0200)]
RemoteLinux: Get rid of non-standard mkdir option.
Busybox implementations, for example, don't necessarily have -v.
Change-Id: Icf9ed8e8826ef53073d62d2900d2f72d0bf2fe83
Reviewed-on: http://codereview.qt.nokia.com/2812
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Wed, 10 Aug 2011 07:02:05 +0000 (09:02 +0200)]
RemoteLinux: Don't do timestamp checks for file-by-file deployment.
Rationale: If the device has been re-flashed, for example,
the deployment information will be outdated and every single file
will have to be touched to force re-deployment, which is a hassle
for the user and not very obvious either.
Change-Id: I9c48096eb4bdde4b13212f55c9c9a1bc6f9445fd
Reviewed-on: http://codereview.qt.nokia.com/2811
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Tue, 9 Aug 2011 15:28:53 +0000 (17:28 +0200)]
RemoteLinux: Fix crash introduced by merge.
Change-Id: Iea18410bc812fb5c27442ae01c408113e6bceece
Reviewed-on: http://codereview.qt.nokia.com/2789
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Eike Ziller [Tue, 9 Aug 2011 09:08:01 +0000 (11:08 +0200)]
Highlight matches when opening editor from advanced text search.
When you close the search pane it will remove the highlight, even if the
find tool bar is open with a different search, though.
Task-number: QTCREATORBUG-2606
Change-Id: I7defe15c844d37ae80ab66c6b9e68e1ef1afdf92
Reviewed-on: http://codereview.qt.nokia.com/2786
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Tue, 9 Aug 2011 07:00:34 +0000 (09:00 +0200)]
Send missing visibilityChanged signals to output panes.
Change-Id: Ic2de484904c8be2f3110c7e083c3691a174a5781
Reviewed-on: http://codereview.qt.nokia.com/2785
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Friedemann Kleint [Tue, 9 Aug 2011 12:33:24 +0000 (14:33 +0200)]
Fix Valgrind test compilation.
Change-Id: I13dfc18d1b283af610edba4f40515aef01001d92
Reviewed-on: http://codereview.qt.nokia.com/2781
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Leandro Melo [Tue, 9 Aug 2011 11:46:28 +0000 (13:46 +0200)]
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>
Eike Ziller [Tue, 9 Aug 2011 11:51:37 +0000 (13:51 +0200)]
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>
Friedemann Kleint [Tue, 9 Aug 2011 11:43:56 +0000 (13:43 +0200)]
Yet another compile fix for MinGW/Windows.
Change-Id: Iea0d998de254d26e15a8703812b3aad8399721a8
Reviewed-on: http://codereview.qt.nokia.com/2777
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kai Koehne [Mon, 8 Aug 2011 14:26:12 +0000 (16:26 +0200)]
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>
Jarek Kobus [Fri, 5 Aug 2011 07:59:28 +0000 (09:59 +0200)]
Apply code style settings to templates
Task-number: QTCREATORBUG-169
Change-Id: I380c956d3256c186ff9497463ab845228017ff87
Reviewed-on: http://codereview.qt.nokia.com/2671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Tue, 9 Aug 2011 09:12:01 +0000 (11:12 +0200)]
Compile fix.
Change-Id: I6ce0d3d063cda97d55d102b8d6988934e5411846
Reviewed-on: http://codereview.qt.nokia.com/2771
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Tue, 9 Aug 2011 09:02:37 +0000 (11:02 +0200)]
Compile fix.
Change-Id: I046ae871ef482bf36ee21ba77abd706292a15d3f
Reviewed-on: http://codereview.qt.nokia.com/2768
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kamm [Tue, 9 Aug 2011 08:40:39 +0000 (10:40 +0200)]
QmlJS: Clean up ScopeAstPath visitor.
Change-Id: If983e9c9bee2d0396d7cc00973ee3885a3736d8a
Reviewed-on: http://codereview.qt.nokia.com/2767
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Friedemann Kleint [Tue, 9 Aug 2011 08:38:30 +0000 (10:38 +0200)]
Debugger: Fix MSVC detection.
Trigger AttachCore for MSVC flavours only.
Handle .dmp files on the command line.
Change-Id: I65be1ad7aef36db157a84499ff5e10d9f1e8fb97
Reviewed-on: http://codereview.qt.nokia.com/2766
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kamm [Mon, 8 Aug 2011 12:22:22 +0000 (14:22 +0200)]
QmlJS: Add XMLHttpRequest, DB API and JSON completion.
Change-Id: I30773e8879086c1f85d331fabf9380e217b32dd7
Reviewed-on: http://codereview.qt.nokia.com/2745
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Kai Koehne [Mon, 8 Aug 2011 12:53:10 +0000 (14:53 +0200)]
JSDebugger: Only hit breakpoints in user code
Check that the topmost stack entry is a user defined ScriptFunction.
This avoids hitting the anonymous functions used for bindings, e.g.
onClicked: Qt.quit()
leads to script code
(function onClicked() { Qt.quit(); })
which will be hit twice for the debugger: Once for the function call
itself, then for the execution of Qt.quit().
Change-Id: I4cb374782c93a26d97d4a717ce67d1fb2f6df438
Task-number: QTCREATORBUG-5090
Reviewed-on: http://codereview.qt.nokia.com/2746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Friedemann Kleint [Mon, 8 Aug 2011 13:22:46 +0000 (15:22 +0200)]
Compile.
Change-Id: I118bdfd3fb9843e7522cec304a0d7da879651b30
Reviewed-on: http://codereview.qt.nokia.com/2750
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Mon, 8 Aug 2011 13:06:14 +0000 (15:06 +0200)]
Compile.
Change-Id: I9e2f02bfa3dcc2e3ab2895620ee3f163edc3d764
Reviewed-on: http://codereview.qt.nokia.com/2749
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Mon, 8 Aug 2011 12:56:04 +0000 (14:56 +0200)]
Debugger[CDB]: Rework string formatting.
Use watch encoding without quotes for non-ASCII output.
Use formats with quotes for recoded strings.
Extend char-pointer recoding to work for char-arrays as well
and restrict to char types. Split up and re-use when
outputting QByteArrays or std::[w]string.
Task-number: QTCREATORBUG-5667
Change-Id: If9748c2e375ee5ecb05d257410eba4012de1c3cf
Reviewed-on: http://codereview.qt.nokia.com/2747
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Christian Kamm [Thu, 4 Aug 2011 08:54:12 +0000 (10:54 +0200)]
C++ completion: Minimize qualified names in function signatures.
Change-Id: I8e2c38e279952372b3e12f6ea8da18b75b39a5d4
Reviewed-on: http://codereview.qt.nokia.com/2733
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Thu, 28 Jul 2011 20:11:38 +0000 (22:11 +0200)]
C++ insert definition: Find better insertion point.
Change-Id: Ic424ae7ed4ac6dcda5d96353071ba0415c1815da
Reviewed-on: http://codereview.qt.nokia.com/2732
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Thu, 28 Jul 2011 19:17:28 +0000 (21:17 +0200)]
C++ insert definition: Use minimally qualified names.
Change-Id: I633dbc77557fc2b6563888103350612a262536ee
Reviewed-on: http://codereview.qt.nokia.com/2731
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Mon, 8 Aug 2011 10:47:49 +0000 (12:47 +0200)]
QmlJS: Remove Interpreter namespace.
The distinction between QmlJS and QmlJS::Interpreter has always been
weak and the extra namespace just added an unnecessary complication.
Change-Id: I4db8ef4bd91b5f6bf610a9d23fdbf55bd60250fc
Reviewed-on: http://codereview.qt.nokia.com/2743
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>