Commit Graph

44349 Commits

Author SHA1 Message Date
Tim Jenssen
4969837ad6 QmlDesigner: fix crash while adding a delegate
Change-Id: I5944332dcc741cb67be55062c5d24e293973f090
Task-number: QTCREATORBUG-19190
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-11-15 07:53:25 +00:00
David Schulz
63d18a4537 Editor: Fix indenting on the very first position of a document
Task-number: QTCREATORBUG-19294
Change-Id: I3c859d90f0c58165d526b2c9dd9a7afe2abda94b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-15 06:14:52 +00:00
Eike Ziller
4328898fb3 Add a bread crumb widget to file system view
Which allows easy navigation to any parent of the current selection.

Task-number: QTCREATORBUG-19203
Change-Id: I97179a4800afd92a21bd0fa466fbfda4ac1a5846
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-14 15:43:41 +00:00
Thomas Hartmann
dbe7ea7d88 QmlDesigner: Add enablers for frame scaling, moving
Change-Id: I24777f47f2f3826a21c7f5dd9984372b1738d2e3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 14:54:32 +00:00
Thomas Hartmann
6b5192bd52 QmlDesigner: Update state names if edited in text
Task-number: QTCREATORBUG-19283
Change-Id: Ic627c609d784e570d47bcea2fdddf8ab9240ef92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 14:54:26 +00:00
Thomas Hartmann
056c9c641f QmlDesigner: Filter modifiers in override event
We have to ignore Qt::KeypadModifier.

Task-number: QTCREATORBUG-19272
Change-Id: I0233812e3c7e4623a00ef077f9a5057db5ba8b93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 14:54:16 +00:00
Thomas Hartmann
de43bd5a59 QmlDesigner: Catch potential exceptions
This fixes any crashes related to uncaught exceptions when
reparenting in the navigator.

Task-number: QTCREATORBUG-19272
Change-Id: If087b866059cd285413d54f57d7c4199bfc50ba7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 14:54:08 +00:00
Vikas Pachdha
8c1a08d760 iOS: Fix simulator startup for Xcode 9
For Xcode 9 boot the second device instead of creating a new simulator
app instance

Task-number: QTCREATORBUG-19270
Change-Id: I68d1c319f8b5e709fc20462098db0c89a66566eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 14:49:47 +00:00
David Schulz
2453d20dd0 Utils: add filter and transform function for qobject container
Add function that casts QObjects of a given container to a desired type
and return the result via the same container with the desired value
type.

Change-Id: I45949c982c8dbdd0cce069d62cd2db5c8517f9f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 14:29:27 +00:00
Tobias Hunger
69e9f81bd8 ApplicationOutputPane: Handle runControl being nullptr
The runControl associated with a tab might become nullptr. That was
already handled in some places. Do so consistently now.

Change-Id: I899cc467a213f2a991967fa98a5819a98412d387
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 14:20:34 +00:00
Tobias Hunger
77bea93a6e RunControl: Make RunControl::canReUseAppOutputPane more robust
The pointer passed in was assumed to be non-null, but that does not need
to be the case.

This should make the function more robust in face of errors. The RunControl
passed into the method is taken from a QPointer. So if the RunControl is
destroyed, that pointer may be nullptr.

Task-number: QTCREATORBUG-19269
Change-Id: I42e7b9d5582df2ee0830c8f92af4e4a97e7d6417
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 14:19:58 +00:00
Tobias Hunger
da18c76b96 CMake: Block project configuration widget while project is parsing
This prevents the user from changing settings while the project is parsing. Those
changes would get lost.

Task-number: QTCREATORBUG-18988
Change-Id: Ie04c6750c8aea3fe5543168ae4838f42fe488ca2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 14:19:27 +00:00
Vikas Pachdha
b577db56b6 iOS: Fix incorrect bitwise operator usage
Task-number: QTCREATORBUG-18847
Change-Id: I3b9dacf5e9bb6d0c5e556ac1ba984db4076e18ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 13:58:23 +00:00
Eike Ziller
6f3976ec4c Adapt merge to master change
Change-Id: I579d20ad87f6e8a79322c05a091e2bb64d670740
Reviewed-by: hjk <hjk@qt.io>
2017-11-14 13:14:54 +00:00
Eike Ziller
1cbaa97d90 Merge "Merge remote-tracking branch 'origin/4.5'" 2017-11-14 13:04:54 +00:00
hjk
a846b1b6a5 RemoteLinux: Add an unused id argument to CustomRunConfiguration
... to make signature the same as in other cases, which is needed
later to make  RunConfiguration::initialize(Id) virtual instead
of the current static RunConfig *createHelper(Target *target, Args
...args) template.

Change-Id: If3a8fdd67bc6fe49dd7f53881cc91c1a2914f7cb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 12:26:08 +00:00
hjk
d2e29acdc3 Debugger: Remove explicit GdbServerRunner's "Starting gdbserver ..."
Same (or similar, in case an explicit path is configured)  message
is triggered by the base class, no need for duplicated here.

