Commit Graph

41387 Commits

Author SHA1 Message Date
Christian Kandeler
0a2d3e638d Update qbs submodule.
To HEAD of 1.4 branch.

Task-number: QTCREATORBUG-14482
Change-Id: I97b870fe11fca3553015e79b5229096aa5d8cf2b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-21 13:44:39 +00:00
Ulf Hermann
243b272435 QmlProfiler: save and load input events
Change-Id: Ibb70d98a6b2ceeb72059a7a421ce2e1a38233d87
Task-number: QTCREATORBUG-14491
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-21 11:51:42 +00:00
hjk
f35422169c Debugger: Remove a wrong soft assert in breakpoint handler
The code path can be triggered legitimately by removing breakpoints
without direct file association like "Break on throw" in the
breakpoint view.

Change-Id: If32a990f76d86386e40123c8f7a90613e15ca670
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 11:42:02 +00:00
Eike Ziller
1d97835a6e Fix crash when opening binary file with BinEditor plugin disabled
In that case we do not find any editor factory at all.
Broke with 15d8b6ba81

Change-Id: Icb0abb2ecd30d968d4a0d857be81b94a4fd6b1b5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 11:27:23 +00:00
Orgad Shaneh
b880ace167 C++: Minor cleanup
Save a few as* calls

Change-Id: Id2aa43a39ead7231d9e9046ad16d51c05af1ec77
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-05-21 11:09:03 +00:00
David Schulz
a33db02a36 Debugger: Optimize insert watch item.
Change-Id: If15afbbc7bcf33367755cfd61d47670a28038e6f
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-21 11:08:00 +00:00
Thomas Hartmann
fa6d623dfa QmlPuppet: Remove dependency on ObjectNodeInstance in MetaInfo
MetaInfo cannot depend on ObjectNodeInstance.
I forward the QObject and the QmlEngine all the way through.
The commented code in metainfo.cpp is about defining a context
for the root item. The feature is basically unused, but we can bring
it back using a callback later.

Change-Id: I8f099b06c848e2faeaafc011ac6bd313192a64bd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:17:38 +00:00
Thomas Hartmann
c9eb75e2f8 QmlPuppet: Register callback for notifyPropertyChange
MetaObject cannot have a dependency on ObjectNodeInstance.
Instead we register a callback.

Change-Id: I9f6e096c67caf1abd525201c9bacd363d31a2fa2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:48 +00:00
Thomas Hartmann
0321f6e1a7 QmlPuppet: Clean up private API usage in ServerNodeInstance
Change-Id: Ic0890c8c6740ad2c4567b58ec9b51933d0293fc1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:40 +00:00
Thomas Hartmann
4a0a1a2b75 QmlPuppet: Clean up private API usage in QmlPropertyChangesNodeInstance
Change-Id: I007bd0a8bf5be42f0f6e9ce193a35fa8a3d3f1aa
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:33 +00:00
Thomas Hartmann
c6a2f1fe46 QmlPuppet: Explicitly include private headers
Those headers are used implcitly.

Change-Id: I49dcfb1a04b2103866b1d828605381570fb3e5c6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:23 +00:00
David Schulz
ab2a0d74de TextEditor: Sort text marks in categories.
Also adding a color for each category.

Change-Id: I3627d13913951a95804b5a816f087a822c01bd86
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 08:23:16 +00:00
David Schulz
a6e1c3cb54 Editor: Allow negative folding indent.
Fixing folding issues in the c++ editor if too many closing folding
regions were found.

Change-Id: I5c3476a6922af07be9b49d396b684a5f3b5a5e33
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-21 08:15:10 +00:00
Thomas Hartmann
4763acbd95 QmlPuppet: Clean up private API usage in QmlStateNodeInstance
Change-Id: If1c8cee81cbdd6f90808a824c2b4d023dd8a3e12
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:35 +00:00
Thomas Hartmann
c919795a08 QmlPuppet: Bring back simplified NodeInstanceSignalSpy
A simplified version of NodeInstanceSignalSpy is required to track
sub objects. I moved all private API usage to QmlPrivateGate.

