Commit Graph

31174 Commits

Author SHA1 Message Date
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
Aurindam Jana
378d0cd119 QmlDebugging: Reset exception code highlighting
Clear code highlighting when debugging session ends.

Change-Id: I32844444161bbb609864926e12220f9fb0f492e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 14:43:57 +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
Sergio Martins
01252c53df Remove semicolon from Q_PROPERTY snipplet.
Change-Id: I3e5ae3eb17701c7c0dceca53011ab9998449f531
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-16 13:57:30 +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
Thomas Hartmann
066b3ab889 QmlDesigner.ContextMenu: fix support for Layouts
We have positioner in QtQuick and "real" layouts in
QtQuick.Layouts.

Change-Id: Ie1c5235820ac698048a229af7ede9d8f57926b19
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-16 12:29:44 +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
Robert Loehning
bcf9b3a171 Squish: Removed now unused Qt versions
Change-Id: I20f87b155485c7e5328a780623b61191cfdb81ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-16 10:49:28 +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
Petar Perisin
771fe03cfe Git - couple fixes in branch based auto stash
- do not start stash scope when creating auto stash
- return if reset fails

Change-Id: I471abc1d430351192c46ac78041949ba81f11b09
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-15 16:51:46 +02:00
Thomas Hartmann
f45a01b203 QmlDesigner.PropertyEditor: fixes in ComoBox.qml
Change-Id: I409cd74c90e55006b05eb8cd71fbbfa59811fa29
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:38:22 +02:00
Thomas Hartmann
ba084e663f QmlDesigner.PropertyEditor: enabling layout direction
This has been fixed in the rewriter and meta info system.

Change-Id: I4c78a915a05c01b33f779cf255c5b9c67d3e0001
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:29:10 +02:00
Thomas Hartmann
87aa77fa65 QmlDesigner.Rewriter: support global Qt enums
The global Qt enums are hardcoded.

Change-Id: I5342ef35c63fccecbcfec3aeaec903d99ab63966
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:28:47 +02:00
Thomas Hartmann
d76807eccd QmlDesigner.MetaInfo: fix for the item library
Row has to be a Row.

Change-Id: Ibf84d11ec36790b8fea1943ea4a10e97dfbf98d4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:20:40 +02:00
Thomas Hartmann
cc9b0d5655 QmlDesigner.MetaInfo: fixing isLayoutable()
The major version is the version of the layout.
QtQuick.Layots have version 1.0.

Change-Id: Id83105ab858a74563e8ea6457d91613d20514fcb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:15:00 +02:00
Thomas Hartmann
76cf67f349 QmlDesigner.MetaInfo: fix for propertyCastedValue
Using convert() had the side effect of invalidating the variant.

Change-Id: Iebfbf6a8067343c7c1436d6dec5ef8090821ed33
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:14:13 +02:00
Thomas Hartmann
e207228af1 QmlDesigner.MetaInfo: fix meta system for Qt enums
Change-Id: I87bedb03998d281d4a6bd450cb58d4614ae19187
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-15 16:13:39 +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
Robert Loehning
d9203dac79 Squish: Skipping 4.7 in tst_simple_analyze on all platforms
Seems to happen on the Linux test machines, too.

Change-Id: Ibd6bdea3be33d50017cae8f051c7e927f7bd24f0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-15 13:10:04 +02:00
Robert Loehning
8050e136e7 Squish: Added kit "Desktop 480 GCC"
Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-15 12:42:18 +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
Christian Stenger
9cb5e5c3f0 Squish: Provide mappings for Squish 5 stripped down packages
Change-Id: I987b9d6527f00f543a02f7a2e3dc7f9f7a366fa4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-15 10:36:30 +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
jkobus
68f860356e Update Polish translations
Change-Id: Ide7ddf7b1ef7c89224b02a710e84f64cb02a1c15
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-07-14 16:05:28 +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
Christian Kandeler
26b8acb25f Support QbsProjectManager in qbs build.
Qbs can come in via the submodule or as an external resource.

Change-Id: I613982135e4a7eca1aeb5c9c305c9974fd65f0fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-12 16:59:13 +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
Christian Kandeler
4677389a13 qbs build: A number of missing adaptations to qbs changes.
Change-Id: I37452bad6a51bb8d40a13232d46c575a483c5a6c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-12 14:01:14 +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
Robert Loehning
da81c07151 Squish: Don't falsify test data if test misses to push stop
Change-Id: I23e2ea40c001197e82aa7ea4fb0dad86670a4954
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-12 13:32:37 +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