Commit Graph

46254 Commits

Author SHA1 Message Date
Tim Jenssen
b18e4feac7 QmlDesigner: remove unnecessary methods
Change-Id: I17d7b7141d677b1729ee61b59fdcc14d9c576f64
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-05-27 12:15:06 +00:00
Christian Kandeler
8271277d30 Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: I9452fd110330713ea58593cc4c4f6673533b2d41
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-27 12:04:05 +00:00
Christian Stenger
ef2f37f6d5 AutoTest: Decouple item and model once more
Change-Id: I301f17dd8be7feb9dc61f483277a4835aea937af
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 11:24:27 +00:00
Eike Ziller
e2f5183a84 Fix build
Change-Id: I0c6849957a625b38cc8d75ef1c74d6ac3fee1654
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-27 10:39:35 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0'
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
2016-05-27 12:01:36 +02:00
Ulf Hermann
17ee4990d1 QmlProfiler: Allow for a maximum depth in flame graph view
It gets unwieldy and eventually it produces a stack overflow if you
have insane recursion.

Change-Id: I8ae6bf018572d9b240aec01d5d3319544799e9bb
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-27 09:47:59 +00:00
Ulf Hermann
1b9b59a45f QmlProfiler: Use origin type's ID for memory allocations
We want the editor to jump to the right source location when selecting
different events from the timeline. If all memory events have the same
ID this doesn't work. Now they of course have the IDs of the origin
events, but that's not a problem because when you select first the
memory event and then its origin, the editor position does in fact not
have to change.

As an added benefit, the typeId cannot be -1 anymore now.

Change-Id: I95520eeb3e6902e046f3f552c74dba776e7c8b62
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-27 09:42:34 +00:00
Jake Petroules
b67b3160b6 iostool: Print ALL error messages recognized by MobileDevice framework.
Task-number: QTCREATORBUG-16328
Change-Id: I45f8042dee4293bd40e204002c164eb99ac754df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-27 09:38:12 +00:00
hjk
1b650190d8 QmakeProjectManager: Add a wizard to import project for editing only
This is Heavily Inspired by the Generic project import wizard.

It basically does what we commonly refer to as "Create a dummy .pro file for
editing stuff in Creator". The result is generally more flexible (project
logic can be added to the .pro) and better supported in Creator (.pro
is first class citizen, the Generic project less so).

The qmake/make build steps are currently generally enabled but are only
expected to work for very simple projects like the typical "one file
example for teaching purposes".

Change-Id: I4976c34d423f256ea9f8f9e569c9783d90f380e3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-27 09:27:24 +00:00
Eike Ziller
685bc2cca1 Support modes with context menus.
If modes provide a QMenu, a little arrow is shown next to the mode icon.
If the user clicks there, the menu is shown instead of changing the
mode.

Limitations: Modes need to provide some QMenu instance already when they
are added to the object pool. Setting or removing the menu later will
not update the UI.

Change-Id: Ic4ef709e6200afcff14f41054a5dd98c37b0b849
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-27 09:24:02 +00:00
Ulf Hermann
d984a83611 Timeline: Encode the "stretched" property in "a" rather than "id"
The way it was before, we couldn't have negative ids.

Change-Id: I2ac07295b18020fc1a9357e15739bbf2601d20b6
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-27 09:12:53 +00:00
Ulf Hermann
4f9b4b14c1 QmlProfiler: Set all timelinemodels at once
There is no need to waste time rebuilding all the labels etc for each
new model.

Change-Id: I1ca24da7d55100b3c8efd8eea650b68b8b7c7737
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-27 09:12:33 +00:00
Ulf Hermann
c75ddf6b93 Timeline: Provide a method to set all timeline models at once
Setting a number of models one by one results in quadratic overhead
when (re)building the UI. If there are many models this quickly gets
out of hand.

Change-Id: I7f017784c3f0a6a9d7e52c881eb1d8ca4cf70886
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-27 09:12:27 +00:00
Ulf Hermann
b3b4666745 Timeline: Fix sign of height marker for timeline items geometry
The adjustment for items of small height in the vertex shader was
broken.

Change-Id: Icfaef5b1e582696240fe1ed211dbb26502cc208e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-27 09:12:12 +00:00
Takayuki ORITO
6b506b34ec Add properties to template for Qt Quick Application.
It imitate template for Qt Quick Controls Application.

