Commit Graph

32154 Commits

Author SHA1 Message Date
Tobias Hunger
66c52af89a Qbs: Do not copy build step and build step list
Those are owned by the DeployConfiguration and we should not copy those
settings since we may belong to a different DeployConfiguration.

Change-Id: Ibb80eb808c8e0f790b35e38bb3dfcf357cf579d2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 17:51:57 +02:00
Tobias Hunger
ea6c60cd1b BaseCheckoutWizard: Add button to message box informing about failure
Add a "OK" button to the message box informing about a failure to find
any project file in the freshly checked out directory. That way the
user has a way to close the message box on Mac.

Task-number: QTCREATORBUG-10429
Change-Id: I9e1a4a2f368982dea2b0060f3f35dcb97d8936a3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-18 15:17:21 +02:00
Christian Kandeler
33dbdcd430 Device support: Polish DeviceApplicationRunner.
Remove timeout check (part of DeviceProcess now), react to the
DeviceProcess' error() signal, remove unneeded members, improve
messages.
What's left is a light-weight wrapper around DeviceProcess suitable for
run controls. Removal would result in identical boiler-plate code in
several places.

Change-Id: Ib306369df8dbf72dddb8ca305d256870a121dd63
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-18 14:25:53 +02:00
Nikolai Kosjar
e58906a9ed C++: Limit typedef resolving depth
This reverts commit 5be56c0 except for its tests. While it fixed the
problem described in the bug report, it also introduced regressions.

For now, we use a hard limit.

Change-Id: I19a85be454e3d7969371707e3eb1c3d42a16ecee
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-18 14:07:00 +02:00
Christian Kandeler
c4c9b90b7f QbsProjectManager: Do not create a build graph when resolving a project.
People do not expect directories to be created as a side effect of
opening a project.

Task-number: QBS-304
Change-Id: I820a1311d534a4a76a4660588c4e9d71cc03f153
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 13:46:05 +02:00
Tobias Hunger
b2f27649a2 DebuggerKitInformation: Make setup() handle new kits
Those return a invalid QVariant, so handle that explicitly.

Change-Id: I50726552aeb76d21032c119c5ea2db48e6d88e8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 13:26:15 +02:00
Tobias Hunger
df83d1574d DebuggerKitInformation: Invalid ids are ok
Invalid Ids are used to for "No Debugger", so do not try to fix
those values.

Change-Id: I141f969524e1faffa66a22c2a08ef18ec4d7fc23
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 13:25:49 +02:00
Christian Kandeler
2c2a940ae2 BaseQtVersion: Make sure qmake variables are up to date.
Otherwise, qmake properties can be wrongly read as empty.

Change-Id: If63a306664758c01529b437fca30f5222b75f02f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-18 13:22:24 +02:00
Tobias Hunger
844e9e6647 BaseQtVersion: Make qmakeProperty(versionInfo, name, ...) protected
This is a low level method which is not useful for normal usage.

Change-Id: I5fd1c019856a8a84299f5b11c159ea6b0f5131a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-18 13:22:17 +02:00
Friedemann Kleint
163f110096 Fixes in translated messages.
Change-Id: Ie1aa0547281d9a1ab31f00e44c4e09dd96c60543
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-18 13:14:14 +02:00
Daniel Teske
1df66a18d1 Android: Rework sdkTargets() to cache the output of adb
Also rename/change highestAvailablePlatform to highestAvailableSdk.
This fixes a bug reported on irc, where the lists for sdk and ndk
were different and the highestAvailablePlatform was not available
as in the sdk.

Change-Id: I17fec9e8ce1913e933ddcf8eaa21d6bb6e14c5be
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:27 +02:00
Daniel Teske
723d4a973f Android: Distinguish between platforms in the ndk and the sdk
The available platforms in the ndk might not be the same as in the sdk.
This patch is renames everything using the ndk platform list to
ndkPlatforms, except the highestAvailablePlatform which wrongly uses
the ndk platform list.

Change-Id: I02d9b68bbc27b0c748281678fe654d5f4244578d
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:22 +02:00
Daniel Teske
5e10114e76 Android: Remove bestMatch calls in fallback code in buildTargetSDK
besdtMatch finds a ndk version that is at most the targetApi passed into it.
Since we are passing in the fallback and lowest possible api level that qt
supports, the function would return at most the lowest supported version.
That's not very useful and cannot have worked, so simpy return the fallback
version directly.

Change-Id: I5e4757639099af4d207f928b0335d28efd75a02b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-10-18 13:09:18 +02:00
Eike Ziller
c30c290631 Avoid holding on lots of data with C++ Find Usages
The snapshots at the moment of search were held as long as the
corresponding search result panel was kept, to allow mapping of the old
symbol to the corresponding symbol in the new snapshot.
Now we just save the file name and ID of the old symbol.

Change-Id: Iaf3c9ca27ec2b788f142bd0dd6b86e34e66d5c8b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-18 13:05:46 +02:00
Tobias Hunger
155567a0b3 Target: Overwrite displayname we got from our file
... use the current kit name instead (in case it was renamed since
saving the project).

