Commit Graph

30589 Commits

Author SHA1 Message Date
Erik Verbruggen
8828a2fa38 C++: add test for TranslationUnit::getPosition bug
This test is marked as failing, because the bug is still there. To be
fixed when we re-use the generated token stream of the preprocessor as
input for the parser.

Task-number: QTCREATORBUG-9799
Change-Id: I454a9939aa188a6ff934a11699232f39c828bc7b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-15 11:07:51 +02:00
Erik Verbruggen
6a179c0467 C++: remove warning about stray comma after last enumerator
Although it's a C++11 feature, all sane compilers support it as an
extension to C++03/C++98.

Change-Id: I3c7b0db345d0b175554534e879717f4d14f48b0f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-15 11:01:56 +02:00
Andrew Knight
e349fb48b4 Improve property offering in Utils::PathChooser
Add notifier to path property.
Add promptDialogFilter to property list.

Change-Id: Ic0e5dbdc1a2c1ac64477baeee5f55bc4416bc526
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-15 09:40:11 +02:00
Eike Ziller
c32db57514 EditorManager: Remove unneeded methods
Change-Id: If3ab9414270df33fb6b0e269b628813e4c71e5c8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-15 07:57:58 +02:00
Orgad Shaneh
aa981f4066 PushToGerrit: Filter out stale branches
Change-Id: Ib4f1d7ead2c40f27be28fa45e042c3694c0444fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-12 17:52:38 +02:00
Eike Ziller
624d9e2c4c Move IEditor::isTemporary to IDocument
It's a property of the document implementation, not of the specific
editor instance working on it.

Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 16:43:54 +02:00
Przemyslaw Gorszkowski
3cde52846e C++: fix local types and members
It fixes code model when we have local type which contains a member
of other type, e.g.:
struct OtherType { int otherTypeMember; };
void foo()
{
    struct LocalType
    {
        int localTypeMember;
        OtherType ot;
    };

    LocalType lt;
    lt.ot.//no code completion
}

Change-Id: I018f492a6c48bfcbba0ef376ef005825e2b13f35
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-12 16:12:59 +02:00
Eike Ziller
43a3334347 CppEditor tests: work on documents instead of editors
Change-Id: I27964a585996f9838a87856fd68067ce29ce755a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-12 15:54:31 +02:00
Christian Kandeler
3aae830241 QtSupport: Fix qbs build.
Was broken by 81eba6f984.

Change-Id: If85dda7384ecfb174cc8388e919336ea34c1c41a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-12 15:45:35 +02:00
hjk
abb4ff95d7 Debugger: Fix linking debugger auto test
Change-Id: I6ddbe261aca7064176cc025da752476915c5d906
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 15:04:15 +02:00
hjk
2c7daecd26 Debugger: Add button to debug python dumpers
This searches the last 'bb' command and triggers a re-run with
the 'pe' option added.

Change-Id: Icbe251c9f8980f3bcd0ba10171ec39f0fb02c2f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 14:44:08 +02:00
hjk
108085008f Debugger: Fix QUrl dumper for Qt 4
Change-Id: I3a162bd7b8f181b8f337194004baee065b1c96ac
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 14:40:57 +02:00
hjk
5718a88717 Debugger: Remove some boiler plate in dumpers
Use Dumper.putPlainChildren where appropriate.

Change-Id: I7fc26e3b04cd67d07b2d4c7b84d5c6a8dcd6c001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-12 14:15:58 +02:00
Przemyslaw Gorszkowski
37430df636 C++: fix constantValue for EnumeratorDeclaration
For the case:
const int x = 12;
enum E { e = x };

constantValue for EnumeratorDeclaration has value=' x'. It should have 'x'.

Change-Id: Iaca77cccd1e0dc5274696b0c96cec6ac2f904979
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-12 13:46:57 +02:00
Przemyslaw Gorszkowski
46461fc183 C++: code completion for lambda calls
support for lambdas, e.g.:
struct S { int bar; };
[]() { return new S; } ()->bar;
[] { return new S; } ()->bar;
[]() ->S* { return new S(); } ()->bar;
[]() throw() { return new S(); } ()->bar;
[]() throw()->S* { return new S(); } ()->bar;

