Commit Graph

23295 Commits

Author SHA1 Message Date
Tobias Hunger
3a6aad8571 Fix some typos
Change-Id: I05bfe17c04fb5569d70a685a7a27ab287d0c4625
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 17:22:15 +01:00
Tobias Hunger
352a8f0528 Fix build time warning
Change-Id: I0aa1fa59512d7376f7884bd36840279c32413bc5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 17:17:00 +01:00
Friedemann Kleint
bec17d4b67 TcpPortsGatherer: Fix compilation with MinGW/4.6.
Change-Id: I28666ac73688e937dfe87996b723311a95464ba6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-03-12 16:46:40 +01:00
Francois Ferrand
4d1bbebf2a Git: Add customizable repository browser command.
Change-Id: Iac297e3665b18d97ca80097c4dd33dd70e64b9a1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 15:49:17 +01:00
Eike Ziller
2ba3f6c929 Merge remote-tracking branch 'origin/2.5' 2012-03-12 15:10:32 +01:00
Flex Ferrum
4ca6c51c7f C++: Lambda formatting issues.
Fix code formatting in cases when '{' and '}' appear within expression
context (ex. lambda expression, initializer lists).

Change-Id: I42b28170a8d6d5fd08a9a1a8d8e7698219c18966
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-12 14:38:26 +01:00
Robert Loehning
48b4abe877 debugger: Improved testInput
Change-Id: I3920bf0ee69a5abbdd0060ca309f6fd7e17b2e1b
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-12 14:20:33 +01:00
Thomas Hartmann
b8ad123b5b WeclomePage: unifying look of sessions and recent projects
This is a slight change to spacing and also adds the subtle hover effects
to recent projects.

Change-Id: I3dce69033e782c6f87ef1ef8b251d944bcf9be6e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-12 14:00:59 +01:00
Aurindam Jana
2cf515d8f2 QmlV8DebuggerClient: Change breakpoint line number
V8 Debugger does not support changing line numbers of active
brekpoints. Remove the existing breakpoint and add a new one.

Change-Id: I0e6302d6d911887890d674960cc241f89c4cdc96
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-12 14:00:37 +01:00
Eike Ziller
8624b3e19f Don't resolve symlinks in browser for qmake executable.
On Mac, the Qt packages install qmake to "/usr/bin/qmake-4.7" etc, and
put a symlink "qmake" in a browsable place. If the browser resolves
symlinks, we would need to accept all these different qmake naming variants
instead of just "qmake". Also, there is no reason for resolving the symlink,
in the worst case (like in this case) it just makes life harder.

Task-number: QTCREATORBUG-6222
Change-Id: I973a648ea2d1586075723efa6164f44d8fd3ecad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-12 11:36:24 +01:00
Daniel Teske
3a1ae4e1e4 Avoiding crash if can't find an valid tool chain
Change-Id: I5a1242ede5823d77b2c1f44cdb1b4911694f040e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 11:15:19 +01:00
hjk
4516c41ce3 taskhub: use more direct access.
Change-Id: Ibc4f37589f913ff9ea0025156979ddda73929e38
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 10:58:47 +01:00
Orgad Shaneh
a1f5cfc027 CPaster: Fix qbs
Change-Id: Ia2ac1d83e2dcf0e3051ce4cd4eb72cd039161e6b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 10:58:04 +01:00
Andreas Holzammer
97c8781f40 Dynamical get function GetTcp6Table
Windows XP does not support IPV6; if we
directly link against Iphlpapi.lib, Creator
fails to load. To bypass this issue, lookup
IPV6 function dynamically.

Change-Id: Idd49b977b924458cc8cd6fbe646f5c05e853060b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-12 10:50:24 +01:00
Jarek Kobus
58402cc7a9 Prohibit empty id in code style pool
Task-number: QTCREATORBUG-6966

Change-Id: Ia4ce2f1085d3e683cbe0fa6adb38b56d4b5acb15
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-03-12 10:37:37 +01:00
Eike Ziller
399e1212a6 Fix analyzer run config layout margins.
Change-Id: Ib96f13bcf72090acdcaafb5fb99636fa7543d076
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-12 10:02:59 +01:00
Eike Ziller
9f1d495cd2 Different take on fixing uncategorized external tools.
Avoid relying on isNull vs isEmpty by explicitly passing a bool
found output parameter.

