Commit Graph

32182 Commits

Author SHA1 Message Date
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
Orgad Shaneh
4835469531 C++: Comment out debug log
Uncommented in e088541c0

Change-Id: Ia9685b815523ab61a8780e9f5686a5d713eec842
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-16 16:41:42 +02:00
hjk
adcee1cb84 Remove qmljs debugging helper setup code from QtQuickApp template
Change-Id: Ia979c37c8f0ae77e2390951a547098461474313c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-10-16 16:35:14 +02:00
Tobias Hunger
bca69693ee Kits: Delay validation
This avoids useless validation runs during construction.

Also reorder member variables to save a couple of bytes
in the structure.

Change-Id: Ibc33b89f12c306852af02d387ee2d177f732bb83
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-16 16:29:01 +02:00
Tobias Hunger
b72b9c7ef1 AbiWidget: Fix rendering with no detected ABIs
This fixes the rendering of the AbiWidget if no ABIs are deteceted.

Change-Id: I9ef4aec70e88add498fd60f29014d6bf91e0ee61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-16 16:27:49 +02:00
Tobias Hunger
b39dccf035 KitModel: Delay connections to avoid needless updates
Change-Id: I4ef40fd76b65f6504c8dee71bf8b5d76e1d23cbe
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-16 16:26:37 +02:00
Tobias Hunger
f2e24ac144 Qbs: Update icons used in Qbs project nodes
Change-Id: I285a6102c0b7fefa7c4027d814654da640af39a9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2013-10-16 16:26:25 +02:00
Aurindam Jana
314a93ca4b QmProfiler: Remove dependency to QmlProjectManager
Change-Id: Ia17ccafc13674555922a59264ea9f5df5abef060
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 16:26:03 +02:00
Tobias Hunger
46d4244e01 Kits: Do not trigger unmanagedKitUpdated signals during construction
Stay below the radar during construction/fromMap. This avoids some
signals from the KitManager about unmanaged kits having been updated.

This signal is used in three places only and always connected only
after the the construction happend. So this should be safe.

Change-Id: If6cc29b6bb98fa161776a9a79f48f88173db04b8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 15:49:07 +02:00
Tobias Hunger
32588b7308 Kits: Make pointer to d const
Change-Id: I15cc54883cd49b49373b556e7155706f10475408
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 15:35:55 +02:00
Eike Ziller
b11937682f Register .qbs for Qt Creator standalone and fix icon for qml
Task-number: QTCREATORBUG-9150
Change-Id: I5cff954364b04e6cf1003697c7663b52c4a941db
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-10-16 15:14:21 +02:00
Tobias Hunger
5caf64e276 ProjectWindow: Do not listen for Kit updates during shutdown
The SessionManager is disconnected at that point already, so we were
never told that projects were destructed already and were happily
calling into those.

This fixes the crash described in QTCREATORBUG-10354.

Task-number: QTCREATORBUG-10354
Change-Id: Ib8ce07d6db38dbff9154b127f5fb620a9961c742
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-16 14:53:43 +02:00
Nikolai Kosjar
77c212329a CodeAssit: Fix completion if function hint is shown
This reverts commit c5dfcce948, but the
bug addressed by that commit remains fixed. FunctionHintProposals need
to be fragile so they can be replaced by e.g. GenericProposals. Only one
proposal can be "active".

Change-Id: Ibca40063d46b8ef3bce4d72be7488f70885e75da
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-16 14:52:41 +02:00
hjk
d2b1d7ac0d Remove Meego support from QtQuickApp project template
Also bump the minimum Qt version required for new Qt Quick apps to 4.8

Change-Id: Ieeabc8475ccfa7f9fec7ca08cd88384ed88f0d1d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-16 14:49:23 +02:00
hjk
35695ebb0c Qt4ProjectManager: Rename the "normal" qt4* files to qmake*
Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-16 14:30:05 +02:00
hjk
710eea4a61 Remove some Maemo traces
Change-Id: I5c7727f18039a359c79397f28e1c32bcd7acf101
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-16 13:59:44 +02:00
El Mehdi Fekari
7e52240165 Qnx: Update copyright information
Change-Id: I10e5f7b4c9d0d527f8df34aa425a2a0bdaac5243
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-16 13:57:02 +02:00
hjk
8d022d61cc Debugger: Re-enable target arch parsing of manual debuggers
Change-Id: I1c3790447aa863b532133c0280349aa07a920b8a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-16 13:47:31 +02:00
Marco Bubke
22b526ff89 QmlDesigner: Fix crash for component source drop
Task-number: QTCREATORBUG-10372
Change-Id: I0b56bf4998dbbdeb690622078d61c672d012ed5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-16 13:15:03 +02:00
BogDan Vatra
ddaafc0e26 Fix compile using QBS
Change-Id: I0e8a920614a00122225e529667f0c808c8a3ad76
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-16 12:41:21 +02:00
BogDan Vatra
c3606586d7 Warning--
Change-Id: I2fffb7778501a90b8530482900343a5f44f999ff
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-16 12:23:37 +02:00
hjk
ebcd992577 Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 12:09:59 +02:00
hjk
56d564c5b3 Qt4ProjectManager: Remove unused constants
Change-Id: I1d4457d65b736c876f1c1cc66c23921250c09380
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-16 12:00:34 +02:00