Change-Id: I1a3e3c386674e98dc0ddd31f1156f7e8254a53c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-14 12:20:59 +00:00
hjk
5f3363df59 DeviceUsedPortGatherer: Clear used port list on (re)start, not stop
It's typically query handled after stop() (triggered by process
finished), clearing the list then would essentially discard the
result of the operation.

Change-Id: I12fb09249f8437009d3365fadcca222855468cd7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 12:14:49 +00:00
Tobias Hunger
7fb6bfd901 QmakeRunConfiguration: Use nullptr instead of 0
Change-Id: Iecd2ea515d5fb08157325d5331b707ca02b054e3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 12:12:47 +00:00
hjk
02157d77bc CustomExecutable: standardize RunConfiguration::initialize() signature
Most other signatures look like {...}RunConfiguration::initialize(Core::Id),
make this here the same, even if the Id is unused (or, rather always
the same) so we can use a virtual function in the base RunConfiguration
at some time.

Change-Id: I5d3d4a7bf856bb0cc31f8e26bc0e5a80fd1a4066
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 10:59:18 +00:00
hjk
9436a3824e BareMetal: standardize RunConfiguration::initialize() signature
Most other signatures look like {...}RunConfiguration::initialize(Core::Id),
make this here the same, so we can use a virtual function in the base
RunConfiguration at some time.

The formerly use extra projectFilePath argument can be retrieved
by (old) pathFromId in case of BareMetalRunConfiguration and hard-coded
to QString() in case of BareMetalCustomRunConfiguration.

Change-Id: I8f7389c1d1dcf54ae02ba8a58ed1cc74f65b0b82
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 10:59:06 +00:00
hjk
dfd4ad8c2d ProjectExplorer: Simplify IRunConfigurationFactory::clone() use
Change-Id: I005d6c87142d26dfc7ae1349329737a68f54c427
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-14 10:58:30 +00:00
Alessandro Portale
5483d45e5e ScxmlEditor: Mark the plugin non-experimental
The SCXML editor has been introduxed a couple of versions ago, and it
got quite some maintenance in the meantime.
It is time to mark it non-experimental.

Task-number: QTCREATORBUG-17637
Change-Id: I7c0b0fb52e4ce5749b38fdb303f9900433d44c5d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 10:47:04 +00:00
Tobias Hunger
043035fb79 sdktool: Fix header file list
Task-number: QTCREATORBUG-19232
Change-Id: I5db60e284221775c4105dc43b0ea2a9044de6bcd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-14 10:31:39 +00:00
Eike Ziller
2d30d3ddd6 Merge remote-tracking branch 'origin/4.5'
Change-Id: Ib6739725e6b251ea962880e4b72700c5be5a192c
2017-11-14 11:24:03 +01:00
hjk
e865261c49 ProjectExplorer: Return a reference from projectExplorerSetting()
It's 40 bytes nowadays, no need to copy for accessing e.g.
single bools.

Change-Id: I3c729cb5679e725caa4faea97cdcf7ec27262dc0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-14 09:58:46 +00:00
Tobias Hunger
b39687645d TargetSetupPage: Ignore changes while ProjectImporter is updating
This causes the same kit to be processed repeatedly, which should not
cause harm, but waste CPU cycles.

Change-Id: Ie42272aacec6d8350398b65973570282c0c8d287
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 09:57:22 +00:00
Tobias Hunger
cf3640a882 TargetSetupPage: Use old importer to clean up when switching
Use the old importer when cleaning while switching to a new importer.

Change-Id: I8fd3af32271b839502571ee3806903abd927ef0a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 09:57:16 +00:00
Vikas Pachdha
8a5c7966c2 iOS: Fix missing URL scheme to fix QML profiling in iOS
Task-number: QTCREATORBUG-19273
Change-Id: Iddf34493b46ed7afcedcc7d987260e7a744e4082
Reviewed-by: hjk <hjk@qt.io>
2017-11-14 08:36:41 +00:00
Orgad Shaneh
d2b8076fec CppTools: Fix highlighting when matching with scope
class Foo {
  void funcInside() {}
  void funcOutside();
};

void Foo::funcOutside() {}

Search for Foo::func in the locator. func was not highlighted.

Change-Id: I923bd3ef2df47c5fa030b8899d1b4df7437b1820
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-11-14 07:04:07 +00:00
Marco Bubke
c973acb199 Clang: Fix reserves for clangpathwatcher
Change-Id: Ib097ea48e913df052e5a87bf886b2173e0d52358
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 15:46:12 +00:00
Marco Bubke
95c55e5c5e Utils: Fix small string layout for Clang 5.0
We were initializing reference but then accessing shortString.

Change-Id: If2d824f96b505b8f0131373916759cd868b07bdb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 15:45:48 +00:00
Marco Bubke
9678c86e40 Sqlite: Fix double throwing for reset
We do want prevent throwing again for reset if we already have thrown an
exception but we want to throw if there was no exception.