Task-number: QTCREATORBUG-10401
Change-Id: If329d3441eb27a4322cb346849e4b73296d5bf88
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-18 12:52:25 +02:00
Eike Ziller
c7761d8b2e Help: Only open 'internal' documentation links in Qt Creator
Open external webpages in external browser.

Task-number: QTCREATORBUG-8433
Change-Id: I760f6c5705046a6f8b7ebec3cd7b32253738e0df
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-10-18 12:32:21 +02:00
David Schulz
a4ddbd5b2f CppEditor: Show scrollbar in preprocessor dialog as needed.
Change-Id: I88493d24a13b67b0768664db0504ce62d0a101aa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-18 12:26:13 +02:00
Nikolai Kosjar
3a701d0aa5 CppEditor: Sort project parts in CppPreProcessorDialog
Change-Id: I6184eaede3b89933d4ac54a18004319409e72347
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-18 11:07:56 +02:00
hjk
0017ed24d6 Debugger: Keep more secondary dialogs on top of the main window
Change-Id: I1e4283a5727db976d999d4cf4c7e444de8592566
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-18 09:17:23 +02:00
Eike Ziller
c9cf3d1464 TextEditors: Fix document changed indicator in case of splits
Since the changed signal was moved from the editor to the document, we
now need to set up all the connections in the setupDocumentSignals.
Otherwise split editors, which get a different document after creation,
do no longer set up the right connections.

Task-number: QTCREATORBUG-10301
Change-Id: Ifc7b426abf87ab73ea37379c1a55e5af2005fc43
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-18 09:00:27 +02:00
hluk
be1736f95f FakeVim: Don't override "gm" with "m" command
Change-Id: I4e9d8c6780ce4241e6bcbcca6fd7f5b792fa03f1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 18:18:21 +02:00
hjk
0e66cf578e Bookmarks: Disable context menu for disassembler view
This is a hack for now.

Task-number: QTCREATORBUG-10410
Change-Id: I1f6cdc31614231b81588b100a5a03a4308013774
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 17:52:37 +02:00
hjk
b55edaefb3 Debugger: Fix setting of breakpoints in disassembler view
Task-number: QTCREATORBUG-10410
Change-Id: I76f6b430c277b6b7750c1c0b0de71e689dfea7de
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 17:52:23 +02:00
Eike Ziller
9aa52a2c7e lldb: Quick fix for weird behavior when opening locations from debugger
Paths passed to Qt Creator API must be cleaned. Make sure that the file
path that is opened from stack view and when stepping etc, is cleaned.

Task-number: QTCREATORBUG-10119
Change-Id: Iaac9b15e76cf8dff514889f201c4f65330145d16
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 17:51:37 +02:00
hjk
7d8546b8e5 Debugger: Avoid python eval in normal operation
Change-Id: Iee0989bd3581f3b61eb975d58bc1c9e119e27d89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 17:12:55 +02:00
hjk
d16076e59f Debugger: Add upgrade path for 2.8 kit debugger settings
Change-Id: I1fd01d46127b2a1dc351c789c9ba537515baba0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-17 16:46:43 +02:00
Orgad Shaneh
089c5dd927 Git: Open LogChangeDialog on top of the main window
Change-Id: I9fe92f4e1e91e7a4a80a34e802d0d6b8d92b77e4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-17 16:38:07 +02:00
Orgad Shaneh
05b939db01 VCS: Decide file/project control by top level
Instead of actual file.

In case currentFile is a directory, it is cleared, and project top level
is used instead. This leads to unexpected results.

This patch corrects repository resolution in stash dialog when opened
inside a submodule.

Task-number: QTCREATORBUG-10397
Change-Id: I070cc7f9cbebe3be800dbbb9569cf73f540a6d14
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-17 16:37:54 +02:00
hjk
16cf6177d8 Debugger: Rework detection of SDK-specified "auto" debuggers
Change-Id: I173752a41da7b34d64cb7e3e423992be464fc73b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-17 16:30:15 +02:00
Christian Kandeler
ed9752bc0a qbs project files: Fix references to non-existing properties.
Change-Id: I653231939a9495395cbe36de26b67e1535d2169e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-17 16:23:28 +02:00
David Schulz
f30bd48b58 CPPEditor: Rework preprocessor addition tooltip.
Change the preprocessor popup to a dialog.
Save the additional preprocessor directives to the session instead of the
.pro.user file.

Change-Id: I0d08c5684cfb21e822cde0a965c9cf14e5d6d47d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-17 15:25:15 +02:00
Daniel Teske
04cd026582 Android: Remove old android directory before deployment
Task-number: QTCREATORBUG-10290

Change-Id: I83a3ccef58ab1a4c2a486f20620a11e318c146ca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-17 13:48:31 +02:00
Christian Kandeler
421aecfb54 Make git ignore qbs build files.
Change-Id: Id698999406f84412ef9341756fc4343b5e5adcac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-17 13:31:11 +02:00
Nikolai Kosjar
d808ebed88 CppEditor: Fix crash in CompleteSwitchCaseStatement
Task-number: QTCREATORBUG-10366

