Commit Graph

31174 Commits

Author SHA1 Message Date
Christian Kandeler
482969186d Core: Fix build.
Change-Id: Id11aadb251a91bc579979dab971ea45960aabb86
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 18:00:29 +02:00
hjk
fff92e3d44 Debugger: Fix choice of display formats
This is a recent regression, formats have not been reported
anymore, so the Gui did not offer a choice.

Change-Id: If210948aa7e892baed9f5b07150c34fff7212164
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 17:52:02 +02:00
Marco Bubke
af54a661a4 QmlDesigner: Remove refresh bindings for componentComplete
changeId is triggering it anyway and it is really expensive.

Change-Id: I37743ed619d9e901b28c69f4c324852ba7e6608c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 17:20:53 +02:00
Marco Bubke
11036e9d52 QmlDesigner: Explicit constructors for commands
Change-Id: I3ea3db0d1c1b0fd19b0e89e7e435671f6f5e91af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 16:47:58 +02:00
Marco Bubke
e09902965a QmlDesigner: Don't refresh bindings for reparenting for Quick 2.0
Change-Id: Id10fcc05c8ac9c0f635e3a02138bda76fd66599e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 16:47:52 +02:00
Marco Bubke
8d437dd402 QmlDesigner: Add rollback function to the RewriterTransaction class
Change-Id: I04874043eb04bd3f2cbf330186bb2105ed7ac82b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 16:47:38 +02:00
Marco Bubke
4ac9380618 QmlDesigner: Remove unused code in anchors
Change-Id: I079eaebb933a8566b2391b7ea274ba6c3e4d36ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 16:34:56 +02:00
Marco Bubke
9d967d4be0 QmlDesigner: Remove refreshBindings for instance creation
Refresh bindings is very expensive and called anyway at reparenting.

Change-Id: I232afefee22484e3994ade31457f61ea6ee1293e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 16:33:34 +02:00
hjk
a9f588616a Debugger: Enable dumping of GCC/STL with STL with -D_GLIBCXX_DEBUG
vector, list, map, stack, deque

Task-number: QTCREATORBUG-8833
Change-Id: Iecf47ee3ff6fcab14710008c8be231deddc580f5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 16:29:06 +02:00
Marco Bubke
4a28da1e7e QmlDesigner: Increase time out at item creation
Change-Id: Ie077d4a6d322515188a125b520a58b6e98deb2fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 16:25:20 +02:00
Tasuku Suzuki
4fa2790e53 remove unneeded macro in Qt Quick 2 Extension Plugin
Change-Id: Id3a75a0fb1ff93ffa2c3667f4bf5e9b440396cf0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-06 15:43:08 +02:00
Orgad Shaneh
45c74d5568 Dumper: Support MinGW mangled ThreadStart for thread names
Change-Id: I7cf9f7f445c84eeadf9141da90e4283998476bac
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 15:24:12 +02:00
Leena Miettinen
9880b3215b Doc: experimental interface to LLDB
Move the link and table up, as they had ended up in the
wrong place.

Change-Id: I5526b2d67bd835736f869370cba1eb6024e1162c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 15:19:45 +02:00
hjk
34261e03cb Doc: Update examples on how to start debugging from the command line
Task-number: QTCREATORBUG-9484

Change-Id: Ic5da00c48eb185dc3cd842812e7c36cfefbb6776
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-06 14:58:32 +02:00
Erik Verbruggen
e2a727c450 C++: add semantic support for C++11 alias decls.
Task-number: QTCREATORBUG-9386

Change-Id: Ia68f3866c122ca5261dd73b2c740b47fb15744fc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-06 14:10:24 +02:00
Jonathan Liu
b6e9ebb7e6 Remove semi-colon at end of line in project file
Having a semi-colon at the end of line results in a parse error when
processed with qmake.

Change-Id: I9acfe5a7fc5a5db1c802cb70653789cc7edca5e3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-06 14:09:56 +02:00
hjk
c2d6081a6c Debugger: Don't check for existence of gdb.inferior.threads()
All supported versions have it in that context.

Change-Id: Iafff4760ba521ffc9abc4e05dbbc9263ed6fe21a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-06 14:06:16 +02:00
hjk
c8862ad418 Debugger: Simplify thread parsing code.
Change-Id: Idad3a54305e5da6cd81555815c17c1bd66aa7388
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 13:49:32 +02:00
hjk
f1fb879e39 Debugger: Fix thread name parsing
This was accessing the wrong part of the result item

