Commit Graph

32683 Commits

Author SHA1 Message Date
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
Thomas Hartmann
02c484a343 QmlDesigner.MetaInfo: fix handling of enum scopes
The codel model does not provide enum scopes at the moment.
As a fallback we use class names, but this fails if we use
the original cpp class name from the <cpp> package.
For this reason we always try to find an export
with a package different from <cpp>.
As a final solution the code model should be able to
provide the enum scopes.

Task-number: QTCREATORBUG-10114
Change-Id: I15396c83590426ab0b9b55c8646a89c8d5712683
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-16 19:21:02 +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
Thomas Hartmann
a6d6db3397 QmlDesigner: Support for enums in alias properties
Enums in combination with alias properties were not supported.
The QML Engine does not distinguish between bindings
and enums in this case.
We want to distinguish between bindings/expressions and literal
enums. This is not possible with the current code model, so we use
a list of hardcoded enum keys for Qt Quick.

There a several issues we want to properly fix in the future.

*  Make the model aware of enums. Currently enums are strings
   (the key) in the model. This has historical reasons. Instead
   we should use a custom type registered to QVariant that handles
   the scope, key and integer value.

*  The code model should be fully aware of enums even in the alias case.

Do not integrate this patch to 3.0 or master.

Task-number: QTCREATORBUG-10114
Change-Id: I780a201202f0949b1e2eb2f2525ddb031e1cd18b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-10-16 16:13:00 +02:00
Thomas Hartmann
7f09973ca2 QmlDesigner: Support for enums in alias properties
Also the qmlpuppet could not handle enums in combination
with alias properties. Enums on alias properties are handled as
bindings. This is just an intermediate solution until we refactor
the handling of enums in the model.

Do not integrate this patch to 3.0 or master.

Task-number: QTCREATORBUG-10114
Change-Id: I022637285deb5ff13b61d761d89b3ae1201575db
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-10-16 16:10:43 +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
hjk
89791a6fbf CPlusPlus: Compile fix in manual test
Change-Id: If34b564b55ef3e76cb5696ed30220d64b256d607
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-16 11:53:33 +02:00
hjk
659ee09ce4 Fix association of kits with auto-detected debuggers
Task-number: QTCREATORBUG-10379

Change-Id: I515da97e6f6ac079590c9d91317ed32b5194a12a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-16 11:53:13 +02:00
hluk
739f7ab5cf FakeVim: Disable recursive event filtering only in current handler
Fixes handling of commands that switch or create new editors
(<C-W><C-W>, <C-W>V).

Change-Id: Iefad2571390afeb085c7c270187e5de451892521
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 11:37:56 +02:00
Eike Ziller
8069fe35e3 Version bump
Change-Id: I0ea3a31a430cae57e72fc1be6e9305d56597d503
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 11:28:00 +02:00
Fawzi Mohamed
70e98213b4 ios: better message for deploy failures
Change-Id: I0e145b07d034277e2afa74f885a55a2722e2c180
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2013-10-16 11:27:10 +02:00
Eike Ziller
4e32babc44 Merge remote-tracking branch 'origin/3.0' 2013-10-16 11:22:20 +02:00
Fawzi Mohamed
01e7e6c6fb ios: remove spurious Subprocess Error message
Change-Id: Ib319856d881c7399f5cd76782b1f76655fbb88b2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-16 10:57:03 +02:00
Petar Perisin
7da9ad56c8 Git: Standardize error message handling
Change-Id: I5574abf0acf7ed430f5f7f3b89ebcbddb31f3016
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-16 10:34:42 +02:00
hjk
c24361901c Debugger: Fix cloning of DebuggerItems
Change-Id: I1e16b09361bb7d3eab2bfc7b77da388c60d23f01
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-16 10:28:33 +02:00
Knut Petter Svendsen
d3bef1b088 ClearCase: Check if ClearCase command is executable
Change-Id: I8e873fcb1bdc3543a031a55b8e027a574a101752
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-16 10:26:38 +02:00
Knut Petter Svendsen
df520ac843 ClearCase: Better debug output
Change-Id: I1daeda0159558377a43f04845b974155ddc77d57
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-16 10:25:53 +02:00
Knut Petter Svendsen
7f5a031a40 ClearCase: Enable Diff, History and Annotate only for elements
Diff, History and Annotate only makes sense for ClearCase elements.

Change-Id: I81f6f5d3fcc81d7c493cc6b3a621902fb57cabe4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-16 10:25:23 +02:00
Eike Ziller
2f7625acf2 Fix assert on "Current Project" search without project
Task-number: QTCREATORBUG-10370

Change-Id: If512ea8cbbd77a9c39696093153455ca9e2bb83f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 09:46:35 +02:00
Orgad Shaneh
d6f21bf549 Fix document appearing as it is all changed on open
Broken by 113c5600c9

Apparently SyntaxHighlighter::rehighlight is called too early

Task-number: QTCREATORBUG-10026
Change-Id: Ifa76c156b5b84b79c869d2de1a0ad69c13ac6b48
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-16 09:21:16 +02:00
Orgad Shaneh
a5c970bea2 Git: Rename widget member to m_widget
Follow coding style

Change-Id: I9583cdfc7ec32140614beb8684d3f15344fa7135
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-16 09:01:08 +02:00
Jarek Kobus
72da839bbf Use VcsBaseClient::diff instead of cvs's one
The second step in cleaning a mess in VCS

Change-Id: I3eb360825480c74242110b0da9f90b39fc4c767f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-16 08:34:28 +02:00
jkobus
0f4808a629 Use VcsBaseClient::diff instead of svn's one
The first step in cleaning a mess in VCS

Change-Id: I06ee1d9952cc91dc8f599f906d221850ffb0835b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-16 08:34:15 +02:00
El Mehdi Fekari
a918b47869 Debugger: Refactor DebuggerItemManager class
Task-number: QTCREATORBUG-10252

Change-Id: Ia8545fd0255f59290a6bab6e35ef1c082649f794
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-15 18:06:27 +02:00