Commit Graph

34648 Commits

Author SHA1 Message Date
hjk
0abf12ae32 Debugger: Fix base type extraction with LLDB
Change-Id: I0370040879abf948be8594dec4bf267978329bbb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 15:11:32 +01:00
hjk
87c4799a8a Debugger: Loosen version restriction on CComplex test
Change-Id: Ifc2b2e5fb51b4e1bd1b55d7d7ab9e5b3083d0da1
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 15:05:30 +01:00
hjk
11ea9fb976 Debugger: Ignore Clang debuginfo quirk in auto test
One more pass on Mac...

Change-Id: I3370040879abf948be8594dec4bf267978329bbb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 15:01:48 +01:00
Marco Bubke
bf59810b34 QmlDesigner: Fix sub class question for QtQuick.Window.Window
Change-Id: Ie370040879abf948be8594dec4bf267978329bbb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 14:41:29 +01:00
hjk
4a9796307b Debugger: Adjust auto test to protocol changes
Change-Id: I5cdf8f8c8a28b95fe29eddff9d8db8a0652847d2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 14:34:25 +01:00
hjk
af43f684bd Debugger: Consolidate metaObject recognition
Same code can be used for LLDB and GDB...

Change-Id: I07aae10fec28f01425cc13285504f57aef3afd25
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 14:31:36 +01:00
Przemyslaw Gorszkowski
376f77952e C++: fix support for nested anonymous classes
A member of nested anonymous class should be visible as a member of
enclosing class(if there is no declaration of this nested anonymous
class).

Fix:
* marking
* find usage
* follow symbol
* completion

Task-number: QTCREATORBUG-10876
Task-number: QTCREATORBUG-11170
Change-Id: If5b4d198e9075f2a8aa899ae59190f2c05f7b1ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-03-12 14:07:58 +01:00
Leena Miettinen
b96bb6172e Text editor: fix capitalization of a button text
Change-Id: I90ac86eb411beb7a966e4ae5deedad76f6c86b6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-03-12 13:33:08 +01:00
Leena Miettinen
d8858e6c26 Doc: Nokia Qt SDK is no longer available
Leaving the note for anyone who has Madde installed,
but is thinking of moving into Qt Creator 3.x.

Change-Id: I49d3326cee6594559631ba70718a05572dc2ea7b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-03-12 13:15:16 +01:00
hjk
7ed339248a QmlDesigner: Consolidate exception handling code
And translate the message box title.

Change-Id: I9d805c10940e5e3dbaa17323a913a4a55fc61a2d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 12:37:00 +01:00
hjk
3b84a6dc88 Use ICore::dialogParent for message boxes without parent so far
Change-Id: I2ee35796b2c041e6ea2ae6bd677e10167451d1b8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-03-12 12:06:10 +01:00
jkobus
f4db27a65c Reorder coloring inside diff editor
Display properly separators in differences

Change-Id: Ia7aa1f1ee96a07e0ed96773e8363e68f3d3a5638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-12 11:55:19 +01:00
Thomas Hartmann
541b5141f2 QmlDesigner: Bump version of qml2puppet for Qt Creator 3.1
Change-Id: I57aae18fec28f01425cc13285504f57aef3afd25
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-12 11:21:43 +01:00
Marco Bubke
065253a259 QmlDesigner: Ugly hack for the Window bug
Window is not working so we exchange it with an item. We need a better
approach for it in the next release. Revert this patch in master.

Hotfix: 3.1

Task-number: QTCREATORBUG-11601
Change-Id: I047dd558f8813cc8b3b6c8bad3394c3cf30c8d8e
Signed-off-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 11:20:04 +01:00
Alessandro Portale
388dc9947a Android options: Stronger check for valid JDK location
The location should contain bin/javac

Change-Id: If67ed4902b817f2d07302afb195e6dfbad881250
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-12 11:17:26 +01:00
Leena Miettinen
0d7b820371 Core: fix capitalization of a button text
Change-Id: I35d878c72f967ef6bba17c1e259c562f2d4d1593
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-12 11:00:27 +01:00
Daniel Teske
de8b860441 AndroidManifestEditor: Rewrite writing of xml files
Using QXmlStreamWriter + QXmlStreamReader gives us greater control
over the ordering of attributes. That way we can ensure that we never
change the ordering that the user used. (Whereas for QDom the best
we can do is to have a predictable but random order.)