Task-number: QTCREATORBUG-9523
Change-Id: I43fbf6f0ee0bb11411c53c984df75ef33a276466
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-12 12:47:09 +02:00
Thomas Hartmann
ab15d38726 Wizards.Dialog: fix the All Templates case
The "All Templates" case in the comobox did not work as expected
from users.
It still did only show wizards we have a kit installed for
and it was not available for the case of one platform.

The semantics for "All Templates" were actually "All available Platforms".
This was confusing especially in the case of no platform.
Now "All Templates" does show all templates, but the wizard give an error
message, if no corresponding kit is available.

Task-number: QTCREATORBUG-9792
Change-Id: Ia83a0577bde7e726b2638868bcaffbe13499f2f7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 12:32:22 +02:00
Erik Verbruggen
62994a367a Debugger: give the qmlToolBar a parent.
Showed up in valgrind as a leak, when QML debugging was not used.

Change-Id: I8e378795727f0e2f297086ae73dab99b6a28de32
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 12:15:00 +02:00
Eike Ziller
b6bcf505d7 FindInOpenFiles: use documentCount instead of openedEditors
Change-Id: I329417ce61b71f3bf080c5a76c41c69acda2cb94
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 12:14:08 +02:00
Eike Ziller
5f166f2506 Don't use openedEditors in CMakeProject
Work on documents instead.

Change-Id: I7000d10b2a885d5dc22c9b40377c9521f21b6195
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-12 11:58:33 +02:00
Eike Ziller
871a8cd031 Work with documents instead of editors where possible in debugger
And where using editors is necessary, take *all* editors into account,
not a random set of what previously was called "original" editors (when
using splits).

Change-Id: Id6bbad08f3083b6744fc2edcf0b87ba504d3257b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 11:58:24 +02:00
Eike Ziller
354cd410b0 Make document model static and add some document related methods
Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:55:59 +02:00
Eike Ziller
7b1941c792 OpenEditorsModel API: Use 'document' more where is about documents.
Rename OpenEditorsModel to DocumentModel.
In the DocumentModel also make the distinction between "restored"
document (i.e. just info about file name, display name, id), "opened
document" (i.e. document with IEditor and IDocument), and "document"
(which refers to any).

Change-Id: I01ebe10ec84aab5fe81e54be6bec14f653f28771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:46:19 +02:00
Eike Ziller
39d9912620 Editors: Fix leaking entries.
Change-Id: Ic05f0acd61c73a92dc0ee6861be4993557242986
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:32:00 +02:00
Eike Ziller
21f63c24c7 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
2013-07-12 10:39:18 +02:00
Eike Ziller
b99de1de58 Editors: Get rid of keeping separate lists of "duplicated" editors.
And use documents for the list of currently open documents, instead of
using a set of "original" editors that needed to be separately managed.

Change-Id: I3379ca44f03646399d3ecb0e775d7f1fd81a6bcf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 10:21:49 +02:00
Eike Ziller
a699dc3c71 Version bump
Change-Id: Ie3e9647c3a627feb42392d3a965b67edd0f48b6c
2013-07-12 10:01:36 +02:00
hjk
b89afac9d4 Utils: Rename winQPidToPid to qPidToPid
... and make it a no-op on non-Windows. Saves #ifdefs.

Change-Id: Ie791f7b9f1a425325d0b889e73758c5f7f7e6ad2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-12 09:39:35 +02:00
Friedemann Kleint
80e657b390 Valgrind: Compile on Windows.
Change-Id: I3afd64b297a15af2e51c7fdd83292b9ca2a1cc1f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 08:35:46 +02:00
Orgad Shaneh
e63d1f64b5 Git: Refresh configuration widget if editor is found
Task-number: QTCREATORBUG-9783
Change-Id: Id1092fb9a79dfbf0425be4913241a507afb56a85
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 18:05:46 +02:00
Orgad Shaneh
bcf9c7621f Git: Remove args from diff
They are unused

