Commit Graph

38241 Commits

Author SHA1 Message Date
Erik Verbruggen
7290c43da1 C++: update project info once after finishing adding all project parts.
So that recalculating the information is not O(n^2) but linear.

Change-Id: I69903e0b5ad321d071804d782ad634a3f300e71a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 17:42:32 +02:00
Francois Ferrand
9c1f44e942 [Valgrind] Use standard font for currently selected memcheck entry.
The current item was displayed using the hardcoded "monospace" font, so that the current/system
font and size was not used. We now use start with the same font as the error list, and simply
activate 'fixedPitch'.

Change-Id: Ifcf6f0fc044e47b3a57281f6af2d70b7f1c618e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-12 17:03:44 +02:00
Nikita Baryshnikov
87bcfab099 CMakeManager update connections to Qt5 style
Change-Id: I0e44d60aa22eeb7da9020f6028899a42f07e212f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 16:32:31 +02:00
Ulf Hermann
9ca42dacf3 QmlProfiler: Don't process all events twice when loading traces
At the end of QmlProfilerFileReader::load() we have a perfectly valid
set of types and events which we can just pass on to the model as-is.

Change-Id: I6981663f409c4647f4d5ae8a73b5d14cc701017b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-12 15:44:28 +02:00
Erik Verbruggen
ce49f92cb7 Clang: remove dead code.
Change-Id: I06bac5443af41a27c2641199948705c45e8a4586
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 15:42:42 +02:00
Ulf Hermann
b4f336f142 QmlProfiler: Add EngineControl
With EngineControl multiple QQuickViews can be profiled in one
profiler if they're all running in the same thread. As the QML
engines are never run in parallel then this results in useful
data.

Change-Id: I83a34fb81fd466c5cac838b096c1b1f322ded882
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-12 15:40:48 +02:00
Ulf Hermann
165f759e18 Editors: sync the layout with the contents before setting text cursor
Not doing this makes the QPlainTextEdit interact with an invalid
layout, potentially causing crashes. Now the cursor setting itself is
not part of the undo stack anymore, but as undoing sets the cursor
itself, that shouldn't be a problem.

Change-Id: Ic6f8ee9781faed655ac20f058b562c098ced20ae
Task-number: QTCREATORBUG-12987
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-12 15:36:18 +02:00
hjk
2776536a7e Debugger: Fix QHash display of "compact" keys
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-12 15:36:01 +02:00
Nikita Baryshnikov
d38e8283df CmakeProjectManager remove stale methods
Looks like they are zombies scince
b419403b0f

Change-Id: I5fe0c728dcce1931e543e15f04ae24e0c65db61a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 15:19:58 +02:00
Nikita Baryshnikov
c363ce4263 CmakeProjectManager decrease N of included headers
Change-Id: I4b216e9e228668c7e01bc31c30334397cb07b15e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 15:19:48 +02:00
Tobias Hunger
ffe432e8d8 Fix string
Remove the '.' as the VariableManager will append text starting with ':'
to that textFix strings.

Change-Id: I490319fac964ea8fd8078dff90ec81c9bdef8d09
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-12 15:00:48 +02:00
Christian Stenger
602746950b Scripts: Fix deployment of qmlpuppets on OSX
Change-Id: Ic312423ff7d79b652379d7512a75be043a33740b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
v3.2.1
2014-09-12 14:16:03 +02:00
Orgad Shaneh
ad957282c8 Debugger: Cleanup
Change-Id: Iaf7a3d69d920f8096763e2d8033df2d6371683a7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-12 13:58:47 +02:00
Eike Ziller
50ad2a4d99 Editors: Support drag and drop from open editors pane to splits
Change-Id: I6f8685319f0afe2a326a66e36a1e6b671e317614
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 13:00:30 +02:00
Eike Ziller
0e0471d698 EditorToolBar: Show editor context menu when clicking on file icon
Change-Id: I0a66d7a2a77ed0b2c7c87005887a7847bb9ee5f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 12:56:02 +02:00
Eike Ziller
e0c5d2365f Support drag and drop between splits
Change-Id: Ia1e43cb44639e332ee4f9100c7ce3029e9485198
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 12:55:51 +02:00
Erik Verbruggen
67421f6c53 C++: fix invalid nesting of if statement.
Reported as a dead store by the clang static analyzer.

Change-Id: Id5eb72ea4698a17486b8a05d88ee66f3fd89bcfc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 11:31:56 +02:00
Erik Verbruggen
4cfb7a62b7 C++: remove dead store.
Pointed out by the clang static analyzer.

Change-Id: I2d73d4c9ef2511c5697a4e4da89b61efb1149a3f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 11:31:51 +02:00
Erik Verbruggen
ebcd4ce8db C++: fix possible nullptr deref.
Pointed out by the clang static analyzer.

Change-Id: I69ab89e651cbcb13606d5d93a05f629172cbd9e0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 11:31:46 +02:00
Tobias Hunger
0ed377466c AbstractMacroExpander: Allow escaping of %{Macros}
Use "%{}" to put a literal "%" into the output of the macro expander.
E.g. "%{}{Macro}" will be turned into "%{Macro}"

Change-Id: I592789e5cd8f2d52df424db679baf7ba04723202
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-12 11:28:48 +02:00
Thomas Hartmann
4114297992 GlslEditor: Remove unused include
Change-Id: Ia531698eacab0f0c4f20f1bc1c54d59e7c2df010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-12 11:07:51 +02:00
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
Christian Kandeler
f511344ed0 SSH: Fix tunnel test.
Since we're opening the port for IPv4, we must also use an IPv4 host
address.

Change-Id: I73e009ebd6deb0bd6804cddc8c83299dbfc1b312
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 13:19:56 +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
67d18670a3 SSH: Adapt test to signal renaming.
This was overlooked in the original patch.

Change-Id: I1709e28552ed9dd83bd3e810ba51ef5ec95d8580
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 12:52:41 +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