Commit Graph

38241 Commits

Author SHA1 Message Date
Tobias Hunger
513e5401f1 BaseTextEditor: Remove duplicate static functions
Change-Id: Ic2a82e109418162ecb62a05ac63daade710d111f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-24 13:10:24 +02:00
Orgad Shaneh
52574da031 QmlDebug/QmlProfiler: Fix MSVC warnings
qmlprofilertraceclient.cpp:280: warning: C4334: '<<' : result of 32-bit
shift implicitly converted to 64 bits (was 64-bit shift intended?)

qmlprofilertool.cpp:539: warning: C4554: '<<' : check operator
precedence for possible error; use parentheses to clarify precedence

Change-Id: Ifaa048d42bccf203e6587a474c197c22b0f69fec
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-24 12:35:38 +02:00
Orgad Shaneh
7aed3d3d76 Designer: Remove unused ctor argument
Change-Id: Ifb87032be0295f4fb9be32233989392afc3ff7c0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-24 08:02:11 +02:00
Tobias Hunger
06615843df Qbs: Do not crash when using simplified project view
Root cause is trying to set the display name on a FolderNode that
is not in the tree yet.

Allow setting the displayname in the constructor and use that new
constructor where it makes sense.

Task-number: QTCREATORBUG-12897
Change-Id: I907e48cac837966e38524bfe88a87ef17d93f0b2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-23 15:46:37 +02:00
hjk
917aa1064e FakeVim: Factor out some test code
GCC 4.8.2 starts choking on the test size.

Change-Id: I65c80917c9bad067bb7d8e69e2431dd1c4886b08
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-23 15:45:38 +02:00
Mitch Curtis
7fde14f0c7 testwizard: put _data function before test function.
Most Qt tests follow this order.

Change-Id: I261f425a33538ca3f19d9da7ec09061677c2b627
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-09-23 14:44:55 +02:00
Eike Ziller
fd9b2af921 Editors: Support drag & drop from bookmarks pane
Change-Id: I9b68d35b04968779f111885ba7a24f18fecfada5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-23 13:05:47 +02:00
Fawzi Mohamed
92f94ab4b1 iossim: correct bring to front for Xcode 6
Change-Id: I7e161a20a4b24635df4f6f373966c7e52cfb593b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-23 12:08:15 +02:00
Orgad Shaneh
72c33cbadd Git: Fix potential heap use after free
Closing the dialog before the process terminates might lead to this.

Task-number: QTCREATORBUG-13075
Change-Id: I3b6ffcca010eb356b14d87f2a7d62090c158faba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-23 11:00:47 +02:00
Orgad Shaneh
3f3554eb13 Git: Display exit message for conflictable commands
Change-Id: I42d7a2e05a11ed4983063fc2577786e6c6d9b9a0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-23 11:00:42 +02:00
hjk
e2aa0bbecd TextEditor: Clean up RefactoringChanges
Namespaces; use QVector instead of QList for
QPair<QTextCursor, QTextCursor>.

Change-Id: I60c3bede66c404ded96b982299cf853b0b9d4f8e
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-23 10:48:15 +02:00
Francois Ferrand
d33727b67a Remove duplicated arrow from analyzer filter.
The icon already includes the 'down' arrow, thus we need to set the 'noArrow' property to prevent
the theme from drawing a second arrow.

Change-Id: Ia910bcebb68b6faf4cc101685ba71e36069ef057
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-23 10:43:43 +02:00
hjk
4d12c017de Debugger: Wiggle LLDB startup
LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
(cherry picked from commit 1af0f77ea9)
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-23 10:41:19 +02:00
Eike Ziller
91239baaba Locator filters: Fix various thread-safety issues
Introduces a "prepareSearch" method for locator filters that is called on
the UI thread prior to the threaded matching.
Fix various small thread-safety issues in the various filters.

Change-Id: If5ae7d205e126d367420936a93f8d9a84496edb8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-23 10:16:37 +02:00
Eike Ziller
d6c73653ed Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
	src/plugins/texteditor/basetexteditor.h

Change-Id: I556a7661872b90b329a46694e335e18cddc28677
2014-09-23 10:10:09 +02:00
Nikolai Kosjar
205de01abf CppEditor: Rename VirtualFunctionsAssistProcessor
Remove plural to align with the other VirtualFunctionAssist* classes.

Change-Id: I986e564ab9080e6fbc75f524f89d98907792a48e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-23 09:14:00 +02:00
Nikolai Kosjar
b14172cc5a CppEditor: Fix leaking AssistInterface
...in VirtualFunctionsAssistProcessor.

