Commit Graph

21421 Commits

Author SHA1 Message Date
Eike Ziller 4dcd4e5796 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>
2011-11-03 08:05:40 +01:00
Leena Miettinen a1cf3a264d Doc: changes in the Welcome mode
Change-Id: Ia7168e0f7065c4895e461429b9d2e6af967eb808
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-11-02 22:47:23 +01:00
Eike Ziller fa1347bc25 Version update in the readme
Change-Id: I583c0ce503bf5db76c92362921352a6f388fa2c1
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-11-02 22:46:44 +01:00
Daniel Teske e7c6b9dbbb Make sysrootify case-insensitive on windows
Task-Number: QTCREATORBUG-6419

Change-Id: If3ab035ee3a117744213d5e3db3ffa41f7283d53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-02 18:10:37 +01:00
Thomas Hartmann 0c3f3c009a WelcomePage: layout fix
Fixes a regression introduced in
44928237af

Task-number: QTCREATORBUG-6444
Change-Id: Ie92ba0be9e888e065aaa52aac41bf3338bf8aeb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-02 17:08:03 +01:00
Leena Miettinen a1e192975b Doc: edit for grammar and style
Change-Id: I238b1f2707038beb4ea717308a8dc079db1ff8d2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-02 12:53:14 +01:00
hjk 2cbcf263cf projectexplorer: More consistent '...'
Used for buttons that open additional dialogs, but not comboboxes.

Change-Id: I9b40eac236f18b4c0b2e358ddeccb953024e8d50
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-02 12:50:14 +01:00
Peter Kuemmel 26d0c7290f 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>
2011-11-02 10:12:51 +01:00
Christian Stenger 3c350c93d8 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>
2011-11-02 09:41:53 +01:00
hjk 239e7739d3 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>
2011-11-02 08:56:12 +01:00
hjk 755f5fc327 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>
2011-11-02 08:29:48 +01:00
hjk 384a8ed1cf debugger: don't store empty watched expressions
Change-Id: I3aa6ae756557c86caed7860bd0ffb26dced35bdc
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 08:29:10 +01:00
Robert Loehning 8e508f3a5c Squish: Avoid blocking in tst_build_speedcrunch
Change-Id: I468d57012df690c5e8120e1e5ec51ad7af224829
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-11-01 17:46:20 +01:00
Leena Miettinen 002820867c Doc: help browser does not allow file download
Task-number: QTCREATORBUG-6339
Change-Id: I28e32df3ef5ae0846349baa140c12230f9e8451d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2011-11-01 15:42:13 +01:00
Robert Loehning edad3217e6 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>
2011-11-01 14:48:55 +01:00
Christian Stenger 702b3f17ab 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>
2011-11-01 13:57:35 +01:00
Robert Loehning 8cf0d1c608 Squish: Avoid timing issues when using Locator
Change-Id: If768a758f3887607c9ef46939dc22685cf54fb45
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-11-01 13:56:22 +01:00
Leena Miettinen 37720c4008 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>
2011-11-01 13:49:11 +01:00
Eike Ziller 1d97b604c0 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>
2011-11-01 12:37:58 +01:00
Kai Koehne a0cf8d2bd9 QmlProfiler: Make sure standalone tool is shipped on Mac OS X
Change-Id: Icbe52a5198b670fb7a0bbe2ddb12fc0bbdb2dd17
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-01 10:48:43 +01:00
hjk f73dc6f444 fakevim: fix replacement of '\&'
Task-number: QTCREATORBUG-6434
Change-Id: Ic6ec34288733c4aa46cee353acf3920f3b4cf9ce
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-01 10:44:16 +01:00
Leena Miettinen 85f2571c35 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>
2011-11-01 10:29:33 +01:00
Robert Loehning 08115952ea 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>
2011-10-31 17:58:06 +01:00
Eike Ziller 3cb6c23334 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>
2011-10-31 16:03:15 +01:00
Thomas Hartmann 91b7984422 QmlDesigner.documentController: bugfix for crumblebar
This fixes a crash bug.

Change-Id: Ibfe5c30910fed8b5e3132a05bc6a2eec39d4d308
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-10-31 15:37:24 +01:00
Orgad Shaneh 6fb602061e BuildManager: Display times for build messages
Task-number: QTCREATORBUG-6426
Change-Id: I253b005c1e0af093342a5b8315086c007138b764
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-31 15:29:18 +01:00
Leandro Melo 24fc61857c Editor: Support floating point values for tab stop
Task-number: QTCREATORBUG-833

Change-Id: I76a4b69d6e9402f045a98712531475aff5e8d0ac
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-31 14:57:04 +01:00
Leena Miettinen 19ea22a2ac Doc: update screenshots and make text clearer
Task-number: QTCREATORBUG-6154
Change-Id: I90afe4693d34ff3061c214673b0e3a04b548e528
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-31 14:12:37 +01:00
Christian Kamm 0021c4c3ee C++ insert def: Fix bug when minimizing name.
Constructors would not get the correct name before. Now rewriting the
function's name is not done by going through the 'rewrite type' func-
tionality but rather by minimizing the symbol's name directly.

Task-number: QTCREATORBUG-6223
Change-Id: I3c25e414337937f5dd0f54570c899ca2ca21d2ef
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-31 14:00:27 +01:00
Daniel Teske e202e4b8e0 Fix various crashes
Task-Number: QTCREATORBUG-6365

Change-Id: I19a200e3c811eef83d591f6eacca3e48eb0fba8f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-31 12:49:06 +01:00
Tobias Hunger 2fb8e13529 Qt: Pick tool chain that works with the default mkspec
Pick a tool chain that suggests the same mkspec as the Qt version
was build with if possible.