Change-Id: Iaf9fffb872ccd579a8ccde02381b5e5d30d5c4cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 15:45:41 +00:00
Thomas Hartmann
13948f102c QmlDesigner: Update id in selection indicator
If the id of a selected item is changed
we have to update the selection indicator.

Task-number: QTCREATORBUG-19267
Change-Id: I1f6b8f93fcf083972471837fd2837386adfabbad
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 13:13:02 +00:00
Alessandro Portale
35717ea88e QtSupport: Add Qt version specific feature versions
Qt 5.9:
   Qt Quick Controls 2.2

Qt 5.10
   Qt Quick 2.10
   Qt Quick Controls 2.3

Change-Id: If683b6a4ec02128120597a2adbdfa10f111f9680
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 11:34:52 +00:00
David Schulz
d2784c6805 Debugger: Set inferior device when attaching to running application
The device is needed to properly interrupt the inferior with cdb.

Change-Id: I96f3a7393770be9821d8edd7123c458399d4494a
Task-nnumber: QTCREATORBUG-19253
Reviewed-by: hjk <hjk@qt.io>
2017-11-13 11:25:42 +00:00
Christian Stenger
e7e7ee057e Debugger: Fix condition for hiding watcher's header
Introduced with 78513ecd.

Change-Id: I3549c65452feccc4807ee30bd3d47930b94f829e
Reviewed-by: hjk <hjk@qt.io>
2017-11-13 10:50:28 +00:00
Alessandro Portale
078ced511d QmlDesigner: Proper background for crumble bar
Using Utils::StyledBar, and getting rid of one stylesheet.

Change-Id: Idf4db461e6beb60e15cae9b295f13ec489146f4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 09:49:51 +00:00
Christian Kandeler
cc94fef0d2 Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: I7f477b4970310121c6dfe326cca84032c1cf4117
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-11-13 09:25:39 +00:00
Christian Stenger
11e3aec454 TextEditor: Fix missing include
Change-Id: I02914da77ce24c2748697b4bdc7208a39bb63a09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-13 08:14:17 +00:00
Eike Ziller
cc94548999 Add function for getting DiffService
Hides the implementation detail that this is fetched from the object
pool from most places.

Change-Id: I0ea06c877fade50f62b62011bbc0d2f89fa8e885
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-11-13 07:48:29 +00:00
Eike Ziller
e4085dd040 Make "Diff Against Current File" available in file system view
Task-number: QTCREATORBUG-19211
Change-Id: I635b5a43ba39c0dd63c879249c5d8a593f11ca8b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-13 07:48:00 +00:00
Eike Ziller
3136efffa0 Project tree: Make code for diff against current file reusable
The same functionality should be available in the file system view.

Change-Id: Ib31cb84924e767ebe06f595bf638a5e674d4f8b5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-11-13 07:47:46 +00:00
Orgad Shaneh
d9cb19b229 Merge remote-tracking branch 'origin/4.5'
Change-Id: I60fca091b2eac67259580acba5ae934c16d74a83
2017-11-11 19:54:32 +02:00
hjk
5ca90a4a5e ProjectExplorer: Fix copying of RunConfigurationAspects
Moving aspect data closer to real Value semantics fixes
the regression introduced by 890c1906e.

Task-number: QTCREATORBUG-19186
Task-number: QTCREATORBUG-19192
Change-Id: Ieaeef3995ae06a817f266c1e2514f9e5793bd4e8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-10 15:09:59 +00:00
hjk
7c26e3336f Kill RunWorker start/stop watchdog times in case of reportFailure
Change-Id: I2eb4d9667482edbaafe6bf780a94e440c2d39881
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-10 13:55:06 +00:00
hjk
cb14d74e47 BareMetal: Split BareMetalRunConfigurationFactory
... into two, each handling one type of RunConfiguration only.

This is temporary to allow easier removal of boiler plate.

Change-Id: I0c8427eaeef07dff06dce7824a87b222f8f05019
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-10 13:04:49 +00:00
hjk
6caece50cf RemoteLinux: Split off RemoteLinuxCustomRunControlFactory
... from RemoteLinuxRunControlFactory to create a setup where
one factory is responsible for one type of RunConfiguration only.

This is a temporary measure to allow streamlining the create/restore/
clone boiler plate.

Change-Id: I27b987b87001867b66ce797969c779fd207c5a98
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-10 13:04:41 +00:00
hjk
2d9aa5596d RemoteLinux: Remove some unneeded code from GenericLinuxDeviceTester
Change-Id: Iabf995b340a521311f9f946c05e346ef07f4b3bf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-10 11:39:13 +00:00
Eike Ziller
830bf680d2 Fix file system view layout on macOS
Combo boxes on Qt/macOS add an implicit spacing to their containing
widget, which lead to a gray border around the tree view.
Move the combo box into a separate widget to avoid the border around the
tree view, and paint the background of the file system view to avoid a
gray border around the combo box.

Change-Id: I9cb8329f585d48016896d558e817c3d978a78669
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-10 08:03:57 +00:00