Change-Id: Ic53d1ba92a5ca396055f4727839a89835d881e8d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-23 09:13:44 +02:00
Orgad Shaneh
ece3f97f90 VCS: Fix word wrap mode for commit message
Change-Id: I99cee5236bc475aae949956ac7c1f05e8e3fd665
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-23 08:52:53 +02:00
Christian Stenger
ce005981ab ProjectExplorer: Fix compile with MSVC2010
Task-number: QTCREATORBUG-13082
Change-Id: I669504be2241d0101dabd0c2ce0b1f29c87218f3
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-23 07:44:37 +02:00
Christian Stenger
149f420550 Squish: Fix tst_tasks_handling
Change-Id: I58a818864b495d1ecf2923abd50cf848ba368195
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-09-23 07:16:58 +02:00
Nikolai Kosjar
669ed1af38 CppTools: Fix destruction order in ~CppModelManager
Change-Id: Ib910d5b4a3db4b4d2809e05b1f37acb97a6105a6
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-22 19:23:13 +02:00
Nikolai Kosjar
79f0ab18c3 C++: Clear state in DependencyTable::build
...since build() is called multiple times for e.g. the global snapshot
(CppModelManager::projectPartFromDependencies,
CppModelManager::replaceDocument).

Change-Id: I03667496a5abc984ba976046dc7b76998a6e3336
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-22 19:22:30 +02:00
Kevin Funk
faeac783f0 Make compile with Qt 5.4
Partial backport of 5da75dba06

Change-Id: I5d0964818934a2a0fc57c97b229469fd5a6c8131
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-22 19:17:54 +02:00
hjk
1af0f77ea9 Debugger: Wiggle LLDB startup
LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-22 18:07:16 +02:00
hjk
68106a7d31 Debugger: Show at least sizes for libc++'s std::map
Change-Id: I91f3ece335ef660e62e93dcbbeff18dc5b0c46f0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-22 18:00:56 +02:00
hjk
245d4b253d Debugger: Fix warn() calls in LLDB bridge
Change-Id: I7e8a571daae6a81efb52e153c8b19e724aa56c55
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-22 18:00:44 +02:00
Eike Ziller
10cb7abe17 Locator: Fix the fix of the deadlock
The all/current project searches use metacalls on the UI thread to work
around thread-unsafety of the Project::allFiles method, so we cannot jus
t block the UI thread to wait for the old search to cancel.
On the other hand, many of the ILocatorFilter::matchesFor implementation
s do not work when they are run in multiple threads simultaneously (most
implementations access unguarded member variables, help index filter tend
s to crash), so we _do_ have to wait for the search to cancel before sta
rting a new thread.
Broke with 05c267673f and 6fc39f0c41
00c5673ae80d03d115bf3739

Change-Id: I93c607c879e8ba6ef60f94719812edb3df43a154
Task-number: QTCREATORBUG-12875
Task-number: QTCREATORBUG-12592
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-22 17:04:03 +02:00
Robert Loehning
03304fe29f CppTools: Fix compile with MSVC2010
Change-Id: I8ddbae78e349e3e79f3660afe8dc583d2286c8f7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-22 13:16:50 +02:00
BogDan Vatra
c297c6abab Remove unused functions
Change-Id: I016a0bd03801c89b29e8b736530c9e40cb5590c0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-22 11:50:30 +02:00
Nikolai Kosjar
46ffe4f2c7 CppTools: Make CppCurrentDocumentFilter thread safe
Change-Id: I6ca4711bad282279c913fe913712ae7b905ab55a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-22 10:58:27 +02:00
Nikolai Kosjar
1bcb9f4934 CppEditor: Fix size policy in CppIncludeHierarchyWidget
Re-produce the fixed problem with:

    1. Shut down Qt Creator while having the include hierarchy sidebar
       open.
    2. Re-start Qt Creator - the side bar is displayed again, but the
       "No include hierarchy available" label is not scaled at the full
       sidebar size, but only to 50%.

Change-Id: I24e84bfd7cbb9dd9383a60179f5444de9401015d
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-22 10:50:16 +02:00
Nikolai Kosjar
b09c2cd36c CppEditor: Fix leaking ClassItem
...in InsertVirtualMethodsOp. Leak occurred while running

    test_quickfix_InsertVirtualMethods(final_function_removed)

in valgrind memcheck.