Change-Id: I3440c96f06f3607b43811399427e341e73dea657
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-27 08:48:32 +00:00
Christian Stenger
bad4bac21c AutoTest: Do not use special members in base class
Change-Id: I9e110039ea886f6b0c3e6ddc7361bc9fac387abe
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 06:01:57 +00:00
Christian Stenger
aaf7181c0d AutoTest: Fix execution of test sets
Broken by 842ab2a551

Change-Id: If34eb0ae726f172b049473b8dd1c92e7b771968c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 06:01:51 +00:00
Christian Stenger
317a1d14d7 AutoTest: Unify test parse result implementations
This is also necessary for a uniform handling while adding or
updating test tree items, which in turn makes it possible to
separate model and items once more.

Change-Id: I84ff558d23490c8734b22062f00e03e8c06d6720
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-27 06:01:44 +00:00
Christian Stenger
e564abdd9a Squish: Use more stable subprocess code
Change-Id: I9a895831f9d57562a9eeb8491cc7f46c1da2eba1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-27 04:35:49 +00:00
Thomas Hartmann
1628d052fc QmlJS: Ensure linkImports() can be run in standalone test
In standalone tests there is no instance of ExtensionSystem::PluginManager.

Change-Id: I890016c4e0d2fbb41cfc0a5614e936d31e43cd0f
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-05-26 16:03:43 +00:00
Orgad Shaneh
547d18c0b9 QmakePM: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Ibcc1bc772c6cc4413ae5834a442f7d270dc4cd75
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-26 14:05:28 +00:00
Christian Stenger
a00a73a74d Squish: Fix expected failure in tst_SCOM04
Change-Id: If09e33b616356e0f0eb5aa37c035acaf2c2adaac
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:54:44 +00:00
Christian Stenger
2b57a1afa6 Squish: Fix handling of context menu on OSX
Change-Id: I6f5d50eca0199826e8af0f11016a1dfeb924f046
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:31:25 +00:00
Ulf Hermann
1d4f0ccd5c Timeline: Only load the row labels when category is expanded
The row labels use up quite a lot of memory, and most of the time we
don't need them.

Change-Id: I25d0498311eb1fc0b3cc9abc7312baa2c1211a8d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-26 13:14:40 +00:00
Ulf Hermann
d33dcac6ca QmlProfiler: Fix "Callee" vs "Caller" labels in statistics view
Change-Id: I28a134b0ae72bb87ad6849f0f70a5332ec019a50
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-26 13:14:24 +00:00
Christian Stenger
1f1a9e5870 Squish: Fix expected sort order
Change-Id: I882ad3633f7cf827aea086b5f5fd2a9204eeb482
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:07:47 +00:00
Christian Stenger
3b820cc9a4 Squish: Fix tst_installed_languages on OSX
Change-Id: I470047d663ec4c2bfebaa17baf67bc811d9c0c65
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:06:15 +00:00
Andre Hartmann
a5b7ba58f0 SVN: Show conflicted files in submit editor
So far, they didn't show up in the submit editor,
so they could be forgotten during a commit.

Unlike Git, these files don't prohibit the commit,
but at least are shown in the list of modified files
and can be diffed.

Change-Id: Ia5cac7befb870321d2048622c1fac022d979c745
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-26 12:39:29 +00:00
Tobias Hunger
5d3823ac47 Use SynchronousProcess::runBlocking
Use SynchronousProcess::runBlocking in favor of SychronousProcess::run.
This avoid nested event loops which can produce really strange crashes
if not use carefully.

This patch only converts those processes that have a timeout of less
than 5 seconds or use the default timeout.

Change-Id: I9de8899dcc946af7049ea357a91972996c0256a1
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-26 11:50:03 +00:00
Robert Loehning
b2f869c411 Squish: Test code model's reaction to decimal separator in float
Must not be interpreted as member access operator.

Task-number: QTCREATORBUG-16188
Change-Id: Iec252fbc63899cef5b004a5770e3ebee5af7188e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-26 11:48:03 +00:00
Christian Stenger
91d7886313 Squish: Fix tst_designer_edit on OSX
Change-Id: Idabdd1577373636d9b39c83447febdf4da7b04f1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 11:31:15 +00:00
David Schulz
179153829a CPP: Remove unused function.
Change-Id: Ib55fd0c059b2e5e117250eb4671b3352ab41b310
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-26 11:03:56 +00:00
Tobias Hunger
be0b7f0605 Utils: Add fully blocking way to run a binary to SynchronousProcess
This does not use a nested event loop.

