Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
0043c721c2 CMake: Pass STATIC types on cmake execution
Change-Id: Ie3401d009044a46af7fac314d1f29975543a44b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-30 11:34:26 +00:00
Orgad Shaneh
6531ff5672 CMake: Unindent a lambda
Change-Id: I71af11e3fba9a47c24b06bb19617ab212ee5b8a1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-30 11:34:07 +00:00
Orgad Shaneh
44b0ca4754 ClearCase: Adapt to removed signal
Change-Id: I6296f23af08890cc82880715db7c84f51d9cd6ce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-30 11:28:58 +00:00
Ulf Hermann
b523eed434 QmlProfiler: Remove QmlProfilerPlugin::instance
We're not using it anymore.

Change-Id: I036d472d0be884f617d000d2077e58ba5b527da9
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-30 10:31:47 +00:00
Alessandro Portale
ac6e4a13ce PluginManager: add Windows 8 and 10 to getPlatformName()
Change-Id: Id2ff33784f98529c293b770f11340ae27fbe3ab7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 09:13:42 +00:00
Takumi ASAKI
cfd69678d2 Help: Fix translation context
Change-Id: I36f854eb56fed17b736af8390da08b01d72ee418
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 07:50:43 +00:00
Takumi ASAKI
d165122526 PythonEditor: Fix translation context
Change-Id: If20dc0ec6b886df8fde9961dc86cb44b78ec520a
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-30 07:50:24 +00:00
Shinnok
14ca25f3c1 Add Ctrl+[n,p] Locator keyboard movement shortcuts.
On OS X, Ctrl+n and Ctrl+p, the Emacs bindings for next and previous,
are global throughout the system. In Qt Creator they work for menus,
code completion widget and other places like Vimium plugin, but not
the Locator widget. This change adds that functionality to Locator
too and makes navigating Locator items easier.

Change-Id: Iebce53d55841ba97d35ad2d433b0d9840d5e4137
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-30 07:39:35 +00:00
Ulf Hermann
3d59c99143 QmlProfiler: Pass AnalyzerRunControl to LocalQmlProfilerRunner
It doesn't make much sense to require a non-exported class to be passed
to the ctor of an exported one.

Change-Id: I15463f3ec0153a71cb55ad83724ec071a504a483
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-30 07:26:50 +00:00
David Schulz
c422b81316 Move completion settings page to TextEditor plugin.
Change-Id: I12b7828d23d599e5903237d0cc2a3c0440e1b07d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-05-30 07:15:03 +00:00
Orgad Shaneh
702fd2e62c CPaster: Use Qt5-style connect
Change-Id: I22cbec892d1f0cd347929308f6aab40d9483fd88
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-05-30 06:57:02 +00:00
Orgad Shaneh
928ba8aa84 CppEditor: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I5ee3678f8293486cccfc634aaab5c75b066ed011
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-30 06:51:08 +00:00
Orgad Shaneh
3b669a37cd ClassView: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I6aac0c1e66b24bb8b638aee906f9f355d2e23d48
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-30 06:43:47 +00:00
Eike Ziller
729a7345f4 OS X: Fix warnings in MacWebKitHelpViewer
Change-Id: I8c8c385d9610f8e2a4ca0f1c921cc9d3b3de4267
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-30 06:30:55 +00:00
hjk
7a80f2f01e TreeModel: Take responsibility for some of the casting
This adds a templated layer on top of TreeModel that can specify
item types for the top three layers in the model, relieving user
code from some of the previously necessary type casting.

Two common setups get an extra layer with convenience functions
on top: TwoLevelTreeModel for two-level model with a first level
of static headers and a uniform second level, and UniformTreeModel
where all non-root nodes are the same.

"Untyped" plain TreeModels are still possible.

The walkTree() feature and untyped iteration in the base
TreeItem and TreeModel is retained for now to ease transition
in downstream modules, but is planned to be removed soon.

Change-Id: I67d75a1a4e18e8f254dbfb458db03510d8990d8b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 06:25:48 +00:00
Orgad Shaneh
ded0b1c4f5 HelloWorld: Use Qt5-style connect
Change-Id: I6517b157130893800e39016aa346d26c16195103
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 06:04:42 +00:00
Vlad Seryakov
a4116259bc OS X: Avoid multiple slotLoadFinished calls
Seems like Web delegate is not consistent enough, we need to keep track
ourselves.

Change-Id: Icff1f6b5a642df73eb2e80dd74baf44257e3e28e
Reviewed-by: Vlad Seryakov <vseryakov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 05:46:37 +00:00
Christian Kandeler
b4e11b191b QbsProjectManager: Prevent transient build dirs from becoming permanent.
If "dry run" is enabled for the project resolving step, then the rule
execution step needs it too.

Task-number: QTCREATORBUG-16343
Change-Id: I6db7ad68b447299d2b4848f128a262e6097786d4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-27 17:45:53 +00:00
Christian Kandeler
d89fc0bfea QbsProjectManager: Logging improvements.
- Make messages with level "warning" or "error" appear in the Issues
  pane.
- Do not suppress messages of level "info". People add "console.info()"
  calls into their projects for debugging and they expect to see the
  output in Creator.

Task-number: QTCREATORBUG-15983
Change-Id: I6c84bc1ef08dbf85d7e88af864b18f64fcedfe1a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-27 17:42:47 +00:00
hjk
d57a261e89 Debugger: Remove some outdated test helper code
Change-Id: Ib60415aa1ff8d74ae041b31f69a9bc510b3a769c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-27 12:46:00 +00:00
hjk
74b6d2e708 Debugger: Clean up GdbEngine member data on finish
Restarting with cached outdated information is problematic.

Change-Id: I396da2fef96a161c1ab150134b8e65a758a16d58
Task-number: QTCREATORBUG-16355
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-27 12:34:20 +00:00
Tim Jenssen
3c2dc15f6d QmlDesigner: allow adding connections in ui.qml files
Change-Id: Ia4d9f01f41ca2bca1eca0df3cf121ae2800e31d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-05-27 12:15:46 +00:00
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
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
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
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
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
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
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 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