Neither QXmlStreamWriter nor QDom allows us to control the indentation
and other whitespace, so any user indentation is lost.

In addtion QXmlStreamWriter seems to have several bugs with indentation
though, leading to rather strangely formatted files.

Task-number: QTCREATORBUG-10870

Change-Id: I4cdbdcd499227f418e7767eb1b532efbbd5083a5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-12 10:45:34 +01:00
hjk
8303f793ab Debugger: Force plain transport for non-ASCII char data
Task-number: QTCREATORBUG-11670
Change-Id: Iec5d3c7e73139414c51216ed6767c4524e859329
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-12 10:28:54 +01:00
Friedemann Kleint
35eb3b1560 Diff Editor: Fix compilation with Qt < 5.2.
Change-Id: I95401ed010e41341eb25bba032b924765b2c1be5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-12 09:22:44 +01:00
Leena Miettinen
afd7e7608b Designer: fix capitalization of UI text
Change-Id: I082f4a7a7d6c01ae4de2a91abe318d73a931bf9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-03-12 09:22:02 +01:00
Takumi Asaki
3705ece964 Doc: Fix toolTip
Change-Id: I5b4d4843dc6bc609c36f63dbb97fdfd0daae3f9f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 01:26:34 +01:00
Fawzi Mohamed
3eeb375843 qmldesigner: add explicit cast to enum conversion
Xcode 5 clang is picky about conversion between enums.
Adding an explicit cast.

Change-Id: I2e9b877c67f3b889a02d516704879b9b3b9d9bc0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-11 19:35:55 +01:00
Marco Bubke
eb69477587 QmlDesigner: Only open QtQuick and no js files
Task-number: QTCREATORBUG-11650
Change-Id: I27e62bf307a8b00157444b09c8b65a93137296ce
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 17:52:12 +01:00
Leena Miettinen
645a3db28f Doc: remove note about Symbian support
Nokia has discontinued support for Qt development for Symbian
devices. The Nokia Qt SDK 1.x.x is no longer available for
download at Nokia sites.

Change-Id: Iec7e316729c6ffe2e698070f4833330e5a2d95da
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-11 17:05:33 +01:00
hjk
72d1998824 Debugger: Implement "Create Full Backtrace" for LLDB
Task-number: QTCREATORBUG-11642
Change-Id: I92d7cde1e5021ab06ad72a00645184c41dae0e6b
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-11 16:56:23 +01:00
Leena Miettinen
a8e08dc1bd Core: fix capitalization and wording of UI text
Change-Id: Idc6deb33cefc69bce80c989d04c59a0a4d7201e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-11 16:41:42 +01:00
hjk
4202b94dbf Debugger: Let creator trigger the locals update also with LLDB
Makes the code path more similar to the GDB side and allows
skipping register refreshs when the view is invisible.

Change-Id: Ia9210ee1709dbc5c9c7a6870bf8a54484261fee0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-11 16:29:28 +01:00
Nikolai Kosjar
2d70c2e212 CodeAssist: Limit width of tooltips
This is a workaround for black tooltips or even crahes when the nvidia
driver is used.

Task-number: QTCREATORBUG-11653
Change-Id: I4ddc09354a9956a55ac6b196a596f3eaeef13670
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-11 16:23:11 +01:00
Ulf Hermann
ed537dabfe QmlProfiler: Remove pointless second check for endTime
If the selected events aren't in the specified time range the selection
should be fixed.

Change-Id: I8cb6b57054888433b5ebf66fce3b479b3266f86e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-11 15:58:50 +01:00
Ulf Hermann
ae32a276a1 QmlProfiler: Make sure that very narrow events can be hovered over
By giving the area the mouse "covers" a non-zero width events that last
only a very short time can be selected even if no pixel in the timeline
falls "into" them.

Task-number: QTCREATORBUG-11692
Change-Id: I53b74e2a770719872e0afc57740f7762636dc641
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-11 15:58:41 +01:00
Christian Stenger
03fd61ff08 Squish: Fix tst_rename_file
Change-Id: I71eece2ce9d73132edc09c5ba1465882636f5c78
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-11 15:42:46 +01:00
Daniel Teske
e433b83f64 AndroidSettingsWidget::apply(): Fix order of applying the changes
Create the device first, as otherwise no kits are generated and
create toolchains next. This should fix that the AndroidPotentialKit
 doesn't vanish in some cases.