Change-Id: I6d5af5e7a59f3867141c8d7f098128d3db532ee5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-17 12:04:42 +02:00
Nikolai Kosjar
c79a605b8f CppEditor: Tests: Add basic tests for quick fix CompleteSwitchCaseStatement
Change-Id: Idd9773c9f5165ac8a378ee109bf270641a2b3749
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-17 12:04:35 +02:00
Przemyslaw Gorszkowski
5be56c073e C++: fix endless loop during template instantiation
This is the first phase of fixing bug QTCREATORBUG-10320.
This change resolves typedefs of template parameters(and resolves
problem with endless loop).

The next step will be matching appropriate template specialization
(this is needed to solve problem with missing code completion).

Missing matching: template specialization with the same parameters,
e.g.:
template <class T1, class T2, class T3>
class T
{
};

template <class T1, class T2>
class T<T1, T2, T2>
{
};

Task-number: QTCREATORBUG-10320
Change-Id: Icb6b539c021b2a67a66db9011a2e627f7d96526b
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-17 11:43:27 +02:00
Tobias Hunger
0224ec0a64 Kit: Add constructor to restore Kit from QVariantMap
Do not trust kits with an invalid id, as there is no way those
could have ended up being saved out by creator. Safe all other kits
that were constructed using Kit(const QVariantMap &).

This new constructor uses the code that used to be in fromMap(...),
with some simplifications.

Remove fromMap(...) method from kit as it is no longer used.

Change-Id: Iac28ea9b85670e03088a4b7c5283af6b4b70c0fc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-17 11:22:47 +02:00
hjk
b63f3f808c Debugger: Keep secondary dialogs on top of the main window
Change-Id: I1f4283a5727db976d999d4cf4c7e444de8592566
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-17 10:27:15 +02:00
Christian Kandeler
066f7b7594 Device support: Make sure a DeviceProcess always "finishes".
We cannot technically enforce a remote process to actually terminate,
but we don't want the associated DeviceProcess to "hang" forever.
Therefore, we now
    a) check whether the kill operation reports an error and
    b) start a timer after starting the kill operation.
If the kill operation either "officially" fails or does not have the
desired effect of actually terminating the process within a given time
frame, we set the DeviceProcess to "finished" manually. This is the same
thing that already happens when the connection gets lost, where we also
report the DeviceProcess as finished, even though the remote process
might still be running.

Change-Id: I5620f90453463c64d3a84abd30f1ec7eec9d492d
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-17 10:14:11 +02:00
hluk
893c054ea0 FakeVim: Clear command line to properly save its history
Change-Id: Ibb773ebd3d110ba828e55e29170843ed29e325a8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 22:55:24 +02:00
Andre Hartmann
6f88964ee6 Fix build with Qt4.
Change-Id: Ia365e28b45ef850e7e830f2e81c4b6e2e4b40ffe
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 22:54:46 +02:00
Marco Bubke
613a87cb39 QmlDesigner: Test if declarative module exists to build qmlpuppet
Change-Id: I6aebcbcf77d95f03a85fc12fc3855ca95b9ba3ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-16 19:51:54 +02:00
Marco Bubke
18bff6f765 QmlDesigner: Fix crash for invalid id
Change-Id: I27bcf6d4ec895a464351502f3d8e9d4ed71cab6d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-16 19:51:47 +02:00
Marco Bubke
1da6acf6c4 QmlDesigner: Fix entires for component combobox
Task-number: QTCREATORBUG-10383
Change-Id: Ifa539401c75c82bd3afdec3143f9f17e69a2e36b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-16 19:51:41 +02:00
hjk
5ed7442f99 Debugger: Fix char * display with LLDB
Change-Id: I2d0989bd3581f3b61eb975d58bc1c9e119e27d89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 18:45:01 +02:00
hjk
daf5d6e84e Debugger: Better diagnostics for LLDB startup
Change-Id: I3d0989bd3581f3b61eb975d58bc1c9e119e27d89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 18:43:34 +02:00
hjk
d3e04583ff Debugger: Remove execfile use from lldbbridge
Change-Id: I1d0989bd3581f3b61eb975d58bc1c9e119e27d89
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 18:02:22 +02:00
hjk
8b2ce98e66 Debugger: Fix QModelIndex dumper
Change-Id: Icd0989bd3581f3b61eb975d58bc1c9e119e27d88
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 17:05:25 +02:00
hjk
3c3d4566f3 Debugger: Fix internal dumpers after modularisation
creatortypes.py wasn't included, and some d. qualification missing.

Change-Id: I1f444358cc1489f47083af39565147576f1885b7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 16:53:56 +02:00
Aurindam Jana
a076dc6d3b QmlProjectManager: Remove dependency to Debugger
Change-Id: Ie093e3d9d314dd79ab4f5e91b6749bf7e1d6f43e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 16:51:57 +02:00