Commit Graph

38224 Commits

Author SHA1 Message Date
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
Fawzi Mohamed
d0e6da689b qmljslocatordata: make access to m_entries threadsafe
Change-Id: I0eb052a98b2240c17dec81974c226b107705c9e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-19 14:43:24 +02:00
hjk
de70de2246 BareMetal: Remove unused data member
Change-Id: I0d5953e039035b22e4a0ec839f5e0cd016b22604
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 14:32:31 +02:00
Nikita Baryshnikov
2001a7c702 CMake MakeStep update connections
Also connection to setUseNinja was replaced by signal emitted inside it

Change-Id: I8185568d88cd1c5f0603931e3104136e59f1da7c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-19 14:29:41 +02:00
hjk
b26a17f30d CppTools: Change CppModelManager implementation pattern
Replace the CppModelManagerInterface/derived CppModelManager
combo by a more common CppModelManager/CppModelManagerPrivate
pimpl pattern.

Change-Id: Ia4582845ed94d5ef60b8571bab9b2260c6290287
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-19 13:17:55 +02:00
hjk
e5e8693148 Debugger: Merge two remote setup communication paths
Success and failure paths are very similar.

Change-Id: Iebf218f64401884c014f1f7745d504183018addd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 13:00:59 +02:00
Nikolai Kosjar
ea6514b235 C++: Show virtual functions menu only if resolving was requested
That is, if the user does Ctrl+LeftClick or (Ctrl+E,) F2, but not on
hover.

The described bug in the report occurred because we immediately jump to
an item if there is only one, e.g. in case of no overrides. That could
also happen on hover, which lead to the undesired effect.

Change-Id: I79f6fa1f90d37ea209da022d55d48aab2c13c21a
Task-number: QTCREATORBUG-12986
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-19 12:24:54 +02:00
Orgad Shaneh
9d3ed02854 CppTools: Fix compilation with recent gcc 4.9.2
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224

.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppEditor::Internal::CppCodeModelInspectorDialog::refresh()':
cppcodemodelinspectordialog.cpp:(.text+0x79fc): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::definedMacros()':
cppcodemodelinspectordialog.cpp:+0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::headerPaths()':
cppcodemodelinspectordialog.cpp: +0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'

Change-Id: Ie0e01f7628668cbbe11b701a93caef98bb8e335f
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit c023a1cac1)
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-19 11:38:58 +02:00
Nikolai Kosjar
51a18c84a9 README: Update msysGit link
Change-Id: I33058db6c3c1d4c9eb0351948a382cf42c937b74
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-19 11:11:38 +02:00
Robert Loehning
741ab6b732 Squish: Fix NewDialog
When called from Welcome mode, the windowTitle is "New Project".

Change-Id: I12f013cf5a5c8d4d2ec1115e4f29f12cadf99676
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 11:11:32 +02:00
hjk
9a968b7417 CppTools: Move DependencyTable to Snapshot
It logically depends on the Snapshot and has a related lifetime.
Keeping it in the Snapshot avoids some code compelxity.

Change-Id: I24ee4483b44d9b0d7f2e4d494ae7ea624b949f9c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-19 11:11:30 +02:00
Robert Loehning
dd1bc1f607 Squish: Avoid crash of tst_CSUP06
Change-Id: I76318223443ec2e0cc8ddd887a8ac70a6993c0c4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 11:05:13 +02:00
Leena Miettinen
644b9131dd Doc: fix link to OS X deployment page in Qt docs
And replace some remaining "Mac" or "Mac OS X" strings
with "OS X".

Change-Id: I8ae1697a23e69fb840890c1d10887ddbe86a3c98
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-09-19 09:03:23 +02:00
Nikolai Kosjar
0273757c93 GenericProjectManager: Fix plugin tests
The signal was emitted before the spy connected to it.

Change-Id: I5b70c32b8346192d6d58304f05961213ec4d5a57
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 08:30:22 +02:00
hjk
aba863cb18 Android: Add comment about the protocol used in the runner
This is mostly a copy of the commit message of 06d4c0b2e but its
more convenient to have it in the code than to browse git history.

Change-Id: I97a7a3c10f07fc268ba67986f1e830ee92d9c28d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-18 18:42:53 +02:00
Daniel Teske
347cb21ae2 DesktopQmakeRunConfiguration: Optimize response to proFile parsing
Only emit the environment changed signal after everything has parsed.

Change-Id: Iba26c8ba2fc7de9e03ec1368917985538ffbbfb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-18 17:10:06 +02:00
Daniel Teske
2cc17a61eb QmakeGlobals::expandEnvVars: Make sane
Use indexOf() to match individual characters, which is a lot faster than
QRegExp. As a side effect, don't try to expand what we just inserted.

Change-Id: I964fbd92055f2f2649e7d8ed5739cf1fc7cae927
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-18 16:48:16 +02:00
Tobias Hunger
a5828911be JsExpander: Do not crash on exit
Change-Id: I55caca6dd5b316b2573b443175448d732101871c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-18 16:12:23 +02:00