Commit Graph

31825 Commits

Author SHA1 Message Date
Nikolai Kosjar
f47e7f68d9 TextEditor: De-noise IAssistProcessor derived classes
...by providing a default implementation of immediateProposal() in the
base class.

Change-Id: I4f4f9aa491fbfc9390cc7b7093f1b3c1c8e460a4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-02 10:24:17 +02:00
Nikolai Kosjar
3fb3307ba1 CppEditor: Fix crash on Creator shutdown
As a consequence of commit 243a625, the order of destruction of
CppEditorWidget and CppModelManager changed. Since now the
CppEditorWidget is deleted last, we need to check if the model manager
object still exists.

Change-Id: Ie61b4e3ea07b44f99ae6c21c1d8ac7c799f3620d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-02 10:05:00 +02:00
Petar Perisin
6cf030d8d3 Git: Rename push enum values
Change-Id: I2809096774882ba1e7e98e2805ad94f03a70dbdc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-02 08:42:03 +02:00
Orgad Shaneh
13a0b348be Git: Revive ChangeSelectionDialog UI file
Much easier to maintain, real logic is more readable

Change-Id: I7c5f7854ea9ee67a3e1eb7a328702fc19852fdb5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-01 23:14:35 +02:00
Orgad Shaneh
24227514e6 Locator: Preserve state on stdout/stderr handling in execute filter
Change-Id: I1f4f3cd1711945fd8763cdbf3039056b802cc03d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-10-01 22:13:05 +02:00
Orgad Shaneh
5a41d17986 Locator: Improve translated strings in execute filter
Change-Id: I1c357bbb72a4d8edb8eeb55619f498de1fee872f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-10-01 21:55:28 +02:00
Andre Hartmann
a9016b371a Android: Fix build with Qt 4.8
Change-Id: I28c96b1d02735c687be4d3626cce2395e710814b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 20:46:23 +02:00
Oleksii Serdiuk
e0ddfe1a5f RemoteLinux: Add possibility to ignore missing files while deploying.
New "Ignore missing files" checkbox was added to "Upload files via SFTP"
and "Create tarball" deployment steps. If checked, missing files will
produce a warning instead of the error thus preventing deployment
process from failing.

Change-Id: I0c3032746fbaae60aef2345802fc02c9951ab386
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 20:37:32 +02:00
Thomas Hartmann
649e127156 Wizards: Adding application wizards for Qt Quick Controls
Task-number: QTCREATORBUG-9477
Change-Id: I4eaf70089e19f0fcab8d85d9a101f74e119bbae0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-10-01 20:22:42 +02:00
Christian Kandeler
6c32b0fe5a QmlDesigner: Fix build.
Change-Id: Iccf560960d9c28335cd5a8d6ce491e63e71c51b7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 20:14:47 +02:00
Christian Kandeler
a54327dc25 Android: Fix build.
Change-Id: Ie4cb2e58e1abb7319b26ce166a039c9b3db47dd7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 20:14:26 +02:00
Jens Bache-Wiig
2067b049a7 Some initial styling for qmldesigner
This makes the controls fit a bit better into creator.

Change-Id: I61dcd3a2db07281c437ef17604aef862d88876b9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 17:38:42 +02:00
Nikita Baryshnikov
56c45f7d6d BuildConfigurationFactory: fix master build
Fix typo in https://codereview.qt-project.org/#change,61526

Change-Id: Id0013feb788dacba0fbb7f1863115a960f594d54
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 17:01:14 +02:00
Daniel Teske
e462c9620d ProjectPart: Add meta information
Add displayname and project file path and a pointer back to the
project.

Change-Id: Ic9a18f52a6291493bd3a95fd3456ed0e1a3c63e3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-01 16:31:36 +02:00
Marco Bubke
fe62ad287f QmlDesigner: Don't change x, y, width and height if anchored
Task-number: QTCREATORBUG-10093
Change-Id: Ice5dab344299842797c82f63540ed62048ca3627
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:29:00 +02:00
Thomas Hartmann
735104737f Fix compilation with MSVC 2012
interface gets defined in combaseapi.h.