Change-Id: I0d8b400d04fe93060e41461e77e3226233c4c12d
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-06 13:49:15 +02:00
Eike Ziller
1b3bb5cb7e Consistently give qbs groups a name.
These nicely show up in the project tree in Qt Creator then.

Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-06 13:40:51 +02:00
jkobus
5e407c08d7 Remove \r from git process output
Task-number: QTCREATORBUG-9443
Task-number: QTCREATORBUG-9448

Change-Id: I02e65eab6be5d129b605067425f6774550fbf511
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-06 13:28:07 +02:00
hjk
f2fa59d649 Debugger: Fix reading of thread address field
Change-Id: I1735890a94f89b794cd0ffabc80f9dd1e000abbf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 13:25:22 +02:00
Fawzi Mohamed
317d9d50cb qmljs: add qrc files that are not resources without warnings
Change-Id: I2e768b6f14c0099769cb8a4b13052c7f0b8f88a9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-06 12:33:47 +02:00
Marco Bubke
a1ea676c0e QmlDesigner: Fix margins for Group Box
We used the item size for calculation, now we use the content item
bounding rectangle.

Change-Id: I94ca0565c1c3d992563207ee1cd9c1dcb8c874ea
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 12:17:31 +02:00
Leena Miettinen
84e21c766a Doc: fix changed file name in Kits options
Add information about the LLDB Engine option.

Change-Id: I11fc961a8fbee29feeba526ec6c55b02199b6952
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 12:06:34 +02:00
Orgad Shaneh
5980a1e392 Do not create pid-specific peer file before initialize
When running with -client, pidPeer file is created too early,
and it is not locked, therefore never deleted.

initialize() is called for non-client executions (including the case
of qtcreator -client when no instance is running or qtcreator -client
-pid when the pid is invalid).

Task-number: QTCREATORBUG-9216
Change-Id: I825556b0ec5e1db4240e4a63bfe6aec60386984d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: netyrj <netyrj@gmail.com>
2013-06-06 11:54:27 +02:00
Orgad Shaneh
29597d36d2 Truly support multiple instances
Qt*Single*Application is not designed to support multiple instances.

A shared memory is used to list all pids of running instances.

When an instance gracefully quits, it removes its own entry
and every other entry which is not currently running
(i.e. crashed instances).

Running qtcreator -client opens the first running instance in this list.

Running qtcreator -client -pid works as before.

Task-number: QTCREATORBUG-9458
Change-Id: I25d22a81097a224e9e45af093efa2ef2eccf6cb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-06 11:54:16 +02:00
hjk
3f503c29eb Debugger: Don't use tooltips as labels.
They might be too long...

Change-Id: Ie3f09c6befbbd037ada86d22bda765524de9c18c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 11:01:22 +02:00
hjk
64440ac3d6 Debugger: Fix part of 2.7 regression in QObject dumper
For e.g. QMap<uint, float>, std::stack<int *>, 73 pass, 103 fail.

Change-Id: I14f68ad59d10e9751d09ed6e0f959d2a78d53822
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 11:01:04 +02:00
hjk
8308af953c Debugger: Re-use flexible upper limit when cutting off string data
A fixed 100 is too inflexible.

Change-Id: I86e996157ea49c14078b3833a5b08dc53d25d1aa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 11:00:46 +02:00
hjk
d2344a7ac7 Debugger: More LLDB dumper work
For e.g. QMap<uint, float>, std::stack<int *>, 73 pass, 103 fail.

Change-Id: I24f68ad59d10e9751d09ed6e0f959d2a78d53822
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 10:40:50 +02:00
hjk
71f80d6449 Debugger: Implement Dumper.putCallItem() in LLDB interface
Change-Id: I7243b4fe9e8fd91653e236722282fa8f8a9ed82d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 10:40:27 +02:00
Frank Secilia
84e6ab02ed Mismatched parens background color now dark on dark backgrounds.
The color is not configurable, but on dark backgrounds, the color is now
dark magenta, rather than magenta.

Task-number: QTCREATORBUG-9025

