Commit Graph

50929 Commits

Author SHA1 Message Date
Thomas Hartmann
204970fc0c QmlDesigner: Only show warnings when opening document
Otherwise the warnings become too annoying, since they are
also triggered by undo/redo.
Do not disable the form editor in case of warnings.

Task-number: QTCREATORBUG-16306
Change-Id: Ieb1d6072269935e420e9cf988c900e1af792686f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-21 16:40:16 +00:00
Thomas Hartmann
e8b3b8140b QmlDesigner: Ensure design mode is registered
We have to call registerDesignWidget() in extensionsInitialized()
and not delayedInitialize(), because the setup of Qt Creator is
already done when delayedInitialize() is called.

Because of this, if the original widget designer was disabled,
no design mode was available.

Change-Id: I8b02fcb10aa5305aff3c700f7831012ccf009b33
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-21 16:38:32 +00:00
Thomas Hartmann
0dbec5a904 QmlDesigner: Fix crash
We have to ensure the modal dialog is actually visible
before calling process events later.

Task-number: QTCREATORBUG-16722
Change-Id: I4362a2887ee95483df082305b024232366eb074d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-21 16:38:24 +00:00
Thomas Hartmann
2b09fc7885 QmlDesigner: Make reset action aware of states
Change-Id: Idc4eb8b0f3f90d97ef3d2cd6ef64a6c49b2fcbc6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-21 16:38:15 +00:00
Tim Jenssen
a79701e8ff fix unused warning at release builds
Change-Id: I0b48f27bf86538c88b57cb85e54e9552aa89b62f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 15:38:53 +00:00
Robert Loehning
384a2a0866 ModelEditor: Remove dead code
Change-Id: I7997edc25242c7c8ed65dfb6675e7c21cf6c70b3
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 15:11:35 +00:00
Orgad Shaneh
91e9ba7ede Dumper: Remove unused function
Change-Id: Ibc8cf420170b084c05fdaf1d6a7b26594bcb3f24
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-21 14:57:29 +00:00
Christian Stenger
b82f26d3b8 Doc: Adjust documentation for AutoTest wizard
Change-Id: I2483c4270bbcce22182034f974ec4b053e515274
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-21 14:40:03 +00:00
Ulf Hermann
e8a481744d QmlProfiler: Don't crash if a statistics entry is empty
In pathological cases we might get event types without any calls.

Change-Id: Id5c9f02c95b60fe49a7cbbac511c3727ade71db0
Task-number: QTCREATORBUG-17885
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 14:16:43 +00:00
Tobias Hunger
b1826c2f7f CMake: Fix file list for "AllFiles"
Change-Id: I7f3e9d7169227483cf50bfed4659cc93372fca51
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 14:07:40 +00:00
Christian Stenger
9df203f314 AutoTest: Add missing CMake build system to wizard
Task-number: QTCREATORBUG-16916
Change-Id: I4dca90dd458789b7385013229d8447d6a8e6d360
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 14:07:00 +00:00
Tobias Hunger
00a02dc1f8 ProjectExplorer: Fix crash when setting root project node
Change-Id: I13954bffd06bee2aaf248d26cf358a0cc674d139
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 14:05:45 +00:00
Ulf Hermann
f51d554bd1 Qml Debugger: Properly handle JavaScript null
The QML engine might (in the future) actually send the right message
to indicate a JavaScript null, that is:

{ type: "object", value: null }

This piece of JSON is then transformed into a QVariantMap. The QVariant
that signifies the null is unfortunately different across various Qt
versions. We can, however, detect it.

Change-Id: I3db42bb35a936bc02c749ab3a136b1d297aefdfe
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 13:35:03 +00:00
Robert Loehning
8f94691ad6 BinEditor: Avoid overflows in dataLastIndexOf
Change-Id: I1f248f0c11209c60714f949d8f052326e86c9354
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 13:01:00 +00:00
Leena Miettinen
0936107579 Doc: Describe the experimental Silver Searcher plugin
Change-Id: I0a805a9f9a9f68175720eacd09ba7bdad9db92b0
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-21 12:55:16 +00:00
hjk
58214f09e3 QbsProjectManager: Code cosmetics
Remove unused QbsProductNode::findGroupNode and productPath.
Also, simplify setup of static icons.

