Commit Graph

32962 Commits

Author SHA1 Message Date
Erik Verbruggen
c95072643a Help: remove slightly confusing dead store.
The dead store is not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I244c57e3227d075cb625252e8246c22768bc275c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-12 10:59:36 +02:00
Erik Verbruggen
7a5c73b87b CVS: change QTC_CHECK to QTC_ASSERT and remove dead stores.
When the QTC_CHECK would fail, a nullptr deref would happen directly
after the check.

The dead stores are not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I83db386e3f0de583469e1576e28955c25930b3b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-12 10:59:12 +02:00
Erik Verbruggen
55130a335e C++: prevent possible nullptr deref.
Change-Id: Ibc138bcfdef4b6a5dd154e819d568398ecace982
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 10:59:03 +02:00
Tobias Hunger
20d7faa247 KitInformation: Send notification on updates via the kit
This fixes blocking of these notifications.

Change-Id: I49a1efd4506fe66b1f78e9489360cfb68edd8fab
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-11 18:08:35 +02:00
Eike Ziller
c0622d9e95 Avoid + icon when dragging files from project tree
Change-Id: I286f6bfbb647111b6ae9ad90c5171499382b2e71
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 17:54:17 +02:00
Eike Ziller
f9aa95ce17 Editors: Support dragging from file system view to splits
Change-Id: I17d08fa3cf018f036f88f6be027e4c3740e90f74
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 17:54:02 +02:00
Christian Kandeler
686bce1663 QbsProjectManager: Do not offer to remove qbs files in context menu.
Such build system files must be filtered out, as they do not appear on
the right-hand side of "files" properties and have completely different
remove semantics.

Change-Id: I3963aa853003f4d674392434529dab19749af25b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-11 16:25:28 +02:00
Christian Kandeler
cd3bd67d77 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I474a2cdfbc99a82cd075ee785d2530a8a5f012e4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 16:03:12 +02:00
Daniel Teske
17bc4551ef KitModel: Fix crash on adding android qt version
createConfigWidget() calls KitManagerConfigWidget() calls discard(),
which results in a signal unmanagedKitUpdated. In response to that
signal, the KitModel iterates over all kit nodes. The node we are
currently creating doesn't have a widget yet, and thus leads to a crash.

Prevent that by adding the node only after the widget has been fully set
up.

Change-Id: I5b14be1c7363e480e3dd938853ff06c595993fc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-11 15:58:25 +02:00
Erik Verbruggen
a83bf58b88 Project Explorer: fix possible nullptr derefs and remove dead
The dead store is not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I18084c357696311b6556c7bc60832a72b3318e92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 15:36:27 +02:00
Gabriel Hege
b3bc530cd0 Android: accept() device-dialog by doubleclick
Change-Id: I6b405b8eb9cc461b6081e3711be54c8d580e02b6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 15:26:18 +02:00
hjk
d5d1aed299 BlackBerry: Work around over-eager -Wmaybe-uninitialized
Change-Id: I701d01a935bdbb65808de65cf2a994a5d68cf1d4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-09-11 14:55:13 +02:00
Erik Verbruggen
f1b90c1e5f CDB: prevent possible nullptr deref.
Change-Id: I111b4620effc45f26f40880875a70d606c924f69
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-11 13:01:27 +02:00
Erik Verbruggen
c3c43d087e Debugger: remove dead stores.
The dead stores are not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I8bf61c51207f0339911bc07fcfbc06f8066521e5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-11 13:00:56 +02:00
Erik Verbruggen
000fbf24da ValgrindFake: prevent clang static analyzer alarm bells.
The divide by zero is intentional, so suppress the not-quite-so-false
positive from appearing.

Change-Id: Iba96682e5b584a7e4a8e5895af0ccfc68b73cc71
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-11 12:58:23 +02:00
Nikolai Kosjar
1f53ecd898 Revert "C++: add support for resolving typedefs for template arguments"
This reverts commit c228b36ccf.

There are multiple issues with the reverted patch:
  * Infinite loop due to indirect recursion e.g. when opening projectmodels.cpp
  * Crash when executing CppTools tests on Windows (no infinite loop)

Change-Id: I38f02132ca57d3d32085db6146d0df7d620d7618
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-09-11 12:55:02 +02:00
Erik Verbruggen
5d0eb9bd9c QML/JS: fix improbable nullptr deref in possible future use.
The ast parameter cannot be null, because the only use checks for it not
to be null. However, if it would ever be re-used somewhere else, the
logic is plain wrong. Clarification by an assert makes it clear what the
intent is.

Pointed out by the clang static analyzer.