Change-Id: I6cff3c6028208f1c7c0937c53b3f5090dae719a6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 18:05:03 +02:00
Orgad Shaneh
cf793dc63d MakeParser: Do not show "Warning" as error
Change-Id: I61e6dd689d8f24402f6ac5bb0fb109ecc1a26831
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 18:04:23 +02:00
hjk
fd183531dd Analyzer: Merge Valgrind process classes
Change-Id: Ic2ef2304fb5524d07858052806124f6b02ca4dcb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-11 17:37:01 +02:00
hjk
34981a8a90 Memcheck: Merge part of local and remote code path
Change-Id: I683cedbe5fbed6d10b24100c51f77a75f74504a1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-11 17:36:08 +02:00
Daniel Teske
37dec964c1 QtVersion: Allow the user to rename autodetected qt versions
Task-number: QTCREATORBUG-9787
Change-Id: Id6fc29ea5466c76ffd8f2cddc2cc7583395b9ba3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 17:21:30 +02:00
Robert Loehning
756222f28e Squish: Expand tests to python editor
Change-Id: I1c3062f2802531d7a6e2f3c2b75645432ba364a4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-11 16:59:07 +02:00
Tobias Hunger
3f9380ae0c Fix warning in taskmodel
Change-Id: Ie1c0c7112c2de7af51fb96415155b3b723a488a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 16:50:01 +02:00
Daniel Teske
30cf45e312 QtVersion: Remove old unused code for legacy restore
Change-Id: I8e3872e6da4bab1e7b5d6e7389352e55dea20236
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 16:49:20 +02:00
Daniel Teske
4e4dad70dd QtVersion: Move string constants to QtSupport::Constants
As I need them in two different places

Change-Id: Ic782253916615f43cc43016bbd3d52cfae5ec407
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 16:49:14 +02:00
Daniel Teske
f82bcf2204 QtVersionManager: Fix memory leak on restoring installer versions
Change-Id: I71fe7284fd3397baf364679dc034c04ef8b84a74
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 16:49:09 +02:00
Daniel Teske
21793181b1 QtVersion settings dialog: Fix a double margin
Change-Id: Ibde66bb459c9cc935ab2c3472c2f30f31d68538f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 16:49:04 +02:00
Erik Verbruggen
3c441c6449 Initialize member field.
Showed up in valgrind as being used uninitialized.

Change-Id: I77618ff982c12ff7b1d7f5e285cb9dd1810c116c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 16:34:59 +02:00
Christian Stenger
2c1bb666c3 Squish: Disable tst_qml_locals if OpenGL is missing
VMs used for testing need some adjustment to support QtQuick2 related
stuff. (OpenGL must be usable.)

Change-Id: Icc9b32cd2ad961f328f518276210969d704ad461
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-11 16:06:00 +02:00
hjk
46deab8377 Valgrind: Reduce number of function calls
Change-Id: Ie243f55ee7b632d164ed70062fbfd129de3753b9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-11 15:23:09 +02:00
Erik Verbruggen
fa1647d880 C++: add utility method to dump usages.
Change-Id: Icff6e9310a45e66b573fb2a6623a10e025c43539
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-11 14:09:03 +02:00
Erik Verbruggen
3563b4167f C++: Fix test failure after merging 2.8.
Change-Id: Iac4156b872fe81c1714857c24363bf171e7d61cd
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-11 13:58:16 +02:00
Orgad Shaneh
457b5e2969 Git: Prevent double stash pop on branch checkout
when Move Local Changes is selected

Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-11 12:52:06 +02:00
Orgad Shaneh
d31efc22e8 VCS: Stop on file pattern when building a chunk
Task-number: QTCREATORBUG-9782
Change-Id: I0e50c5c2696ad9cfe4e8a56c28cb17a2ee039b4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-11 12:50:40 +02:00
Orgad Shaneh
0b6b6b38cb Show VCS topic in window title
Project tree root is not visible most of the time. Window title is more
useful.

Also shows topic for *current* open file rather than the project
(supporting submodules and externally opened files)

Change-Id: Id21be09c27beca1b0d37674513121a0e0e995feb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-11 12:50:05 +02:00
Aurindam Jana
9e8cd1eb1f QmlConsole: Check for duplicate children
When constructing the console item tree, check for
duplicate entries.

Change-Id: Ibc5aa150287ef5e2ee4b691a71bb170308a1fde7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-07-11 10:54:17 +02:00
Aurindam Jana
fd685138c7 QmlConsole: Fix infinite recursion bug
The queried v8 object sometimes returns a child item that
refers to itself triggering an infinite recursion.

Task-number: QTCREATORBUG-9747
Change-Id: I30dfbb834ebeb39c33a6050d4b4860b1b47f34d9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-07-11 10:53:06 +02:00