Change-Id: I86e3e5411eb43777a6b1ab5018a1b8fb9088c666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:25 +00:00
David Schulz
7ce4958764 Editor: Correctly unset block selection when setting a new text cursor.
Change-Id: I7d155140c55ed145cede217f3cc97064161a5a07
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-21 07:29:55 +00:00
David Schulz
5fd3fa917d Cdbext: Fix compile Warning
Change-Id: Ifc2fe349f1dc287cda7bf4c5135406fe6990ef31
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-21 07:29:47 +00:00
Daniel Teske
63be3a4024 Settings be smart about scrollbars
Task-number: QTCREATORBUG-12745
Change-Id: I88a586143fc7c982df00db4aabf43e50487c2671
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:49:38 +00:00
Thomas Hartmann
a577600d12 QmlPuppet: Remove unused code
Change-Id: I1d6e136748ea8242ff0149f4612a32d71394999f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:53 +00:00
Thomas Hartmann
7415ea9563 QmlPuppet: Remove unused private header
Change-Id: I699c423c3d4a84659e074e310e8697cd19f5c4c0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:48 +00:00
Thomas Hartmann
afd903c4a4 QmlPuppet: Remove private dependencies from NodeInstanceServer
Change-Id: I386bd18704020d0b174cda224c4cf46245227877
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:43 +00:00
Thomas Hartmann
ae28d84efd QmlPuppet: Remove unused function
Change-Id: I0efdcc28cff967e931bd03eb0581dd09d29dd523
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:36 +00:00
Thomas Hartmann
6fe2c1455c QmlPuppet: Remove private dependencies from PositionerNodeInstance
Change-Id: I835fb8fa28e49aed049af995f7c3d5105f4dff19
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:30 +00:00
Thomas Hartmann
0d67510270 QmlPuppet: Remove private dependencies from BehaviorNodeInstance
Change-Id: I16f2c4189f7b68bf1cff90d0a9987b4bf4212905
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:24 +00:00
Thomas Hartmann
43d716bb5a QmlPuppet: Remove private dependencies from QmlTransitionNodeInstance
Change-Id: I8a5144947469a3c7f368fa6b18781c0d07b4d850
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:17 +00:00
Thomas Hartmann
d38b1c21a2 QmlPuppet: DesignerSupport is not used directly anymore
No need to use DesignerSupport directly in ObjectNodeInstance.

Change-Id: I124adc6334feb23c30fb1a242fe95386678eadf5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:12 +00:00
Thomas Hartmann
f86eb9b78c QmlPuppet: Move functions from QuickItemNodeInstance to QmlPrivateGate
No need to use private API in QuickItemNodeInstance.

Change-Id: I5450ea41571c2787081cc88f59494a28eea5546c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:05 +00:00
Thomas Hartmann
e1a19ba229 QmlPuppet: Removing private headers from ObjectNodeInstance
Change-Id: I179de2b759307a9251c672b1747823626e2f3ef0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:02:00 +00:00
Thomas Hartmann
a1f70b965a QmlPuppet: Adding objectWasDeleted to QmlPrivateGate
Change-Id: I5dadc879f0c6a02ca29c35fff1847b3c7b0a0972
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:53 +00:00
Thomas Hartmann
f3abe73956 QmlPuppet: Adding keepBindingFromGettingDeleted to QmlPrivateGate
Change-Id: I51d0d29939b6fbd3fc309c092654f373abd8f179
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:48 +00:00
Thomas Hartmann
c6047e06e6 QmlPuppet: Move setPropertyBinding() to QmlPrivateGate
We cannot keep the context.
The context has to be forwarded each time.

Change-Id: I50b944bea1c6ad30832490edad8b35f392c32029
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:44 +00:00
Thomas Hartmann
ebf074a604 QmlPuppet: Coding style
Change-Id: I9e7d54a3b6e4de452dc2cee1101100631cd69cbb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:37 +00:00
Thomas Hartmann
d06980f9bb QmlPuppet: Move doComponentCompleteRecursive to QmlPrivateGate
Change-Id: Ib6ccf791e1dd74878e04c8248bed371fb08084cf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 14:01:28 +00:00
Alessandro Portale
2659344873 Qt Quick Application wizards: Use the proper icon
Change-Id: I044a6fa2098bcd15ad2d63b3504a5d850d8a980c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-20 14:00:50 +00:00
Alessandro Portale
9df3d850a1 Qt Quick Control Application: Optional QtWidget dependency
Let the user chose whether "native styling" via QWidgets/QApplication
should be enabled or not.

Change-Id: I5eaa7b3a94d5361e62ebce61ff6b7b9216e15b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-20 14:00:44 +00:00
hjk
1d31955abc ProjectExplorer: Remove IRunConfigurationAspect::addToMain*Widget base
Not needed in the current use cases. The original plan was to
use a loop in the *RunConfigurationWidgets constructors, making
them less dependent on the actual RunConfiguration they serve
(and potentially have a one or few generic RunConfigurationWidget).