Change-Id: I2c8cba5e5847fc1f92c10021109c55ff8ccd58c4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-11 12:54:30 +02:00
Christian Kandeler
57527c2708 SSH: Do not always emit an error if an SFTP channel exits.
Channel exit is completely normal if we closed the channel, so this must
not cause an error message.

Change-Id: I57f5165b339a52a25118ad5e357f41334dadebc4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 12:52:23 +02:00
Erik Verbruggen
3b6d204304 QML: prevent nullptr deref by returning when we detected an error.
Change-Id: I46d351e517d575bff158a4c9e785645462023ae9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-11 12:51:17 +02:00
Erik Verbruggen
656b9f7396 QML/JS editor: make QTC_ASSERT actually useful.
Change-Id: I32f2ee037b372c54ae41ea1b3626365e4f201118
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-11 12:51:02 +02:00
Fawzi Mohamed
12b583564f qmljs: make refactoring work on Object Bindings
“Move Component to Separate File” and “Wrap Component in Loader” did
work only for UiObjectDefinitions, extended them to UiObjectBindings.

Task-number: QTCREATORBUG-12904
Change-Id: I5216110c1edfc6e4536f83eba39e74919c918d50
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-11 12:42:31 +02:00
Christian Kandeler
38ffff88da SSH: Fix maximum packet size check.
The statement in the RFC was misunderstood.

Task-number: QTCREATORBUG-12884
Change-Id: Icd533362ebf95d963cacc8d11da03360e742f070
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 12:35:32 +02:00
Eike Ziller
d19628ddf8 File drag&drop: Move mime data creation to central place
Especially when this gets more complicated with additional fancy windows
mime types and custom mime type for opening a file at a specific
location (dropping from Outline, Type Hierarchy et al), we should not
create that complex mime data everywhere by hand.

Change-Id: I37f6ceb287b0cd055501fdd033ac29816434a020
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 12:32:41 +02:00
Erik Verbruggen
e815fdac76 Qmake Project Manager: make QTC_ASSERT actually useful.
Change-Id: I0ca381dca2f7a50e3638f10c77db9b6621fb32c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 11:48:32 +02:00
Erik Verbruggen
4f4b125726 Project Explorer: replace a QTC_CHECK with Q_ASSERT.
When the check would fail, it would result in a nullptr deref 3 lines
down. As this is a constructor, doing a QTC_ASSERT(..., return) would
leave the object partially initialized, with some fields containing
random garbage.

Change-Id: I823d52d43d90eaf06cb7d7cd64fbee17e5fc889e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 11:48:21 +02:00
Erik Verbruggen
9e4d1709b5 Core: fix possible nullptr deref.
Change-Id: Iaa9182579afa19c9c8f184f964eeace3bc7b7906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-11 11:48:05 +02:00
Thomas Hartmann
060c5db5d3 QmlDesigner.PropertyEditor: Fix regression in SliderSpecifics
Change-Id: Id71d3ec192a030ead81bb7746681b18cb9d79e27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-11 11:43:45 +02:00
Daniel Teske
975186c7fc New Project Wizard: Fix displayname of "None" node on project selection
Was broken in 5969c01fa6.

Change-Id: I5e6e20ae8570e7c49cb87f429f6d65993fe4618e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-11 11:42:36 +02:00
Erik Verbruggen
f52c1db02f Help: fix possible nullptr deref.
Setting QTC_HELPVIEWER_BACKEND to "native" when the native backend is
not compiled in, would result in a nullptr deref.

Change-Id: I5618650e0c4ae1c986a54a46232e8f782e43f350
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-11 11:32:46 +02:00
Erik Verbruggen
7f2e3fc296 Editors: change QTC_CHECK to Q_ASSERT to prevent nullptr derefs.
When the check would fail, it would result in an nullptr deref 4 lines
down. As this is a constructor, doing a QTC_ASSERT(..., return) would
leave the object partially initialized, with some fields containing
random garbage.

Change-Id: I7e504f16f3bd07e3669c02773434915bc817c8bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-11 11:30:36 +02:00
Thomas Hartmann
17c313756b QmlDesigner.Instances: Do not use Qt kit for fallback puppet
Change-Id: I825c7f2380a376b30cc647942aa7d252aa9d36df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-11 11:15:49 +02:00
Leena Miettinen
997e1fe793 Doc: fix labels and tooltips
Fix capitalization, punctuation and typos, and remove
unnecessary text.

Change-Id: Iee39e465125d5d9eec099323fb7d75756c8d81df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-11 09:39:29 +02:00
Christian Stenger
de69b82c85 Core: Fix compile
Change-Id: I4910c6a8de05a7ceead5b25c877ec2892be4affd
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-09-11 07:53:37 +02:00
hjk
47a36765df TextEditor: Prevent overwriting of completion settings
This was a regression introduced during the editor setup refactoring.