Task-number: QTCREATORBUG-6961
Task-number: QTCREATORBUG-6960
Task-number: QTCREATORBUG-7026
Change-Id: I1e215867fd91d2cf37ad420967b18e56cb644442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-12 10:02:29 +01:00
Eike Ziller
658dc6f410 Revert "Fix adding external tools."
This patch breaks lots of other things,
it just gets insanely complicated for no gain whatsoever.
This reverts commit bdb5ecd1bc.

Change-Id: If38302c38ef42abd86e0b01021ded5162faf9e93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-12 10:02:09 +01:00
Eike Ziller
6bf2374af3 year bump
Change-Id: I81072f3a16db42417e598a07737351b28227042c
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-03-12 08:02:59 +01:00
Robert Loehning
79b0ff8186 Squish: Updated checking for created files
Done-with: Christian Stenger

Change-Id: I533ff2f41a5d6554d0f6a880d1ede093de2f9d6c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-03-09 17:42:46 +01:00
hjk
34ba6b632b debugger: suppress signal popups during auto tests
Task-number: QTCREATORBUG-6951
Change-Id: I35152a6f0422d4cbca356dab8b95033b166115fb
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 16:55:32 +01:00
Friedemann Kleint
2ef9f05146 Update German translation for Qt Creator 2.5 Alpha.
Change-Id: I0f3be4dccb1744b8cca738f4720c70317485957d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-09 16:44:37 +01:00
Daniel Teske
6f45ec97f8 Automatically configure examples opened from the welcome page.
Each example can now provide a list of platforms by the examples manifest
.xml file. This list can control the target configuration of the example
when it is opened in the welcomepage.

Change-Id: I893230fd2850b7a1272db71a7f589044d52041d1
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 15:28:28 +01:00
hjk
3311b294b3 debugger: use target-async/exec-interrupt for remote debugging
This seems to be the only way to make the setup work on Windows at all.

Change-Id: Ib70c8422dceea84ae5cc9e671de977de0887c80e
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 15:26:17 +01:00
Christian Kandeler
4415224f99 Devices: Display auto-detection info status in settings widget.
Change-Id: I7e9c00ae3f4e094f24e71c6bde3060027188ebeb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-03-09 15:25:50 +01:00
Robert Loehning
aa6571ba01 debugger: Added some vars to testFinal, so the debugger can show locals
Change-Id: I4b63bde13a9a74d50e654bcc167b7f19fec48919
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 14:48:42 +01:00
Daniel Teske
a5a4cffeb0 TaskModel: Remove redundant return
Change-Id: I74a5712f7ce7b7b2f05d6c98cd4bea2423705a5f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-09 14:33:45 +01:00
Alessandro Portale
735898b46b Wizards: Platform specific file sorting on Windows via Utils::FileName
Change-Id: I519f7271bfce57028282f4c6ca6ff3f1ea4671c0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-03-09 12:39:53 +01:00
Eike Ziller
87decf9f79 A bit beautification of "Save unchanged" dialog.
* focus set to the list instead of the button
* list shows file icons
* replace hack that tried to avoid resizing save button by real fix
* Mac: left-aligned "do not save" button
* Mac: alternating colors in list
* Mac: same sized "cancel" and "save" buttons

Task-number: QTCREATORBUG-1120
Change-Id: Ic6aca8fca105517c3aaddc451640def43e955b77
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
Reviewed-by: David Schulz <david.schulz@nokia.com>
2012-03-09 11:57:22 +01:00
Francois Ferrand
54801c5163 Open file when double-clicking in compile window
Track the tasks which are added, so that the generic parsers are
used for detecting file names.

Change-Id: Ie3bcf04c946fa45c99836dc4c29ca03ab5243fb2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-09 11:27:26 +01:00
Christian Kandeler
8877ae2793 cpaster: Fix qbs build.
Change-Id: I6808afa6a663649678137225a78d3481c0a80679
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-09 10:19:44 +01:00
hjk
502ddea099 fakevim: fix handling of the 'Enter' key on the number block
Change-Id: I8d05f9b6a890beb6ff67795e81619e8101127180
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 10:13:44 +01:00
hjk
f17184bcd2 debugger: make tooltips non-editable
Task-number: QTCREATORBUG-7028
Change-Id: I8b70435df8b958961204f8498f63b0752a6ad0bf
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 10:01:27 +01:00
Aurindam Jana
f7caba3923 QMLDebugging: Fix crash
Check for null pointers when parsing AST to relocate breakpoint