Change-Id: Ibfaa1398eefcf3f764173d5b37aa4382b68976c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 12:49:46 +00:00
hjk
ebae6426f8 ProjectManager: Remove SessionNode
Instead, get root project nodes directly from the project.

Change-Id: I5cf95a7dce1fa29c1adc26013ad03cc017f38a6d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 12:48:41 +00:00
Robert Loehning
312784a930 QmlProfiler: Avoid overflows in loadEvent
Change-Id: I23271d6dc8ede3f76ef712547519b04dc86d94a6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-03-21 12:39:57 +00:00
Tim Jenssen
8b1b5e9a80 fix warning "there is */ outside of a comment"
Change-Id: I86d7ce281a7395f9be4d74f353d7d57c7bb5dedc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-21 12:32:40 +00:00
Robert Loehning
9a9f1f9cfe QmlProfiler: Add comments about deliberate fallthroughs
Change-Id: Ia9a7d62f8f3dbc753f2746f3f53f5557d9607d45
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-03-21 12:19:22 +00:00
Orgad Shaneh
1364336254 Utils: Remove old style connection
Change-Id: I725a1611cd5547e51d3acb3802938c91cbf32cf4
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 11:57:16 +00:00
Christian Stenger
da03ab72af Tests: Exclude connections check for cdb
Change-Id: I1f3a1ed0bb130a7d4dc413c15c4fd32cb496a7ab
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-21 11:25:37 +00:00
Christian Stenger
b86011c375 AutoTest: Avoid dead-lock of file system watcher
Calling addPath() on the watcher could dead-lock on some operating
systems as we were in an asynchronous process.
Avoid calling addPath() from inside an asynchronous process and
perform this call from synchronous context.

Change-Id: I94cd401e12ccbb3526b8cc4232a9cff7ed552bbb
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-21 11:25:20 +00:00
Robert Loehning
4bdfebb4dd Macros: Add missing break
Change-Id: Icec6312195cd069f8a50fc3a378c7f4449082134
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-21 10:51:58 +00:00
Leena Miettinen
897ce16452 Doc: Describe changes in the Search
Change-Id: I2c4450719203383bae9951c75863fe90504a2d13
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-21 09:44:08 +00:00
Eike Ziller
4275fe1bbf Welcome: Use specific role enums instead of UserRole arithmetic
Change-Id: I7cbcbf8f4dcf22d2b780af295f577f82fff4c275
Reviewed-by: hjk <hjk@qt.io>
2017-03-21 09:17:27 +00:00
Thomas Hartmann
47d24fe33c QmlDesigner: Add Q_INVOKABLE for QML
Change-Id: I9541357498c0d0dcf24841a22f9bf5e3b08dc745
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-21 09:16:53 +00:00
David Schulz
f32b1d00f4 Debugger: Adjust offset for QFile dumper
Change-Id: I20704cdcdda1273cdc0df91bf963c979a1f51190
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-21 09:04:41 +00:00
David Schulz
33e8f2e099 Debugger: Fix QObject detection on Windows
Change-Id: I054161dfde0c03167a6d57861b069c403330e746
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-21 09:04:34 +00:00
Christian Stenger
ae63f89f35 AutoTest: Reduce auto test wizard to useful parts
This patch reduces the former wizard to the test project part.
The wizard appeared more or less useless as there was no easy way
to add test cases later on and you normally do not need to have the
full skeleton of the project including a test sub project - except
when starting a TDD project.

Change-Id: I404d843b29f058876ea9696b7881f2e5e11b6af2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 06:17:05 +00:00
Orgad Shaneh
16d2a10a1b Gerrit: Fix wrong references in REST parsing
* Fetch url/ref
* Patch set number

Change-Id: I1aec8850add21dc269326c637b246ba62266b889
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-21 06:14:25 +00:00
Eike Ziller
42333ec1d2 Welcome: Fix visibility of session tool tip
It was not shown at all for collapsed items.

Change-Id: Ia1e3590cc5ed6ad01eefad2465e7f7586c50603f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-20 16:13:18 +00:00
Orgad Shaneh
da30b1d9dc ProjectExplorer: Remove unused constant
Added by mistake, belongs to a pending change.