Change-Id: I9925e598b30a13c8b9691d6e0e576c0087df38da
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-06 10:08:27 +02:00
Marco Bubke
53e3157641 QmlDesigner: Remove qDebugs in the NodeInstanceSignalSpy
Change-Id: I3f725f3e502cd2541943f1cfb407aad332539606
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 08:52:33 +02:00
Petar Perisin
bf3c8601ef git - add files for commit that are inside untracked folders
However, files need to be part of the current project to be added to the
list.

Task-number: QTCREATORBUG-9153
Change-Id: Ifb7a4684e85d0ccd688956eeff77b4cc7d807911
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 21:48:44 +02:00
Orgad Shaneh
164955a4e0 Git: Use top level for stash working directory
The message in stashPrompt doesn't make sense with an inner directory

Change-Id: Iddbea519915cd22a6882dcafb705d1ed99106db6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 18:32:29 +02:00
Petar Perisin
d567c60061 Git - bugfix with empty string in findRepositoryForDirectory
Change-Id: I44f68ad59d10e9751d09ed6e0f959d2a78d53822
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 17:02:22 +02:00
hjk
df4353de76 KitChooser: Initialize with last used index
Change-Id: Id9522c973b5d517e7832b92f558a38408cf3fe2b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-05 16:34:57 +02:00
Joerg Bornemann
67399fc02a fix qbs build
Change-Id: Ifb851fe09179b4822c53f528c793209226396c33
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-05 16:34:23 +02:00
Tobias Hunger
834a2687da Qbs: Display line numbers for virtual files
Display line numbers as part of the displayName of nodes in the
Projects view. These are shown for the virtual files we use to
enable navigation to Qbs groups and products and it more clear
that these are actually locations in the build system and not
real files.

Change-Id: If32354ad5ceb79c865cae2951fe470c51718728f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 15:54:16 +02:00
Tobias Hunger
3bf7650d1f Turn struct ProjectExplorerSettings into a class
We agreed to not use structs to avoid the class/struct mismatch
warnings in MSVC and clang.

Change-Id: Id1b2d89646d3a982c8d85b84b44a4e697102c220
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 15:41:31 +02:00
Tobias Hunger
ffb883957e Fix warning when building with Qt 4
Change-Id: I52b6b84732cf363b06ea248eeabdc99d89fb4beb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 15:41:10 +02:00
Joerg Bornemann
69542826fa add missing QT_BEGIN_NAMESPACE
Change-Id: Ibc35523c82e3260a32bcabaf76c27f633c529fb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-05 15:13:01 +02:00
Thomas Hartmann
f50acfffc9 QmlDesigner.MetaInfo: C++ class names might equal QML type names
If the C++ class name equals the QML type name we looked up the
CppComponentValue of the C++ class.
This one has no version information, which creates issues
in the item library.

As a solution we try to resolve the type as a C++ class as a last resort.
Any QML type has precedence.

Task-number: QTCREATORBUG-9422
Change-Id: Ia84663cab1b4011f1ef6494de86ea6d92ab74bef
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-06-05 14:57:04 +02:00
Eike Ziller
0e3a904b69 FakeVim: Fix build after merge
Change-Id: Ic682320e926de0fbe44846989e45164e6db8986d
2013-06-05 14:32:48 +02:00
Eike Ziller
a503f8bee0 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/extensionsystem/pluginmanager.cpp
	src/plugins/coreplugin/documentmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0
2013-06-05 14:19:43 +02:00
Friedemann Kleint
ea3ac259d0 ProjectExplorer: Compile fix for Qt 4.
Introduced by
e967049f5b .

Change-Id: I11f9b76f50e2343d499c7df4bd4cdd98cdb6be10
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 14:05:27 +02:00
hjk
f5200167ed Debugger: Work on LLDB dumpers
54 passed, 122 failed (lldb 300.99/gcc)

Change-Id: I71e1666c542406b126214c2b9b8b56193bcbcf76
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-05 13:48:53 +02:00
Tobias Hunger
e967049f5b ProjectWizard: Prevent crash on changes to VCS settings
The ProjectExtension kept a pointer to a page which is destroyed
once the wizard is done and accessed it whenever VCS settings
were touched.

Task-number: QTCREATORBUG-9412
Change-Id: Iabe33d877a3d614ab7470c5e11fe26f7de1bb69c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-05 13:46:48 +02:00
Orgad Shaneh
465654b83a Git: Add Reset to locator
Change-Id: I81b52b8f349cfd5e9d67bd48b0be32c48e5b2f8e
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 13:24:20 +02:00