feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joerg Bornemann
3a32f0bbac 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>
 2011-08-15 15:46:44 +02:00
Robert Loehning
6958fbbe68 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>
 2011-08-15 15:41:07 +02:00
Eike Ziller
d636140ea4 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>
 2011-08-15 15:23:24 +02:00
hjk
bd2aff72db debugger: update manual tests 
Change-Id: Ifed298d5257e02e3df1cde947419ab999be116af
Reviewed-on: http://codereview.qt.nokia.com/2971
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-15 15:13:12 +02:00
hjk
8dca664901 debugger: reduce namespace line noise 
Change-Id: I8e4cabd8bd4a4378590daf92a647ecbbe7d0a28b
Reviewed-on: http://codereview.qt.nokia.com/2970
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-15 15:13:03 +02:00
Tobias Hunger
bf4ca06c1e 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>
 2011-08-15 15:01:13 +02:00
Christian Kamm
077f503958 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>
 2011-08-15 13:16:02 +02:00
Christian Kamm
676036a1c8 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>
 2011-08-15 12:54:38 +02:00
Joerg Bornemann
6215df2bc9 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>
 2011-08-15 12:27:48 +02:00
Joerg Bornemann
26bc6c4d39 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>
 2011-08-15 12:25:38 +02:00
Kai Koehne
5c429665e4 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>
 2011-08-15 12:20:50 +02:00
Christian Kandeler
169be44125 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>
 2011-08-15 11:28:07 +02:00
Christian Kandeler
d0ba9a8613 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>
 2011-08-15 11:26:42 +02:00
Joerg Bornemann
6e93b47c33 QtcProcess: Windows compile fix 
Change-Id: I5f5882fe4ae2ab84c6e5668c560290b6b0cd30c7
Reviewed-on: http://codereview.qt.nokia.com/2942
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-08-15 11:13:49 +02:00
Kai Koehne
3261128a94 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>
 2011-08-15 11:09:37 +02:00
hjk
4274439d45 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>
 2011-08-15 11:02:45 +02:00
Oswald Buddenhagen
65317deaf9 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>
 2011-08-15 10:42:00 +02:00
Oswald Buddenhagen
9e20d6df04 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>
 2011-08-15 10:40:35 +02:00
Oswald Buddenhagen
72465c45e3 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>
 2011-08-15 10:37:54 +02:00
Leandro Melo
3945b9a70f 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
 2011-08-15 10:21:52 +02:00
Sergey Belyashov
916317a9fb Updated Russian translation 
Merge-request: 359
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Iea721437f2615acb8fec5dabca34b0922bf551ee
 2011-08-12 19:28:31 +02:00
Beaver Xu
64e52980b9 Update chinese translation for 2.3 
Merge-request: 360
Reviewed-by: ossi

Change-Id: Ia6e6303dabcda2bf3b7abc44fdfde2d359bb61a7
 2011-08-12 19:20:31 +02:00
axasia
e403f4d9f2 Update japanese translations for 2.3. 
Merge-request: 361
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I384b845fd586a90a7209fc22c8a1f7d2170feac5
 2011-08-12 17:27:11 +02:00
Robert Loehning
f50bea96a5 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>
 2011-08-12 15:44:34 +02:00
Friedemann Kleint
b705ff3dab 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>
 2011-08-12 13:45:42 +02:00
Friedemann Kleint
4d81efda31 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>
 2011-08-12 13:45:25 +02:00
Kai Koehne
7c5c6fc88e 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>
 2011-08-12 11:19:37 +02:00
Christian Kamm
e768fbf5d1 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>
 2011-08-12 08:28:36 +02:00
Kai Koehne
20703bff86 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>
 2011-08-11 13:18:44 +02:00
Kai Koehne
929d1aa042 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>
 2011-08-11 11:25:04 +02:00
Kai Koehne
a78347e102 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>
 2011-08-11 10:19:03 +02:00
Kai Koehne
52b7b58542 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>
 2011-08-11 10:18:49 +02:00
hjk
7620d81ef0 Revert "fakevim: also set foreground color for search matches" 
This reverts commit c1f225fd8f.

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>
 2011-08-11 10:07:57 +02:00
Friedemann Kleint
3c5604e267 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>
 2011-08-10 17:29:57 +02:00
Eike Ziller
99ba300ae3 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
 2011-08-10 16:03:57 +02:00
Christian Kamm
01bb7443fd 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>
 2011-08-10 14:37:17 +02:00
Robert Loehning
476338a6d2 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>
 2011-08-10 13:44:03 +02:00
Friedemann Kleint
88ffd77785 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>
 2011-08-10 12:24:08 +02:00
Friedemann Kleint
d78d7dbce3 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>
v2.3.0-rc 		2011-08-10 12:19:45 +02:00
Christian Kamm
ab3c256338 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>
 2011-08-10 11:56:16 +02:00
Christian Kamm
c879b9aeed QmlJS: Make the astPath available. 
Change-Id: Ice51730ee118723dbd755467dd221eb9940775fd
Reviewed-on: http://codereview.qt.nokia.com/2774
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-10 11:56:09 +02:00
Friedemann Kleint
e91a0f6737 Build qtcbuildhelper with MinGW. 
Change-Id: I0c6898bd6672c9d3a05c636d9712d9b75a9b6f3b
Reviewed-on: http://codereview.qt.nokia.com/2815
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-10 09:39:26 +02:00
Christian Kamm
a6ae570c31 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>
 2011-08-10 09:23:28 +02:00
Christian Kandeler
8f5436c4af 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>
 2011-08-10 09:06:41 +02:00
Christian Kandeler
7144194425 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>
 2011-08-10 09:06:08 +02:00
Christian Kandeler
32813776cc 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>
 2011-08-09 17:31:15 +02:00
Eike Ziller
b1c881ceaa 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>
 2011-08-09 15:44:31 +02:00
Eike Ziller
86e2b72486 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>
 2011-08-09 15:44:01 +02:00
Friedemann Kleint
3ba3f335e3 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>
 2011-08-09 14:38:01 +02:00
Leandro Melo
fb550c4ff1 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>
 2011-08-09 14:11:28 +02:00