Change-Id: I4eaf77789e19f0fcab8d85d9a101f74e119bba00
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 16:28:10 +02:00
Marco Bubke
5920203a48 QmlDesigner: Use internalId instead of ModelNode in ComponentView
Change-Id: I63e81291bf909bff95d9f11f62fd79f321589ebd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:24:59 +02:00
Marco Bubke
d3995c38f2 QmlDesigner: Make AbstractView::modelNodeForInternalId const
Change-Id: If7a951bc8608003a5839aaf2b7282e4ef28d232c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:24:49 +02:00
Marco Bubke
4352af3464 QmlDesigner: Remove unused code
Change-Id: Ib2642cc1301f696b5251116bb8193e044970dcce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:24:23 +02:00
Marco Bubke
b193990e98 QmlDesigner: Refactor puppet path composing
Change-Id: If0a98544a365fe72e3fa89a9d7c85d8a5101434b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:24:14 +02:00
Marco Bubke
e5c51f4475 QmlDesigner: Add AddTabToTableView dialog
Change-Id: I628bc7061242bccf00701c77704f4b1e553019ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:23:59 +02:00
Marco Bubke
5e638c0baf QmlDesigner: Add TabViewDesignerAction
Change-Id: I7894a42260f62bda81bc060481fc2320689f071e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-01 16:23:50 +02:00
Christian Kandeler
82c51aac4d Fix qbs build.
Change-Id: Id88e8967379a1236556d58a49739aae1c47665a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 16:07:24 +02:00
Joerg Bornemann
1ee1416646 CppEditor: fix follow symbol under cursor in SIGNAL/SLOT macros
If the cursor was on the first character of a SIGNAL/SLOT name in a
QObject::connect call, the detection in findLinkAt failed.
Token::end() is the first position behind the token, so we must check
if positionInBlock is less than tk.end().
An extra branch has been added to handle the case where the cursor is
on the opening parenthesis after the identifier within a SIGNAL/SLOT
macro. This worked before, because of the "fuzziness" of the former
condition.

Task-number: QTCREATORBUG-10264

Change-Id: I2122bc2c13af1eb6c37dba9134d2b5ab931f80a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 15:53:02 +02:00
Tobias Hunger
ac6a3fd5c7 BuildConfigurationFactory: Introduce priorities
Introduce priorities for build configuration factories. This way
plugins can register specialized build configuration factories, that
e.g. can provide additional build steps.

A negative priority signifies that a factory is not prepared to
handle a request, the default build configuration factory shipped by
the build system plugin will report a priority of 0. Add 100 to that
for each specialization you add (e.g. a remote linux buildconfiguration
factory would report 100, a specialization of that for mer will
should report 200, etc.).

Change-Id: I141a7a5a79166afdb7657d46eb7e86bd18d3abf6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Michal Klocek <michal.klocek@digia.com>
2013-10-01 15:50:30 +02:00
Joerg Bornemann
321ac6cc51 CppEditor: fix "follow symbol under cursor" for operators
Like for functions we can call attemptFuncDeclDef for operators. The
check for function names has been enhanced to take operators into
account.
For the switch from definition to declaration
SymbolFinder::findMatchingDeclaration has been enriched with operator
knowledge.

Task-number: QTCREATORBUG-7485

Change-Id: I29eebee337e26c8bf67dc8b4a15c43883045589d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 15:43:33 +02:00
Eskil Abrahamsen Blomfeldt
c8393b10fd Extra library editor for Android
Add a list view to the deployment settings which allows you
to add and remove libraries from the ANDROID_EXTRA_LIBS
variable in the .pro file.

Task-number: QTCREATORBUG-9849
Change-Id: Ic0131c46be8fdef4b226b5ceb0ee82ea4dd82c6a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 15:41:43 +02:00
David Schulz
bd144ab0f5 Editor: TabSettings: Make some functions static.
Change-Id: I99597a22b333c44346eb890ebe615193bdbe66d6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-01 15:15:52 +02:00
Joerg Bornemann
a6c8158484 CppEditor: implement ExtractLiteralAsParameter quickfix
Task-number: QTCREATORBUG-9617

Change-Id: I6c6313746b837775bab665bb7019a2adf0b0f286
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 15:12:11 +02:00
Christian Kandeler
1d11fd7344 qbs project: Add properties for pulling in additional resources.
We need this to build plugins located outside the source tree.

Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 15:06:10 +02:00
Erik Verbruggen
7b2c26204a CppTools: add method to manually set the project part.
Change-Id: Ic3578bd98c2f1aefcaef61f5b993dc9a67ca5a77
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 14:37:08 +02:00
Christian Kandeler
37e29bd242 Do not generally add a plugin's directory to its include paths.
It's not necessary, and it lets people get away with using
the wrong kind of include statement.

Change-Id: I736a0aae93c930da37dbac548a3bb025838e7588
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 14:31:30 +02:00
Nikolai Kosjar
11aeaea86f CppEditor: "Follow Symbol Under Cursor" for virtual functions
F2 on a virtual function call presents a list of overrides in derived
classes. The function declaration of the static type is shown
immediately at the top.

Task-number: QTCREATORBUG-9611

Change-Id: I80ce906fa06272dc9fbd1662cd17500b8c77067f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 14:23:00 +02:00
Nikolai Kosjar
3a64f8a344 TextEditor: CodeAssist: Allow immediate proposals
Immediate proposals are displayed for asynchronous providers and fragile
proposals.

The idea is to show already available results immediately. The proposal
calculated in the process runner can then replace the immediate
proposal.