Task-number: QTCREATORBUG-12982
Change-Id: I7b26b4105dfb50357dd2cf97d07153031d0b2dc0
Reviewed-by: Campbell Barton <ideasman42@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-11 07:37:35 +02:00
hjk
b1ab94301a OutputPaneManager: Compile fix
Change-Id: Icb4dca2d814aebb1d55881a38294c955c515e1a4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-11 07:37:03 +02:00
Alessandro Portale
dc8b8f92e7 Core: High-DPI support for output pane buttons
Replaced the style sheet and sub-widget by plain painting code. At the
same time achieveing high-DPI support by adding the @2x variants of the
border images.

Change-Id: I09804e3349b4650c7c6cfc2341913079a51a52a7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-10 22:16:02 +02:00
Orgad Shaneh
610c999e0c ClearCase: Initialize checkout dialog after sync has finished
If it is initialized too early, activities combo is empty.

Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-10 18:13:11 +02:00
Fawzi Mohamed
d272e0cc3e projectexplorer: avoid excessive kit updates
unblock did always assume something changed (and mustNotify not
correctly set)

Change-Id: Id2133b55ef27110a41be22d1f769fd987aa11033
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-10 18:12:49 +02:00
Eike Ziller
a439d939e6 Remove more Qt version checks
Change-Id: I4440b7a9fb2c16b10deab8e8abfcb0eaa8bb45bb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-10 17:04:10 +02:00
Ulf Hermann
76287aa2a1 QmlProfiler: Lock the overview painting to the frame rate
If we take longer than a frame for painting a pass we don't really gain
anything.

Change-Id: I6be5cc59116d3eb5d3ef6a863f4cf410333c7e91
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-10 15:57:20 +02:00
Ulf Hermann
82793e7339 QmlProfiler: Try harder to obtain a canvas context
The QML canvas is notoriously bad at keeping its context around. This
workaround gives us a valid context in many of these cases.

Change-Id: I6c23aa2b44c10a48cdb89c66a2861ab8d31bcfc8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-10 15:56:53 +02:00
Ulf Hermann
f3bdba6c77 QmlProfiler: Paint overview binding loops in separate passes
Change-Id: If1bca8eb9b3db2d0249b8679e58ffd2fdebfc6d5
Task-number: QTCREATORBUG-12950
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-10 15:49:37 +02:00
Ulf Hermann
2677e33782 QmlProfiler: rename relative height of timeline items to "relativeHeight"
This clarifies that the item height is not absolute but relative to the
row height, and it reduces the ambiguity of the various "height" methods.

Change-Id: I391441147c88b47a14e539fc3853702bb517d27b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-10 15:43:00 +02:00
Finn Brudal
9e52d0c6d4 Do not build unconfigured projects when selecting Build All
Change-Id: I02521ff6947aa386dca941061a0c44d783b61ec4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-10 15:12:56 +02:00
Thomas Hartmann
b6eac08c2b Only insert SideBarWidget for existing id
Task-number: QTCREATORBUG-12974
Change-Id: I69cacab32de0454a78c5a67edcc7dcbbdcb12784
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-10 15:03:33 +02:00
Thomas Hartmann
95182687f8 QmlJS: Add error message for invalid root item in the designer
Documents with those types do crash the qmlpuppet and confuse the users.
With this patch we give a clear error message and such files are not supported
anymore.

Change-Id: Iba19def2751d4dc81d90684c0c63c0274fdf49cf
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-10 15:03:22 +02:00
Thomas Hartmann
5f0da502a4 QmlDesigner: Adding UI option for fallback puppet.
This patch adds an option to configure the usage of qml(2)puppet.
By default the qml(2)puppet that comes together with Qt Creator is used.

Change-Id: Idada8457e81fa17d3290dc97ded303aab475a9f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-10 15:02:56 +02:00
Tobias Hunger
8e18fd08a2 Utils: Make wizard pages derive from Utils::WizardPage
Utils::WizardPage has a bit of helper code to the Utils::Wizard to
query registered fields later on. Without this code it will print
warnings whenever something tries to read a field that does not
exist.

Make the wizard pages defined in Utils export some fields.

Change-Id: I907be327a8b1b8691f90773470630582503d294a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-10 14:07:15 +02:00
Tobias Hunger
be9e4d71b3 Macros: Initialize some members in constructor
Detected by CppCheck

Change-Id: If47fcf7e256863eeabbfb9eace411d32238224c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-10 13:58:56 +02:00
Tobias Hunger
3646b0b697 Blackberry: Initialize variables in constructor
Detected by CppCheck

Change-Id: Ic54c1e2939b0f51cdce160484ab85aad6bf2df6d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-10 13:58:36 +02:00