Change-Id: I1119b68feb25ecd6e210201c7e0f1e651e2542f9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-22 10:49:42 +02:00
Nikolai Kosjar
f4adc00b99 CppEditor: Tests: Fix leaking IAssistProcessor and IAssistProposal
...in VirtualFunctionTestAssistProvider.

Change-Id: I6472a599ca12d72e8df8e6f416eaa02c27ef1cc6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-22 10:49:25 +02:00
Nikolai Kosjar
af34a5b9b4 CppTools: Tests: Fix leaking IAssistProposal and SymbolSearcher
Change-Id: Ic81a5df88d17375cf0087213d84443845bfd38cc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-22 10:49:17 +02:00
hjk
fdc982358e GlslEditor: Simplify completion proposal setup
Change-Id: I6d103eb6471687b1fe18e88a9f2cca375eeed6cd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-22 10:42:05 +02:00
hjk
78a04f0a6d TextEditor: Wiggle codeassist setup
Remove GenericProposalModel convenience constructor,
add GenericProposal instead. Less user side code.

Change-Id: I833f9943df27b50579485c93efb96943ec403f65
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-22 10:41:38 +02:00
David Schulz
a6014c1039 CppEditor: Fix isValidAsciiIdentifierChar.
Task-number: QTCREATORBUG-13012
Change-Id: I70d45dcdc72408d46bea0b78746ab28c17f3b9e3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-22 10:37:26 +02:00
Orgad Shaneh
fef838eed7 Gerrit: Really make Refresh the default button
Apparently setDefault must be called *after* the button is added to the
dialog.

Change-Id: I8351a666509bb4e92492388f80575ccea969c754
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-22 08:38:59 +02:00
Eike Ziller
48c2bc1ed7 Locator: Fix local variable name
Change-Id: I3803fbd6d99a4b2d113997f56ab8f05e5c169937
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-22 08:27:02 +02:00
hjk
812c10341d Debugger: Do not restrict precision in double arrays
Task-number: QTCREATORBUG-13050
Change-Id: I54855af0edbbc66c53c8a42da1a216c37a27f25a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-20 19:22:59 +02:00
hjk
7a50386446 Debugger: Clean up source utils
Change-Id: Ibfe20af9c4c413657b6a238337ff9af661857b3e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 17:17:29 +02:00
Tobias Hunger
3491b1f22a Add JsonWizard
This is a generalization of the customwizard (using Json for its
configuration files since that is so easy to handle in Qt 5 and
since it is incompatible with the customwizard anyway).

It allows to define an arbitrary number of pages and generators to
generate the actual files.

Change-Id: I45a01cf7fb906701b627fa1471a898cad472f679
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-19 16:54:50 +02:00
hjk
e90a8a051c TextEditor: Only use tooltipOverrideRequested in *Widget
One signal less, one connection less, less indirection in user code.

Change-Id: Ie49d4a76982f2ff9d2b307ed541c33c6a7ea6480
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 16:51:36 +02:00
hjk
558864f254 TextEditor: Simplify CodeAssistant{,Private} a bit
Change-Id: I5ced5fa0d4d2dc4afdbda50e70f72408b4fc64c4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 16:26:37 +02:00
Daniel Teske
53232ccd64 QtKitInformation::availablePlatforms: Fix empty platform names
Readd check for empty platform names that was removed in
b2ea6e1b9e

Task-number: QTCREATORBUG-13063
Change-Id: Ib509f0e736c33aca2987f2add65dd184b637dcbe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-19 16:01:06 +02:00
hjk
970264a88e Debugger: Operate tooltips on TextEditorWidgets, not TextEditor
Less indirection.

Change-Id: Ifbd7195e853d02bfd6562c817fc7f30079913faf
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 16:00:24 +02:00
hjk
74f24c96e1 Debugger: Show a "no valid expression" hint in tooltips
So far silently nothing happened, which can be annoying.

Change-Id: Ib0a20343b41a0737de82c2894d526e46a21400a4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 16:00:00 +02:00
hjk
c468057f80 Debugger: Cleanup remote server engine
There was duplicated data hanging around, with the potential
of getting out-of-sync.

Change-Id: Ib4927a098b4905347faa203af323234b464be9cd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 15:53:41 +02:00
hjk
3bafbe710f Debugger: Fix Android startup
Change-Id: I495412434ccffdb33528bbbe030c7a4bfa7e387c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 15:52:58 +02:00
hjk
2fffafe2db TextEditor: CodeAssistant code cosmetics
Change-Id: I349f4d7c6ff77848e03cbcf4726ae21374bf653f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 15:47:24 +02:00