Commit Graph

30609 Commits

Author SHA1 Message Date
Marco Bubke 8f22b84016 QmlDesigner: Fix the exit for qml puppet
Change-Id: I228e91711f6976e0e6d7b298d73f61cd8c25be23
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 17:00:31 +02:00
Marco Bubke aa08da4143 QmlDesigner: Prefix for puppet output
Change-Id: If149ddb26e0e9852b6970ecac6f535499ea7b3af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 16:41:01 +02:00
Marco Bubke 43f2b4d5d5 QmlDesigner: Add hasValidMetaInfo to ModelNode
Change-Id: Ifb00ad28dc72d4876b9dffbad70b18d6ada07004
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 16:40:15 +02:00
Friedemann Kleint df33773999 Remove CodePaster protocol.
Change-Id: Iad4455ba80f374968e16d5d4eeb256a7b6883552
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 15:53:19 +02:00
Eike Ziller 746e4f4119 Fix marking JavaScript lines that threw an exception
Since EditorManager::openedEditors doesn't exactly do what one would
expect, it was only marking a single editor even if there were multiple
editors on the same document.

Change-Id: Iae579c2cfd8455de2783d39fa69944fe92dfc60a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-16 14:51:27 +02:00
Friedemann Kleint 00a46667d7 QML Designer: Fix message about puppet crash.
Change-Id: I604cdbd2abfd45105502e19d80f102df1017f4c5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:38:06 +02:00
Thomas Hartmann 22de58ee94 QmlDesigner.DocumentManager: exporting DocumentManager
Change-Id: I7cd020b35b95300007e9ec9c7a3bd41a59481f88
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:23:55 +02:00
Thomas Hartmann b407284046 QmlDesigner.CrumbleBar: code cleanup
Change-Id: I20e2002c7b2ccc25d8120222fa9b52e59db498ee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:19:31 +02:00
Thomas Hartmann ecb0470c30 QmlDesigner.DesignDocument: code cleanup
Change-Id: Ib71117cb5726662b4212f99a7c4136005273ae66
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:17:36 +02:00
Thomas Hartmann 3768e32f89 QmlDesigner.DesignDocument: getting rid of the magical StackedWidget
This StackedWidget is a leftover from the stand alone version.
In the context of Qt Creator this makes no sense anymore.

Change-Id: I6660dd4b43bdc12fa3329d333158fa759bee4d88
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:14:34 +02:00
Thomas Hartmann 702030f903 Model.Rewriter: crash fix
No TextModifer might be attached.

Change-Id: Ia06a1844ebf10392de1edb8cdb25d70bfa31e14d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:07:21 +02:00
Thomas Hartmann 613529b39e QmlDesigner.Model: Allowing the model to hold a TextModifer
We have a one to one relationship between models and TextModifiers.
With this patch the model keeps track of its own TextModifer and
does set it to the rewriter if attached.

The model does not take ownership, since it does also not take
ownership of its views.

Change-Id: Ied02666debf6aad76666b0d9d22e8ba2f72be666
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 14:04:25 +02:00
Thomas Hartmann a37fbaefa6 QmlDesigner: DesignDocument removing m_currentModel
We remove m_currentModel and replace it by currentModel().
If m_inFileComponentModel is nil the current model is the document
model, otherwise the current model is the inFileComponentModel.

No need to keep m_currentModel around explicitly.

Change-Id: I590e02dc03c2319cbf713b880cf43d740d64e942
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 13:57:25 +02:00
Eike Ziller 0909213841 Fix crash when loading ui file that uses resource files
Crash introduced with recent refactoring
113c5600c9

Use the IDocument::filePathChanged signal (instead of changed() which
also fires when modification flag changes) to detect that a ui file
might be in a different project or no project now, and available
resource files changed.

Task-number: QTCREATORBUG-9813
Change-Id: I9b9e26be916ffe7bbf3ab49d934d0e4c111e48df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-16 11:39:06 +02:00
Eike Ziller 4ba6faec3f Designer: Remove some redirections.
Instead of keeping a separate plain text editor and document,
the FormWindowEditor and FormWindowFile are directly derived
from PlainTextEditor and BaseTextDocument respectively.

Change-Id: I4319904dea769ec31900061bc7c3a3c5c22e0e8a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 11:04:01 +02:00
Friedemann Kleint 38a44f7e0f Android: Fix capitalization in message.
Change-Id: I8ec555982b9b8b6f30e32e20307c7c440b07a2a8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 10:46:30 +02:00
Nikolai Kosjar f7e26babba C++: Fix names of functions dealing with enclosing scopes
...in order to better tell apart the type related functions
isScope()/asScope() and the functions dealing with enclosing scopes:

    * scope() --> enclosingScope()
    * setScope() --> setEnclosingScope()
    * resetScope() --> resetEnclosingScope()

Change-Id: Id743a7d1b6a1a1a0ffcd8568cbd8ebbdfc16eaa1
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-07-16 08:26:19 +02:00
Eike Ziller 42e0e229af Make SubmitEditorFile dependency on VcsBaseSubmitEditor explicit
No use trying to hide it.

Change-Id: Id81fdf1eef704dec6d4e83ee69bec10b1244b202
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-15 21:43:05 +02:00
Friedemann Kleint aec9124723 tr()-fixes in git.
- Do concatenate message pieces that may not fit grammatically.
- Common message for "Cannot launch".
- Add period marker.

Change-Id: Ic67b27e30143febebc9153a3cefe523ebfd4bc49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-15 17:10:26 +02:00
Thomas Hartmann 42b4e57f55 QmlDesigner.Qml2Puppet: crash fix
If if have less then one argument show some help end exit.
The code afterwards assumes that we have at least one argument.

Change-Id: I555e02dc03c2319eef713b880cf43d740d64e942
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 15:19:32 +02:00
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