This should help with the case of us choosing the wrong tool chain
on mac.

Change-Id: I206658fd36f2f3c2223392a2c69cf264b5b6a54e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-31 12:26:22 +01:00
Tobias Hunger a9103d92fe GCC: Autodetect old GCC versions needed for macx-g++XY mkspecs
Change-Id: If35b1ef2c0eba424cbdf70e0405243c14d413bab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-31 12:26:02 +01:00
Leena Miettinen adec0ae5bb Doc: sharing project settings
Change-Id: Ibd1b35244346a9c868fe0a2b011085c234a6c4e1
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-31 11:54:55 +01:00
Christian Kamm 5cd2123862 C++: Fix findMatchingDeclaration for functions not in a class.
That fixes navigation and the 'function signature update' quickfix for
global functions and functions in namespaces.

Task-number: QTCREATORBUG-6413
Change-Id: Ifc68a88a34eb363f4e84c72e9f72444d22df1086
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-31 11:52:07 +01:00
Christian Kamm 4521be25cd QmlJS: Avoid an infinite loop if a qmltypes file has a cycle.
The qmltypes files shipped with libraries shouldn't, but could define
components that form a prototype cycle. Use of the new
QmlObjectValue::prototypes() function avoids the code model getting
stuck in an infinite loop for these cases.

For plain ObjectValues this is already solved by using
PrototypeIterator.

Change-Id: I0f562672ab99b454bc3a0121c7a1b9eca43476bb
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-10-31 09:37:46 +01:00
Christian Kamm a9553c494e QmlJS indenter: Never touch indent of multi-line strings.
Task-number: QTCREATORBUG-6368
Change-Id: Iae68427e429e625214bc0729aaaf313dc3371570
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-10-31 09:37:17 +01:00
Eike Ziller f3774d0a6f Limit the length of shown search result line.
This e.g. avoids "lines" of several MB if file search hits a binary
file.

Task-number: QTCREATORBUG-6116
Change-Id: Ibf89a332bc82ddbdb2aeb83c4b3886e784dab4b8
Reviewed-by: Ralf Neubersch <neubersch@neubersch.de>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2011-10-31 08:38:06 +01:00
Eike Ziller c4f6ad856d Remove unnecessary code.
Change-Id: I07a382696c57f5451645e854e55aa30e9e81326c
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-10-31 08:37:35 +01:00
Jarek Kobus 082243fd96 Fix memory leaks (lacking destructors for uis)
Change-Id: I07c2708d727d59286b0d625a4c0c318f18b03b93
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-28 17:49:33 +02:00
Jarek Kobus c9ea9ad58b Code style selector improvements
Change layout in code style selector.
Make it possible to see the values
of built-in code style without a need to copy it.
Built-in code style can be also modified after
being copied inside code style editor.

Task-number: QTCREATORBUG-6341
Change-Id: Ifcbf807d5730ccf9026e86572710d0cc0ccf9f1a
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-10-28 15:49:21 +02:00
Bill King 69e02f4fb8 Squish: Fix timing issue on linux (too fast to catch).
Change-Id: Ia52abf2de8ef35269c11c198351e5024eae01830
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-10-28 15:24:10 +02:00
Leena Miettinen ecfef3c2e1 Doc: fix security issue in HTML template
Change-Id: I2fbcb030195a9104eeba8b83037623103efdb5c0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2011-10-28 13:16:57 +02:00
hjk 49e56cdd2c debugger: re-enable sorting of source files, modules, and thread views
Change-Id: I5610be7e78593d345c1f79fff6b2a61b105f8fbc
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-28 11:04:27 +02:00
Christian Kandeler fb6d940485 Harmattan: Use "mad" wrapper to call dh_clean.
Change-Id: Iddfc6de1e34ce08bbc5fe6601195b3206b120c27
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-28 10:44:49 +02:00
Daniel Molkentin d6fa81cd95 Do not try to evaluate examples or demos for Qt 5.
There is no good plan on how to expose examples and demos
of Qt 5 other than using XML manifests. Thus, it's best
to disable the fallback mechanism, as it can only break
(see e.g. QTCREATORBUG-5472).

Change-Id: I4cc1fa875297c3d368ae261f5404fa61301f172f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-28 10:25:52 +02:00
Pawel Polanski 5dcf7d2ef0 CODA: Increased timeout for Deploy step
The 2s work perfectly for most cases.
However, while deploying via WLAN sometimes
due to weak signal the 2s is not enough

Change-Id: If3a8bfbf6c4a244e589c1620a5c953486a0524d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-28 08:48:37 +02:00
Friedemann Kleint 77070354f2 QMutableMapIterator uses map in destructor, use foreach.
Change-Id: Ie8737acaea614fdda66cb7642eaed21be41cae64
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-28 08:25:31 +02:00
Daniel Teske b4a2612eb9 Fix leak
Change-Id: I5d7b0faf4c0331eb88f75a2f778eaa71ca8fa10a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-27 17:53:06 +02:00
Daniel Teske 5d91afda34 Fix bug with unclean paths with multiple .pro files in the same dir
Task-number: QTCREATORBUG-6414

Change-Id: Idb9277e951270688766b1e569c7ae0f962b2e4c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-27 15:23:35 +02:00
Daniel Molkentin dc6f30fd4b Don't show fallback examples if we do not have any installed.
Change-Id: I296888ce0c98a38afc4b21554942aa579a56c95a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-27 13:53:42 +02:00