Change-Id: Ia9141f72a146da157dc713c1e2f293747fa369bd
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-11 15:40:22 +01:00
jkobus
9c2cdc8965 DiffEditor: refactor internal structures.
Simplify the implementation a lot.

Change-Id: I3f5daa3d2ce14c28d48c2e1e996ec4935d1dae3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-11 15:34:10 +01:00
hjk
b76fb6baba Debugger: Comment out unused threadname code
This should be re-vived at some time for MinGW, until then making
clear that it is not used does not hurt.

Change-Id: I365c9fb1f859223da2f96b72a33419313438d83b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-11 14:44:25 +01:00
Joerg Bornemann
ab14fc8981 update qbs submodule
Change-Id: Idbae388b3992df40dbc38fc7005186a3e0997f61
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 14:20:35 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Christian Stenger
9637e65698 Squish: Fix tst_simple_analyze
Used template has changed - correcting the expected values.

Change-Id: I8d60f3c75f1f88d80c31f68276ac083e2215e8f7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-11 14:20:17 +01:00
Daniel Teske
19fa4f6c84 CMakeBuildConfiguration: Fix cloning buildconfigurations resetting ninja
Task-number: QTCREATORBUG-11632
Change-Id: Ie07e257dea4bfa1991a9fd492df3adc756cdb36d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-11 13:47:46 +01:00
Daniel Teske
22f112927a MsvcToolchain: Don't create a excessivly long command line for cl.exe
Task-number: QTCREATORBUG-11600
Change-Id: I616f54920d207546b6b8d44aa97341bb8118074e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-11 13:45:53 +01:00
Christian Stenger
660014f098 Debugger: Fix typo
Change-Id: Iba23331b4a6a17c690a6c630e1fbb29d530cfb30
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-11 13:21:47 +01:00
Marco Bubke
3070a0628c QmlDesigner: Disable clipping for text drawing
Task-number: QTCREATORBUG-11680
Change-Id: I5709e9c777f453c4ba4822f5f7b84332094e136a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-11 13:01:47 +01:00
Marco Bubke
26e8e4335f QmlDesigner: Refactor FormEditorItem::paintPlaceHolderForInvisbleItem
The method is doing to things so splitting it up in two functions makes
this more clear.

Change-Id: Ie19c3405d671b16ae51ba37ea00f21bbbde785c8
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-11 12:52:57 +01:00
Fawzi Mohamed
af10824639 iossim: pass all arguments to simulator
Change-Id: I805022cd6eb1ca7a49c90a9c294bf23976146e0e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 12:47:13 +01:00
Fawzi Mohamed
1caf8f8a00 ios: use consistent paths in build dir creation
Change-Id: I23ed6569eb0b87a32d4e0920a9ea42536e9e2af4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 12:46:01 +01:00
Fawzi Mohamed
8695c64012 ios: remove temporary devices
Developer mode activation generates temporary devices that will never
be usable again. Remove them if they were picked up.

Change-Id: Iff35b640d2c2e8394b108fd8d224a2b6ea8e1626
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 12:01:27 +01:00
Fawzi Mohamed
0db9d98db3 ios: adding port information to ios devices
Change-Id: I0243735159b02ac4afaf3d14ecb20381439a3997
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-11 12:00:44 +01:00
Joerg Bornemann
01715c6172 use the .qbs file extension for qbs project files
Change-Id: I4a6a8a81ca687b29101ae66ed22a2456e8991d55
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 11:32:06 +01:00
Leena Miettinen
19b52fb509 Doc: using experimental WinRT plugin
Change-Id: I669048c839dc7d78984923b21f6bfba69d551a43
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-03-11 11:10:03 +01:00
Daniel Teske
77d885bf3a Android: Handle offline state
Task-number: QTCREATORBUG-11056
Change-Id: I81b58d08b66b4fb8322e5c6c4935ddfb9470318f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-11 11:04:08 +01:00
Robert Loehning
3befd91113 resourceeditor: Make qrc-files' context menu more consistent
Change-Id: I97e5354bc892194d34ba968b0428bbc3bfdcd11d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-11 10:59:05 +01:00