Change-Id: I7903e6677c9dfeb4957eb416062fff1fb01ff23f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 14:04:06 +02:00
Orgad Shaneh
0eb0f54480 Revert "QmlDesigner: Install the puppet to qt for debug"
Breaks compilation on linux for non-privileged users.

This reverts commit 4d7c17fcf6

Change-Id: I24e1912c852d8c6105f73f526cadbaea131911d1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-10-01 13:49:19 +02:00
Orgad Shaneh
7aa91c0bd8 Fix compilation with Qt < 5.2
Change-Id: I8e8b29246274e0b358dad9f5596a64639f0255c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 13:24:33 +02:00
Przemyslaw Gorszkowski
a3eaed4c51 CppEditor: introduce include hierarchy
Based on type hierarchy.

Added to context menu ('Open Include Hierarchy')
Shortcut(Ctrl+Shift+I)

'Include Hierarchy' contains:
FileName for which 'Include Hierarchy' is done
Includes(which files are included by current file - tree hierarchy)
Included by(which files include current file - tree hierarchy)

It is possible to open/goto each file by clicking on specific item.
Additionally for 'Included by' files it goes to the line where is include
directive for current file.

Change-Id: I549b1ed64e4c9f6955f60d00efb12950a3259f81
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 13:12:04 +02:00
Erik Verbruggen
8c79d5bc23 C++: add code-model support for defines-per-editor.
The UI side will come in another commit.

Change-Id: I1038a438587fe4cef70408f7f627d08837fc192d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 13:03:47 +02:00
Christian Kandeler
02072109bc Qnx: Fix qbs build.
Change-Id: I0779ac1ed42cf1d6815ec278b2a9fb2c6c3bf775
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-01 13:03:33 +02:00
Erik Verbruggen
507452f097 CppTools: honor pre-compiled headers in the code-model.
Task-number: QTCREATORBUG-476

Change-Id: I82ed92acdcda551d2c6a9ca221832ac20117a08f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 13:02:45 +02:00
Orgad Shaneh
6603d9ae5f CppEditor: Fix compilation
Change-Id: I5171bc3df7672d403f83d0ff352e8016a9694c40
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 12:58:38 +02:00
Orgad Shaneh
f0c09e91a4 Fix qmake project
Change-Id: Ib6beb99f346d72a329ec7cd72fcce1d63e46b1f2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 12:55:57 +02:00
Daniel Teske
4c4cceaa49 Show potential kits in the targetsetuppage
Change-Id: I6569e3d53b78cdcdf8607a289b5be37447e0a03c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-01 12:44:39 +02:00
Orgad Shaneh
e4f762deec Fix compilation with Qt4
Change-Id: I486198c9d7e27159445411c38037d315b90cd67a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 12:40:15 +02:00
Joerg Bornemann
22f0bdff74 fix syntax of cppeditor.pro
Change-Id: I39a458d6805fcb214297471f72bf3b6cb2dd487d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 12:38:06 +02:00
Nikolai Kosjar
ab9846a9f8 CppEditor: findLinkAt() delegates to FollowSymbolUnderCursor
Moves functionality of CPPEditorWidget::findLinkAt into a newly created
class FollowSymbolUnderCursor. This slim downs cppeditor.cpp a bit and
makes Follow Symbol Under Cursor more easily testable.

Change-Id: I106c7fbfc6869dd13c75381fbe87c90dc88998a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 12:22:50 +02:00
Daniel Teske
64c17eab22 Android: Qt 5.2 deployment add a button to create a Android manifest
The AndroidManifest.xml is no longer needed in as many use cases as
before. So the new deployment does not automatically create a
android manifest. Offer a button on the deployment page to create
a android manifest. This also edits the .pro file adding the
ANDROID_PACKAGE_SOURCE_DIR.

Change-Id: I2655dd6c96e2087732b4d7240b31fe9fcf168600
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-01 12:22:21 +02:00
Joerg Bornemann
166a0dff4a CppEditor: add autotest
Add an autotests for follow symbol under cursor in
QObject::connect calls.

Task-number: QTCREATORBUG-10264
Task-number: QTCREATORBUG-10265

Change-Id: Ie72d49476e173e82027a3579fd71ed5f8ac3f95b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-01 12:12:00 +02:00
El Mehdi Fekari
59a578d4a9 Qnx: Install/uninstall NDK targets
Basic implementation of an install/uninstall targets utility.

Note: This does not support 10.1 NKDs.

Change-Id: I3bb29ef467dd24a121ee59e11abb2237dcff696a
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-01 11:22:41 +02:00
David Schulz
668a50b775 Debugger: Raise messagebox when cdb can't be started.
Task-number: QTCREATORBUG-10180

Change-Id: Iaf672c79a95c37fba2f5243db9564305de8e76dc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-01 11:11:14 +02:00