Change-Id: I581acdd07546dc633ff4ce371c69b72a6f6c7a8f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
2016-05-26 10:02:21 +00:00
Leena Miettinen
32ff202a79 Doc: Describe Qt Quick Controls 2 Application wizard
Update screenshots.

Change-Id: I6069e08113cae83142d249e3f331586acce63ca9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-26 09:56:50 +00:00
Leena Miettinen
ecc419f54e Doc: Add numbers with the latest Qt green
From Diana, to be used in screenshots

Change-Id: I8ee855c4bc512c4154c2bb47d8a23b8b1458dd02
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-26 09:28:24 +00:00
Ulf Hermann
0cd9e81378 QmlProfiler: Fix compile warning about implicit conversion to 64 bits
Change-Id: Ia3f24f3b29c3ea4a9322ca21767bb5231b2ca2eb
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-26 08:39:28 +00:00
Christian Stenger
b1e9290b73 Squish: Raise some timeouts a bit...
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 05:08:23 +00:00
Robert Loehning
80ef8d11f9 Squish: Handle failing startApplication() without ClangCodeModel
Change-Id: Ic50939219c8dcf2b04423d99d0d5021de8f26afc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-25 15:34:38 +00:00
Robert Loehning
0e299cbd0b Squish: Expect failures in tst_memberoperator on Windows
Change-Id: I582109d104816545c804340c7e0d4dbe343d55f3
Task-number: QTCREATORBUG-16336
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-25 15:30:57 +00:00
Christian Kandeler
5378b8ceb9 QbsProjectManager: Fix task emission from build step.
The connect() call was not updated after new default parameters had been
added to the slot, so the additional parameters emitted via the signal
never reached the slot. Fixed by converting to new connect style.

Task-number: QTCREATORBUG-16334
Change-Id: Ia418c2980e85fa41353e23f654587aac85462469
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-25 14:32:41 +00:00
David Schulz
0ba4f52ca0 Editor: Simplify completion settings.
Change-Id: If7840fcac0c620b97082229a9f93874dc7afe738
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-25 13:56:32 +00:00
David Schulz
509c977f30 C++: Improve automatic quoting magic.
Change-Id: I5d3a15dc100ae9c03bbc49de99714da1c89cb0d8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-25 13:56:05 +00:00
David Schulz
7595aaa227 Editor: Separate auto insert brace and quote magic.
To allow enabling/disabling both features separately.

Change-Id: Ica154e3b400823de7cf22daf006958802d751c64
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-25 13:55:50 +00:00
Ulf Hermann
94fc57c005 QmlProfiler: Support server generated event type IDs
This way we only have to transmit the location and data events once per
type, not once per event.

Change-Id: Ic6ab9619824764fc8b3abf09c7b58200eda2a198
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-25 13:52:45 +00:00
Ulf Hermann
0924ee5efb QmlProfiler: Move type resolution logic into trace client
This way we will be able to use server-provided type IDs for more
efficient lookup of event types.

Change-Id: I37cd592a7829e5f36c6cfc04e400013d1dc37155
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-25 13:52:38 +00:00
Ulf Hermann
ebd6d269c2 QmlProfiler: Directly pass events from client to model
Running them through the model manager via signals doesn't make much
sense anymore.

Change-Id: I6103d281dd640493f28acd7e787ea49712ebd8df
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-25 13:52:33 +00:00
Ulf Hermann
cf02bf971c Timeline: Start items render pass with a BottomToTop node
This saves two vertices and fixes the test case.

Change-Id: Id0d7cec5412ec24720c610d704ccaeb9036ddcaf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-25 13:52:11 +00:00
Orgad Shaneh
28367148ec FakeVim: Use Qt5-style connects
Change-Id: I85bc7b6e951515768da8473cadcec02cd58d30d3
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-25 07:49:30 +00:00
Tobias Hunger
6a3bb079fd Qmake: Use Qt5-style connect in QmakeProjectConfigWidget
Change-Id: Id9e6a7bd5b0f3aa425a64ad428bdf0072480e94f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-25 07:40:20 +00:00
Tobias Hunger
b68be9e3d3 Qbs: Use Qt5-style connects in QbsBuildConfigurationWidget
Change-Id: I12626597a87a965a4a0b657b5ca19470637f30ab
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-25 07:40:12 +00:00