OSDN Git Service
axasia [Sat, 12 Nov 2011 15:07:53 +0000 (00:07 +0900)]
Update japanese translation for 2.4.[6211/6239]
axasia [Sat, 12 Nov 2011 07:02:06 +0000 (16:02 +0900)]
Merge branch '2.4' of git://gitorious.org/qt-creator/qt-creator into 2.4-jp
Daniel Teske [Fri, 11 Nov 2011 13:09:48 +0000 (14:09 +0100)]
Add known crash with 4.7.4 && g++ 4.6 to known issues
Change-Id: Ib84245e781673aa7850158479d70336ac4704edf
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sergey Belyashov [Mon, 31 Oct 2011 09:40:34 +0000 (13:40 +0400)]
Russian translation update
Change-Id: I9d3c9f79ccceee8e1627b6d79f1852a21373a483
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Victor Ostashevsky [Thu, 3 Nov 2011 15:26:20 +0000 (16:26 +0100)]
Ukrainian translation updated for 2.4
Change-Id: I40f2f94dd07e7b7b10950a0bc4e78227f35046ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Beaver Xu [Wed, 9 Nov 2011 02:30:00 +0000 (05:30 +0300)]
Update Chinese translaton for Qt Creator 2.4.
Change-Id: Iddc8e574ccc6a727816e8fd4e070c9280b5be73a
Reviewed-by: Viktor Ostashevskiy <ostash@ostash.kiev.ua>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Daniel Teske [Thu, 10 Nov 2011 13:32:41 +0000 (14:32 +0100)]
Disambiguate include guard define
Change-Id: Ie0eeb3fa2de93370f79cede93a3360224ce10ba9
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Leena Miettinen [Wed, 9 Nov 2011 15:38:17 +0000 (16:38 +0100)]
Doc: add known GCC issue
Change-Id: I4e200f2b54b3d4c7ea0843263fb3addcb98bad14
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 16:25:24 +0000 (17:25 +0100)]
make use of QMAKE_SUBSTITUTES less bizarre
qmake should work well enough for that now. we use the same construct in
app.pro, anyway.
Change-Id: Iabee60e9b898e92e003850e0a8c88673fa3ced6d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 16:44:31 +0000 (17:44 +0100)]
adjust fixnavi target to new source structure
Change-Id: I535ea5632492d1baeabe1a0a8be571d7fe9baba9
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 19:08:26 +0000 (20:08 +0100)]
don't get confused by conditionals outside page header
this adds some state variables, localizes some variables, adds some
assertions and reshuffles some code for clarity.
Change-Id: Idd061fe70e953d3659e7b2b80735d5ec757d5050
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 16:44:12 +0000 (17:44 +0100)]
support subdirs
Change-Id: Ia64e51c28993584e1f24ca8cd1458def242bb391
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 16:43:58 +0000 (17:43 +0100)]
document that multiple files are supported
Change-Id: I7f235e019a80fa5529ec8d0957cdc9090305f0d2
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 16:43:19 +0000 (17:43 +0100)]
use warnings instead of -w
Change-Id: Icce37bf88f36a2da64210cc07e96b8881afec3ab
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 Nov 2011 16:15:07 +0000 (17:15 +0100)]
remove double mention of $SRCDIR/src
Change-Id: I4627ba8d3be024ab982088fa58ad63c58d086280
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
axasia [Wed, 9 Nov 2011 16:17:50 +0000 (01:17 +0900)]
Merge branch '2.4' of git://gitorious.org/qt-creator/qt-creator into 2.4-jp
Felix Geyer [Wed, 9 Nov 2011 08:39:58 +0000 (09:39 +0100)]
Fix qreal is not double.
Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit
3b0f26e23136e60b61203c26075349f1e541f654)
hjk [Fri, 4 Nov 2011 16:21:13 +0000 (17:21 +0100)]
debugger: fix display of signal-slot connection
Change-Id: I0923bdd0ba1166639d85f8343a5abce8f2912400
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Robert Loehning [Tue, 8 Nov 2011 18:02:01 +0000 (19:02 +0100)]
Squish: No Symbian target on unix-like systems
The SDK does not provide Qt for Symbian on Linux and Mac so there's no
need to wait for such a target.
Change-Id: I6c48f21317a29f2bfdf7b1fa9d87890a7f74a4eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
axasia [Tue, 8 Nov 2011 18:19:43 +0000 (03:19 +0900)]
Update japanese translation for 2.4.[6030/6239]
axasia [Tue, 8 Nov 2011 17:49:48 +0000 (02:49 +0900)]
Merge branch '2.4' of git://gitorious.org/qt-creator/qt-creator into 2.4-jp
Leena Miettinen [Tue, 8 Nov 2011 15:55:05 +0000 (16:55 +0100)]
Doc: fix list formatting
Change-Id: Ia5b8d6f83df5dd5456a49319b3e292af0a094ca3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Tue, 8 Nov 2011 15:16:27 +0000 (16:16 +0100)]
Doc: advertise tips and tricks
Change-Id: Id0d89a840806ca5f66925652adb5d7346d23b354
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Eike Ziller [Tue, 8 Nov 2011 13:20:53 +0000 (14:20 +0100)]
Fix irritating shadow.
Task-number: QTCREATORBUG-6444
Change-Id: Ife3fd7f469be6d4d937d75d782c13e06eea9d0a7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Leandro Melo [Tue, 8 Nov 2011 13:26:05 +0000 (14:26 +0100)]
C++: Fix navigation for macros
Task-number: QTCREATORBUG-6399
Change-Id: Ic259d6cfed10e650d2eb7e07bdfacbc9038e51d0
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Robert Loehning [Tue, 8 Nov 2011 12:20:24 +0000 (13:20 +0100)]
Squish: Added function ensureChecked
Change-Id: Icca18645613d0b88e4394aa5fc3820626a59e647
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
hjk [Fri, 4 Nov 2011 16:59:05 +0000 (17:59 +0100)]
debugger: save history of log input pane
Task-number: QTCREATORBUG-6474
Change-Id: Ie57f7a6d8f2dce9f09f2b2f5140071289d9c4518
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Tue, 8 Nov 2011 11:04:55 +0000 (12:04 +0100)]
DebuggingHelper: Check for empty list of qt apis
Change-Id: I86b0ead03821c97731bcd268613938c4a5373615
Reviewed-by: hjk <qthjk@ovi.com>
Alessandro Portale [Mon, 7 Nov 2011 16:28:56 +0000 (17:28 +0100)]
Use QString::fromLatin1 instead of QString::fromAscii
There is no good reason to break the Qt coding style, here. The
strings "%1/../Resources/%2" and "%1/../%2" are Latin1 aswell
as Ascii.
Change-Id: Idbf3b7650fd650f93293496839fec4d21626cd0b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Robert Loehning [Mon, 7 Nov 2011 20:35:30 +0000 (21:35 +0100)]
Squish: Some more reuse of code
Change-Id: I3d4e7c0b9d8afc31fb5cfa2bc7879ea999129158
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Jonathan Liu [Mon, 7 Nov 2011 09:49:48 +0000 (20:49 +1100)]
SVN: Fix Subversion 1.6 and earlier support after refactoring
After refactoring in
fa2c24d92b23b23d0548c4cdcd653d7adc6326cc,
Subversion 1.6 and earlier working copies are not detected properly
which results in the Subversion menu missing. This fixes the
detection by correcting a typo in the last return statement.
Change-Id: I64334a3f46e94b2b36e8a83b1833cf899fdb58c6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Robert Loehning [Mon, 7 Nov 2011 18:36:48 +0000 (19:36 +0100)]
debugger: Make simple.pro compile with MSVC and USE_AUTOBREAK == 1
Change-Id: I1e25ede989a608d941e5f26f4470e397a895b3da
Reviewed-by: hjk <qthjk@ovi.com>
axasia [Mon, 7 Nov 2011 14:58:37 +0000 (23:58 +0900)]
Merge branch '2.4' of git://gitorious.org/qt-creator/qt-creator into 2.4-jp
Leena Miettinen [Mon, 7 Nov 2011 13:55:22 +0000 (14:55 +0100)]
Doc: add missing step
Task-number: QTSDK-1053
Change-Id: I5d0924e51075116f8a77779372b7e93371af0b71
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kamm [Thu, 3 Nov 2011 09:12:16 +0000 (10:12 +0100)]
QmlJS: Fixed attached objects.
Task-number: QTCREATORBUG-6450
Change-Id: Idd8e2ec3550190a137dbf0fe452c8488fb3fe1ad
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Leandro Melo [Mon, 7 Nov 2011 13:10:02 +0000 (14:10 +0100)]
C++: Fix crash in type hierarchy when anonymous in typedefs
Task-number: QTCREATORBUG-6445
Change-Id: If62745b58cad330c1f6a8605a444ec13644a1f20
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Robert Loehning [Mon, 7 Nov 2011 13:34:43 +0000 (14:34 +0100)]
Test of infrastructure
This change has already been done. The aim of this commit is to see how
Gerrit will handle the situation.
Task-Number: QTQAINFRA-312
Change-Id: I8a13e612a6e7e2f8ab5daf9b6ecd3ef4bd9e54db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Daniel Teske [Mon, 7 Nov 2011 13:09:16 +0000 (14:09 +0100)]
Make links clickable in Nokia Store wizard
Task-Number: QTCREATORBUG-6469
Change-Id: Iff7bd0c153bae4d278736548e1487363ae364f0f
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Joerg Bornemann [Mon, 7 Nov 2011 11:36:52 +0000 (12:36 +0100)]
process_ctrl_c_stub: forward exit code of the child process
If the child process cannot be started, return -1.
Task-number: QTCREATORBUG-6458
Change-Id: I0392d883773f3037ac29dccc4d4a3c330efde838
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Mon, 7 Nov 2011 11:56:09 +0000 (12:56 +0100)]
use correct codec for stderr
Change-Id: I15d8774f14e711bf3673cc9e5118d1b3d155b9b2
Reviewed-by: hjk <qthjk@ovi.com>
Jarek Kobus [Mon, 7 Nov 2011 12:02:13 +0000 (13:02 +0100)]
Apply changes of global tab settings to editors
Return global tab settings in case there are no
code style settings for passed languageId
Task-number: QTCREATORBUG-6429
Change-Id: Ieccd265fa03bfba0832d285a6443633dd27ba03a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
wongk [Thu, 3 Nov 2011 17:14:39 +0000 (13:14 -0400)]
Allow user to click on arrows on the function hint proposal.
Also added the ability to use the mouse wheel to scroll through the
overloads.
Task-Number: QTCREATORBUG-5540
Change-Id: I8854bdcdf0b1456afdbc7ea2e27cd3ff7b7fcf41
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
hjk [Fri, 4 Nov 2011 16:38:39 +0000 (17:38 +0100)]
debugger: Use Latin1 as default for char *.
Change-Id: I5a5f76d312f97c6684542fd3e31f68f78d6acf58
Reviewed-by: Bill King <bill.king@nokia.com>
axasia [Sat, 5 Nov 2011 01:50:10 +0000 (10:50 +0900)]
Merge branch '2.4' of git://gitorious.org/qt-creator/qt-creator into 2.4-jp
Alessandro Portale [Fri, 4 Nov 2011 17:52:11 +0000 (18:52 +0100)]
QtQuick/Html apps: Fix some non-shadowbuild cases
If the .target of a .source/.target tuple is empty, we get a "//"
in the path. Let's replace it with a "/" before string-comparing
it to another path.
If the .target is just a "." like in the HTML template code, we get
to replace a "/./" with a "/".
Change-Id: I5b6fef93c3efd5a21f9461b6e85c76f13bfb75e1
Task-Id: QTBUG-21060
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
wongk [Thu, 3 Nov 2011 16:05:15 +0000 (12:05 -0400)]
Don't add superfluous newlines to qmake project files.
Task-Number: QTCREATORBUG-5635
Change-Id: If12d6028b41b962e29d4aff38af3ea7ebd0eae41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leena Miettinen [Thu, 3 Nov 2011 14:29:44 +0000 (15:29 +0100)]
Doc: fix shortcuts for modes
Change-Id: I9af5a84aa970c36fa7d6d95cd072bba5b5462faa
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Friedemann Kleint [Fri, 4 Nov 2011 14:49:56 +0000 (15:49 +0100)]
L10n: German translation for 2.4.
Change-Id: Ief7066b0903c6d372bcbaeccf84d2d3e55337891
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Thu, 3 Nov 2011 14:18:49 +0000 (15:18 +0100)]
Remove one messagebox when removing a buildconfiguration
Since the user is asked twice atm.
Change-Id: I07221c47ab96bd9881d611cc2070ef43333cd2a0
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Friedemann Kleint [Fri, 4 Nov 2011 11:06:22 +0000 (12:06 +0100)]
Fix warnings about slot.
Introduced by
46e912ad24f472178563deedb97840d11d78c6b0.
Change-Id: I0c037c52fe4d39df1306df19bbe7686415ee959a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Wed, 2 Nov 2011 17:11:58 +0000 (18:11 +0100)]
welcome: remove unused RatingBar, ExampleLineEdit and TagBrowser
Change-Id: Ia254ca5147f9d1976f3e19311a1aa31c2b151d00
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
wongk [Thu, 3 Nov 2011 21:33:11 +0000 (17:33 -0400)]
Fix painting issue on the Issues pane.
Task-Number: QTCREATORBUG-6415
Change-Id: Iad5041dc387b8a9bea2068a8242a6968446aa37a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Thu, 3 Nov 2011 18:19:10 +0000 (19:19 +0100)]
debugger: workaround for sourceware.org/bugzilla/show_bug.cgi?id=13380
Task-number: QTCREATORBUG-6465
Change-Id: I98894cbd247b53e18b86ec997b9087d1f2d511f3
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit
dbc84d8c1c56a35ef5220e32b4e27880d141901f)
Robert Loehning [Thu, 3 Nov 2011 20:10:01 +0000 (21:10 +0100)]
Minor usability fix
In Contents, Index and Search this menu reads "...as New Page" so I
adjusted it.
Change-Id: I4e2f5ebfae56e51da38b5b97c7776270359da18a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Robert Loehning [Thu, 3 Nov 2011 19:43:38 +0000 (20:43 +0100)]
Typo fixes
Change-Id: Id73f96267e34e7c85ee74dd8264c6c350e095ce9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Alessandro Portale [Thu, 3 Nov 2011 18:50:20 +0000 (19:50 +0100)]
App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0
Bumping the minimum required Qt version from 4.7.3 to 4.7.4,
accordingly.
Change-Id: I1f88278552c83ff18f9a710eb1f08b74f43688b8
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Robert Loehning [Thu, 3 Nov 2011 18:24:15 +0000 (19:24 +0100)]
Minor string fix
Browse button opens a dialog so it should have the dots...
Change-Id: Ic58134b61e0543b7cb1981029d8faa0366123727
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Thu, 3 Nov 2011 17:54:11 +0000 (18:54 +0100)]
Search: Uniform shotcut for File pattern
Change-Id: Id87876faf0465a912bc7078240b77adddcb5866c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Thu, 3 Nov 2011 15:42:46 +0000 (16:42 +0100)]
Further string fixes
Change-Id: I08661ec25eb898ff1344c82ca6fdc2465f8e3460
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Eike Ziller [Thu, 3 Nov 2011 16:29:19 +0000 (17:29 +0100)]
Remove dead plugins
Change-Id: Id298e9d6af8f5cbc35f0f57e612690d9a43cea2f
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Robert Loehning [Thu, 3 Nov 2011 14:30:39 +0000 (15:30 +0100)]
Removed pointless and outdated tooltips
Change-Id: Id1da037402022bb65629f9e7610b05e57d971a11
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Thu, 3 Nov 2011 13:17:25 +0000 (14:17 +0100)]
String fixes in New Project wizard
Task-number: QTCREATORBUG-6456
Change-Id: I37cf5c8f8a91d015e6aada803ab7158a77c33e40
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Daniel Teske [Thu, 3 Nov 2011 14:08:59 +0000 (15:08 +0100)]
Appoutputpane sender() can't be used in a queued connection
The bug was introduced in
97b4bcfa6c98a0a3a4dcc6dc6315513f27b7a976
Change-Id: Iec364a40ff748cd8f94f65e8fd22d4d71a5de5f4
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 3 Nov 2011 12:51:38 +0000 (13:51 +0100)]
welcomescreen: remove bottom gradient in develop.qml
Change-Id: Ia22e503a750c5475466579a3101ebc2adb13416d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Teske [Thu, 3 Nov 2011 13:13:23 +0000 (14:13 +0100)]
Project::removeTarget add missing return tru
Change-Id: Ifcf42827596fed48c9bf4c5f25910a586ebc18ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Stenger [Thu, 3 Nov 2011 12:32:02 +0000 (13:32 +0100)]
Squish: Remove non-default Qt versions
Change-Id: Ic56fb8f27b92872cac2e24721ecd74253ad25fdd
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
wongk [Wed, 2 Nov 2011 16:44:31 +0000 (12:44 -0400)]
If user cancels save file prompt, cancel entire action.
Task-Number: QTCREATORBUG-6440
Change-Id: I8807de53b1a05a0abd57c140dab5ba8df441efd5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Thu, 3 Nov 2011 09:17:05 +0000 (10:17 +0100)]
qmldump: Add a flush to fix output redirection problems on windows.
Task-number: QTCREATORBUG-5825
Change-Id: Ib086e8ed213738516015334736b1a2badb202993
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Aurindam Jana [Thu, 20 Oct 2011 15:34:45 +0000 (17:34 +0200)]
BreakDialog: BreakpointAtJavaScriptThrow
Show only the Enabled field for BreakpointAtJavaScriptThrow type.
Change-Id: Ib4908b4a7826329a98105112c612963624586115
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Wed, 2 Nov 2011 16:40:32 +0000 (17:40 +0100)]
String fixes
Change-Id: Iffa87a0e394b799e3987fa60f0a7559d5c1d0d27
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 2 Nov 2011 14:59:12 +0000 (15:59 +0100)]
all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Wed, 2 Nov 2011 11:48:33 +0000 (12:48 +0100)]
Avoid huge minimum size of search result panel.
The minimum size was to fully fit in the search term label, which could
get very long in case of long namespace + method names (or just long
text search terms). Also guarantee usability of the replace line edit.
Change-Id: I8664e20739ceb06251ffedf426cccdc4bacacedc
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Leena Miettinen [Wed, 2 Nov 2011 15:27:13 +0000 (16:27 +0100)]
Doc: changes in the Welcome mode
Change-Id: Ia7168e0f7065c4895e461429b9d2e6af967eb808
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Eike Ziller [Wed, 2 Nov 2011 09:07:13 +0000 (10:07 +0100)]
Version update in the readme
Change-Id: I583c0ce503bf5db76c92362921352a6f388fa2c1
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
axasia [Wed, 2 Nov 2011 17:23:01 +0000 (02:23 +0900)]
Merge branch '2.4' of git://gitorious.org/qt-creator/qt-creator into 2.4-jp
Daniel Teske [Tue, 1 Nov 2011 20:43:54 +0000 (21:43 +0100)]
Make sysrootify case-insensitive on windows
Task-Number: QTCREATORBUG-6419
Change-Id: If3ab035ee3a117744213d5e3db3ffa41f7283d53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thomas Hartmann [Wed, 2 Nov 2011 12:54:18 +0000 (13:54 +0100)]
WelcomePage: layout fix
Fixes a regression introduced in
44928237af12ec16eeb13b5eb86c6da2c483a6c1
Task-number: QTCREATORBUG-6444
Change-Id: Ie92ba0be9e888e065aaa52aac41bf3338bf8aeb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Wed, 2 Nov 2011 10:17:03 +0000 (11:17 +0100)]
Doc: edit for grammar and style
Change-Id: I238b1f2707038beb4ea717308a8dc079db1ff8d2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 2 Nov 2011 11:42:48 +0000 (12:42 +0100)]
projectexplorer: More consistent '...'
Used for buttons that open additional dialogs, but not comboboxes.
Change-Id: I9b40eac236f18b4c0b2e358ddeccb953024e8d50
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Peter Kuemmel [Sun, 30 Oct 2011 10:31:51 +0000 (11:31 +0100)]
VCS base diff editor with merge conflicts
'git diff' marks merge conflicts different to changes.
With this fix it is possible to jump to the merge conflicts
also by a double click.
Task-number: QTCREATORBUG-6424
Change-Id: I355274e1ded4a05b3c7db718cbe9f48453070f82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Stenger [Tue, 1 Nov 2011 14:58:45 +0000 (15:58 +0100)]
Squish: Small refactoring - renamed helper
Change-Id: I3ca9261043f568a9e160546998dd7b2cd5aa0dd4
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
hjk [Wed, 2 Nov 2011 07:52:27 +0000 (08:52 +0100)]
debgugger: fix crash when opening memory editor through register values
Task-number: QTCREATORBUG-6430
Change-Id: I92edba9e4564bbdff6babc548d49e9ba36bc3b77
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
hjk [Mon, 31 Oct 2011 16:36:08 +0000 (17:36 +0100)]
debugger: cleaner debugger aborting
Make the second "Abort Debugger" kill the gdb process directly
instead of relying on further communication.
Also fix some "unexpected" (but harmless) state transitions.
Change-Id: I0938ec76420fbd77ec4b7348819dd7f63763547f
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Mon, 31 Oct 2011 16:35:24 +0000 (17:35 +0100)]
debugger: don't store empty watched expressions
Change-Id: I3aa6ae756557c86caed7860bd0ffb26dced35bdc
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Tue, 1 Nov 2011 16:04:34 +0000 (17:04 +0100)]
Squish: Avoid blocking in tst_build_speedcrunch
Change-Id: I468d57012df690c5e8120e1e5ec51ad7af224829
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Leena Miettinen [Tue, 1 Nov 2011 14:25:46 +0000 (15:25 +0100)]
Doc: help browser does not allow file download
Task-number: QTCREATORBUG-6339
Change-Id: I28e32df3ef5ae0846349baa140c12230f9e8451d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Robert Loehning [Tue, 1 Nov 2011 12:56:37 +0000 (13:56 +0100)]
Squish: Added function which selects template for new project
Change-Id: I7858e60c21641e39f6a5c23a12e3fd78a9d17334
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Christian Stenger [Tue, 1 Nov 2011 09:38:52 +0000 (10:38 +0100)]
Squish: Fix test for Linux/Mac
Because of a different naming of the Qt versions on Linux/Mac
this test always runs without starting a build on these OS's.
Change-Id: I93d89576ee6f56d7de9aee70aa79ea58a4239c5f
Reviewed-by: Bill King <bill.king@nokia.com>
Robert Loehning [Tue, 1 Nov 2011 12:47:26 +0000 (13:47 +0100)]
Squish: Avoid timing issues when using Locator
Change-Id: If768a758f3887607c9ef46939dc22685cf54fb45
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Leena Miettinen [Tue, 1 Nov 2011 12:27:03 +0000 (13:27 +0100)]
Doc: update example to use Qt Mobility API 1.2
Task-number: QTCREATORBUG-6270
Change-Id: I2c65d7ec2df856ed0145468be1497b7dc5ac76a1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Eike Ziller [Tue, 1 Nov 2011 10:46:22 +0000 (11:46 +0100)]
Set text editor font also for new search panels.
Task-number: QTCREATORBUG-6432
Change-Id: I67b6a92faccc65f92cc612abf210c0a2eca4860b
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Kai Koehne [Tue, 1 Nov 2011 09:44:39 +0000 (10:44 +0100)]
QmlProfiler: Make sure standalone tool is shipped on Mac OS X
Change-Id: Icbe52a5198b670fb7a0bbe2ddb12fc0bbdb2dd17
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Tue, 1 Nov 2011 09:28:19 +0000 (10:28 +0100)]
fakevim: fix replacement of '\&'
Task-number: QTCREATORBUG-6434
Change-Id: Ic6ec34288733c4aa46cee353acf3920f3b4cf9ce
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Mon, 31 Oct 2011 13:27:15 +0000 (14:27 +0100)]
Doc: rename Symbian^3 and Symbian^1 as Symbian Anna and S60 5th Edition
Reflect changes in targets installed with the Qt SDK 1.1.4.
Add information about advanced development with Symbian SDK.
Task-number: QTCREATORBUG-6051
Change-Id: I28715cbb11a8088630ce4de5d0756ede2ca1d96e
Reviewed-by: Tim Kelly
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Robert Loehning [Fri, 28 Oct 2011 19:42:12 +0000 (21:42 +0200)]
Squish: Added function handling name and location of new projects
Change-Id: I23af07bb41b517af1ad9f65c642c3eedd0712093
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Eike Ziller [Mon, 31 Oct 2011 14:58:21 +0000 (15:58 +0100)]
Fix showing of "Debugging Helper Missing" warning.
It was only showing up if one had a helper library that was outdated.
Change-Id: I8d0ffcd16434dc6cfeadd408a2bdb59aa3ec73ba
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Mon, 31 Oct 2011 10:09:15 +0000 (11:09 +0100)]
QmlDesigner.documentController: bugfix for crumblebar
This fixes a crash bug.
Change-Id: Ibfe5c30910fed8b5e3132a05bc6a2eec39d4d308
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Orgad Shaneh [Sun, 30 Oct 2011 13:47:16 +0000 (15:47 +0200)]
BuildManager: Display times for build messages
Task-number: QTCREATORBUG-6426
Change-Id: I253b005c1e0af093342a5b8315086c007138b764
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leandro Melo [Mon, 31 Oct 2011 12:37:23 +0000 (13:37 +0100)]
Editor: Support floating point values for tab stop
Task-number: QTCREATORBUG-833
Change-Id: I76a4b69d6e9402f045a98712531475aff5e8d0ac
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Mon, 31 Oct 2011 12:30:05 +0000 (13:30 +0100)]
Doc: update screenshots and make text clearer
Task-number: QTCREATORBUG-6154
Change-Id: I90afe4693d34ff3061c214673b0e3a04b548e528
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
OSDN Git Service