Change-Id: I2209213414248a1e13b50447f05e8f189620a6f1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 13:26:39 +00:00
Nikolai Kosjar
89f37e30fd QMakeProjectManager: Remove unused member
Change-Id: I30ae181a3d8c36fd0c0f5c1c0d399fb3fbcd3db4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 13:09:58 +00:00
Thomas Hartmann
a54bdf3dc7 QmlPuppet: Introduce DesignerCustomObjectData
This class holds the additional data we use to annotate QObject.
At the moment we store the default values and bindings there.
I also moved the code to populate and read the hashes
into that class.

Change-Id: Ib5e4b5291cfd2bf5555a896bf42578d07f2c6253
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 12:49:40 +00:00
BogDan Vatra
7b0ae1ad0a Android 5.1 is not unknown anymore
Change-Id: Ic4b1b8d6de95a30f5542ea618ef728e64c4f7bc7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 12:27:52 +00:00
Orgad Shaneh
81721f6781 C++: Fix resolving of recursive typedef
Use-case:
template<typename _Tp>
struct Temp { typedef _Tp value_type; };

struct Foo { int bar; };

void func()
{
    Temp<Temp<Foo> >::value_type::value_type *p;
    p->bar; // bar not highlighted
}

Task-number: QTCREATORBUG-14237
Change-Id: Ie0b21b81526d610437ed2d2877083bb929c25047
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-20 11:14:20 +00:00
Orgad Shaneh
cbc122e2e2 C++: Introduce CreateBindings::Ptr
typedef for QSharedPointer<CreateBindings>

Change-Id: Idf7a9984bb90da82407abd4b7dec9f40926beac8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-20 10:51:12 +00:00
Orgad Shaneh
de68ac5407 C++: fix code completion for decltyped type
example:
struct Foo { int bar; };
Foo foo() { return Foo; }
typedef decltype(foo()) TypedefedFooWithDecltype;
void fun()
{
  decltype(foo()) decltypeFoo;
  decltypeFoo.;// code completion should work here

  TypedefedFooWithDecltype typedefedFooWithDecltype;
  typedefedFooWithDecltype.;// code completion should work here
}

Started-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Task-number: QTCREATORBUG-14483
Change-Id: I296ceed9d896c68cf0651265afb08a1fc42f9a68
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-20 10:45:31 +00:00
Tobias Hunger
57e3714db4 JsonWizard: Remove member that is only ever read
Change-Id: I87529de8fb600dfc08862143f708e445bc18ed47
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-20 09:03:51 +00:00
Nikita Baryshnikov
ba3ed06443 Revert qbs submodule
Change-Id: I8f838b5c9cdc248801be3d204622d028d181757a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-05-20 08:47:58 +00:00
Thomas Hartmann
4d4320d598 QmlPuppet: Move hasFullImplementedListInterface to QmlPrivateGate
Change-Id: I42a744b67811cc49b616b742da46af5502d5e1a9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-20 08:39:59 +00:00
Lukas Holecek
a439335500 FakeVim: Disable visual navigation for text cursor
Change-Id: I04a05ae034dbe5e891df5e39275ce0430eabb649
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-20 07:58:27 +00:00
BogDan Vatra
6d3f81b095 Fix DockWidget
DockWidget keeps a pointer to the initial inner widget which might change/delete.

Ex:
    QWidget *w = new QWidget;
    w->setWindowTitle("title");
    QDockWidget *dock = addDockForWidget(w);
//...
    dock->setWidget(0); // we want to set another widget
    delete w;

Change-Id: I04e3d1075787092f3789f32442990aa76848d1b7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-20 06:50:51 +00:00
Nikolai Kosjar
04a03106ce ProjectExplorer: Compile fix
Change-Id: Ia820f95a54175b1bb15014fd828ac6e722c6e037
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-20 02:26:25 +00:00
Nikolai Kosjar
25c63444af CppTools: Remove QTC_ASSERT in completeQtMethodClassName
SOFT ASSERT: "klass" in file src/plugins/cpptools/
cppcompletionassist.cpp, line 1916

...can occur during Qt5 signal/slot completion if the object type can't
be looked up, e.g.:

    Foo *foo; // Foo is used by not defined
    connect(foo, &<TRIGGER COMPLETION HERE>

Change-Id: I0fafd328635e1db57d700d531af0fee819cca8fa
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-19 15:02:09 +00:00
Orgad Shaneh
237cfd1f77 Dumper: Add a dumper for CPlusPlus::Class
Change-Id: I619d31f307844349095c81defc675c57fcaa4de0
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-19 14:53:53 +00:00