Change-Id: Ie9d8fe91d73d9032452261a5cdf27ad0a82d494e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-20 15:44:57 +00:00
Robert Loehning
262141a0dc Squish: Make workaround permanent in tst_simple_debug
The fix is in 4.3

Task-number: QTCREATORBUG-17492
Change-Id: If155bd9b16a119e7b91161788708c21653222f8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-20 15:06:34 +00:00
Orgad Shaneh
a4e23025f0 TextEditor: Complete transition to Qt5-style connects
Change-Id: I78c84254a5ea56b5f9a478b6e1c9b4ed58937687
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 14:57:26 +00:00
Orgad Shaneh
0170e10af1 QmakePM: De-slot
Change-Id: Ib782dc0436cbefc4792f5221f5512c462436e312
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 14:55:31 +00:00
Ulf Hermann
23fdc4bddc ProjectExplorer: Don't call kitUpdated() if nothing has changed
Otherwise this can lead to infinite recursion. The android integration
reacts to kit changes by examining the available Qt versions and
creating additional android kits. This crashes, eventually. Also,
kitUpdated() is rather expensive, so we shouldn't call it if we don't
have to.

Change-Id: Ic5fe26f6b174c5b96a6ed8280bf744bf642863b2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 13:49:10 +00:00
Thomas Hartmann
5000c7b5f6 QmlDesigner: Fix regression
With the old connection syntax the correct overload was explicit.
We listen to the original signal from QAction.

Change-Id: I0c8620148ebcb1ae0fceeefe54069c57c881423f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-20 12:27:45 +00:00
Orgad Shaneh
61d6f84e25 Designer: De-slot
Change-Id: I6e4a80187646afe342a03ed31c3404fdc27cccc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-20 12:14:29 +00:00
Eike Ziller
7694c718db MapReduce: Optimize cancelling between thread start and exec() call
The existing logic works because the future watcher gets the canceled
signal even if the future was canceled before connecting the watcher and
starting the loop, and we schedule jobs before we start the loop and the
watcher gets the signal. But it is still better to avoid scheduling
anything at all in this case.

Change-Id: I3fa722bdd8391de7c7f3ba3fd8b1aaa65d9d2392
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-20 12:01:55 +00:00
Orgad Shaneh
9d8f4c3a0d QtSingleApplication: Remove unused QtSingleCoreApplication
Change-Id: I0a289126ccc6def2e2b129332b64bed1971b6558
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 11:39:24 +00:00
Orgad Shaneh
6031892f96 VCS: De-slot
Change-Id: I805eb88dee7ec1243d59c32be23f2fb401f1f46e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 11:39:01 +00:00
Orgad Shaneh
a18f405ba1 Remove unneeded includes of projectexplorerconstants.h
Change-Id: I458c3299c13ffa4b25af52a570d82b4405cb669f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 11:07:25 +00:00
Orgad Shaneh
b2c74838e2 Core: Remove slot-by-name reference
Replace by lambda.

Change-Id: I50a4a8b6db9790d06b3f60f5de7691b85f54995c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-20 10:59:47 +00:00
Orgad Shaneh
e9296db573 Core: Place "private slots" inside WITH_TESTS section
Change-Id: I380437087e0dd8d258b11c04941174857d9c7b13
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-20 10:59:39 +00:00
hjk
8b8ba51ef3 ProjectNode: Let add/removeSubprojects operate on single files
That's the only way that is used.

Change-Id: I57e7942f9dccf74ff7588c3bca0ccf05f528a3df
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 10:56:34 +00:00
Orgad Shaneh
8b5867dd8e ClangCodeModel: De-slot
Change-Id: I9e4520a1a1baec9a900a659931686fbc99123d3c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-20 10:43:01 +00:00
Orgad Shaneh
5221d5f06a QmlDesigner: Use Qt5-style connect
+ De-slot where possible

Change-Id: Ibd2edbef7b7712aba20593bd0417940e828e0c9c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-20 10:42:45 +00:00
Orgad Shaneh
f87c1eba68 C++: De-slot
Change-Id: If4562fff4271dd8be3ec2b3394fdcbe5a9cb4e50
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-20 10:42:39 +00:00
Orgad Shaneh
98f76ff26f Qmake: Expand variables in the arguments preview
Change-Id: I422417fbbfa86c39c8a79a593cedd87b208735f4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-20 10:21:01 +00:00