Change-Id: I484048d9e8a7aabdeffc4e18049c9b9b6f030366
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-03-09 09:59:58 +01:00
Daniel Teske
d2b967b781 Fix crash in updating linenumbers of Breakpoints
BreakHandler::updateMarker deletes and recreates the marker, so we need
to call the base class before.

Change-Id: Icc7587d0ab3dff280e99a84c9b4bea555c36a875
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 09:59:57 +01:00
Daniel Teske
8f4f601b67 BreakpointMarkes, simplfy icon updates
Change-Id: I0439d97196cc96b770c77ffc7ce474a76f3b2d94
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 09:58:48 +01:00
Leena Miettinen
41f4c1fab4 Doc: update the Qt Quick tutorial (built-in) elements
Update all screenshots.

Change-Id: Ib3f07b940f4121caa5ff567d070c448b81e2f124
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-09 09:57:33 +01:00
Francois Ferrand
1c1320c461 Gdb: Fix thread listing command used for older GDB.
Change-Id: I02219e496faa8918439467f72b196bf454b6bc8f
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-09 09:53:28 +01:00
Alessandro Portale
a9a50faa23 Project wizard summary page: Order the file list
Alphabetically, and files in sub-directories first

Change-Id: I65a29af7a952e8c3aa63cbac637c6a9395b9a846
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-03-09 09:17:03 +01:00
Oswald Buddenhagen
a5063e6ba4 Merge remote-tracking branch 'origin/2.5'
needed due to QA-related changes.

Change-Id: Ie29699fa9dc494dc3849175ccf9523377efcb1e9
2012-03-08 16:29:05 +01:00
Robert Loehning
0949e7528b Squish: String updates
Change-Id: Ic513a4cd10460d177b0305e53a4ed55b7c75e541
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2012-03-08 16:04:56 +01:00
Robert Loehning
abd62116f8 Squish: Removed unneeded workaround
Change-Id: I38fc9742fa4b26a694d8bcaddabaf0ceddb48d7c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-03-08 16:04:43 +01:00
Leena Miettinen
21a5993b17 Doc: changes to the Qt Quick project wizards
Update all screen shots.

Change-Id: I3250dba678bc641fdaf767cbabf7f471e63bab3a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-03-08 15:25:48 +01:00
Daniel Teske
48e3131294 Compile
Change-Id: If409190fd7e54d9461ab15a2ef546fb0a21cd646
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-08 14:49:02 +01:00
hjk
b540ea6643 debugger: allow cleaner abort of autotest runs
Change-Id: I1dbfc5870fa86787975574a6b8e88ebbc8dfc322
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-08 14:40:48 +01:00
Daniel Teske
bb64880214 Bookmark: Remove unused member m_fileInfo
Change-Id: Ic39bac854f4ca99ee342578262f9fd28baaf85fa
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-08 14:17:20 +01:00
Robert Loehning
71466f53d8 Squish: Updated object map for changed strings
Change-Id: Iacc385d9c62a3c376e105223df5dc9424c85e1f1
Reviewed-by: Bill King <bill.king@nokia.com>
2012-03-08 14:14:41 +01:00
Robert Loehning
06b31aaa78 Fixed white spaces
Change-Id: Ifc369d468ed4606425fa161e44bff534434ae765
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-08 14:08:00 +01:00
Christian Kandeler
9a34b156c1 Introduce the concept of an abstract device.
The idea is that all kinds of devices inherit from one abstract
base class and that they are all managed by one device manager,
who does not know about their specifics.
For now, the only concrete subclass is the LinuxDeviceConguration.

Change-Id: I31ff5586a0fdd6bcf8dcc0554bb2b91fe65b2f3f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-08 14:07:19 +01:00
Daniel Teske
a5de122080 QtVersion: Pass on all qmake properties to the ProFileParser
Task-number: QTCREATORBUG-6896

Change-Id: I30a9f9013d91f0cc4937ec376f63d408133ba40c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit be1afbd6bb)
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-08 11:27:03 +01:00