Commit Graph

35759 Commits

Author SHA1 Message Date
Marco Bubke
a67897d481 QmlDesigner: Prepare for dropping items from item library to navigator
Change-Id: I7de6ffc61ae04e25df93e355f820205732867af6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-08 16:37:01 +02:00
Orgad Shaneh
e9aaf21517 Centralize addition of plugin library paths
Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-08 15:29:21 +02:00
Orgad Shaneh
6aad96d89b Nuke plugins PROVIDER settings
Place all plugins in lib/qtcreator/plugins

Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-08 15:29:11 +02:00
Christian Kandeler
aa52cfa0e6 Valgrind: Remove dialog asking for IP address.
When running the memcheck tool remotely, it sends its data via a TCP
socket to the development host, so it needs to know that machine's IP
address. The current code gathers all local network addresses and makes
the user choose one of them. However, we can get that information from
the SSH connection, so no user interaction is required.

Change-Id: Ia61decddd5fa1e285ca143605d944d6d9275b3e4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-08 15:28:06 +02:00
Ulf Hermann
9c24a673de QmlProfiler: disconnect the right signals when debug client goes away
Change-Id: I734083f894a8b34d42bffcfe6f698726516d4587
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-08 15:24:07 +02:00
Ulf Hermann
a7012c5a87 QmlDebugClient: hide all the socket details from clients
Like this no one will get the idea that the socket state represents
the connection state and we can safely replace the underlying
implementation with something not derived from QAbstractSocket.
All the logging is retained but the connection creates the messages
now.

Change-Id: If84ff42f1fa9785254fbd49c75be867b9f663c83
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-08 15:23:56 +02:00
Wiebe Cazemier
b63d9c6df0 Adds option to make editor not scroll on debugging
Added an option to change the behavior of the debuggercore so that
the current editor isn't always centered on the current line, to stop
unnecessary jumping of the code.

Change-Id: I9406df518bb1b977e39a0265ee7fd6fae2069ed9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-08 15:20:48 +02:00
Christian Kandeler
97ece795e0 RemoteLinux: Move environment handling entirely into the aspect class.
There is no reason why the run configuration should add its own logic on
top of what the aspect class does.
This makes RemoteLinuxRunConfiguration::environment() purely a
convenience method.

Change-Id: I80c4ede9a35388e7d3727fff90531accd7fc08de
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 14:17:54 +02:00
Tobias Hunger
fe37b2788b Git: Do not crash when closing creator after reverting all files in a commit
Keep the commit editor around and disable it instead of closing it. That stops
Qt Creator from closing the editor when bringing the commit editor to the
foreground to ask whether it should be closed.

Task-number: QTCREATORBUG-12099
Change-Id: I6927424675338f845f504cb6f630f05eaf8ad49f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 14:16:05 +02:00
Daniel Teske
d0e54d8e55 ModeManager: Simplify ::objectAdded/objectRemoved
No-one is using the aggregated IMode, everyone is deriving from IMode

Change-Id: Ic4f21ce983924afe80cc2180101aae838b9f590d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-08 14:11:29 +02:00
Daniel Teske
240bc8fea5 ImageViewerPlugin: Remove useless code
Change-Id: I4e475df102638d5c8895b14b8bdecfacd94a565b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-08 14:11:13 +02:00
Daniel Teske
eb2cbae7a3 StatusBarManager: Simplify code
We can simply qobject_cast, since everyone is simply adding their
statusbarwidget to the object pool and not a aggregate.

Change-Id: I838a36ef532f3c68c9c41d71b69edadaa1d278de
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-08 14:10:26 +02:00
Ulf Hermann
b775104361 QmlDebugClient: rename serviceVersion to remoteVersion and return int
The name change is in preparation for the upcoming unification of the
debug server and client APIs. Expressing versions as floats is pretty
useless as we cannot properly compare them. Besides, so far we're using
exactly 3 different versions: -1 (a.k.a. invalid), 1, and 2.

Change-Id: Ie4012d09362009b08a1263b15bc552731a1f255e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-08 14:02:34 +02:00
Ulf Hermann
ba5c136a6d QmlDebugClient: Check for gotHello to determine if connection is open
The isConnected() method was misleading as it only checked for the
network socket to be connected. Sending data before the hello message
arrives is a pretty stupid idea and the debug clients need a way to
detect that. The new isOpen method stresses that it's about the
logical protocol, not the network socket.

Change-Id: I84f093d91d7a21d20a8f3d14730c9f189ec35bde
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-08 13:40:31 +02:00
Fawzi Mohamed
10252364bb ios: add comment about repeated constants
Change-Id: Ibcce859abf8f97393e5d224eb6c3c63a3cddcf68
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-08 13:08:29 +02:00
Fawzi Mohamed
b6a1aff2a1 iosrunconfiguration: use more descriptive method/variables names
removed use of shortened names

Change-Id: Icce8558a909e6fdd1c4d4f12ea273745fb21f5eb
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-08 13:08:08 +02:00
Ulf Hermann
776b375540 QmlDebugClient: make QmlDebugConnection::flush() private
There is no reason for any external class to access that. If the call
to flush() from the qml profiler had any effect then it hid a bug that
should be fixed.

Change-Id: I8f655733bd3bff808653cd56b1904aa87c31f6c0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-08 12:51:42 +02:00
Ulf Hermann
0ef1b78724 QmlProfiler: rename logStatus to logState for consistency
Change-Id: Ic9a19028fc4bde03619296a90f8251e2d6ad1240
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-05-08 12:35:20 +02:00
Tobias Hunger
031666c670 Rewrite SettingsAccessor::settingsFiles()
This no longer has the default name first, but that does
not matter since we check all files anyway.

Change-Id: Ib3505d2cafa57e86290237e74dd1f89374da4509
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-08 11:20:09 +02:00
Orgad Shaneh
327abfb30b Qnx: Remove redundant null validation
Change-Id: I6b4971cc41bbec5c2cd8e3146622d5409fe10e69
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 11:18:11 +02:00
Orgad Shaneh
00d58f0c45 Qnx: Remove unused local variable
Change-Id: Ia1f37830566db7349f196ada4e7c73526e5d50d5
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 11:17:18 +02:00
Daniel Teske
7a91287c80 Android: Fix blocking the ui on adding an avd
Task-number: QTCREATORBUG-10601
Change-Id: I3d1fef8a44f434f7eb484f538863c436b4e3a21c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-05-08 11:03:38 +02:00
Christian Kandeler
acfe2a2771 Fix qbs build with clang.
Properties item considered harmful.

Change-Id: I715b589bdcb6ef9ac35790122a1ba6f009652242
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-05-08 11:02:07 +02:00
Christian Kandeler
5c9f175133 qbs build: Make the autotest template available as an import.
Just like for QtcPlugin, QtcLibrary etc.

Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-05-08 11:01:44 +02:00
Orgad Shaneh
65ee566183 ManhattanStyle: Validate widget before dereferencing
Change-Id: Id32e59f96ed8a94f08eb0effbca4918e11659c06
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-08 09:58:43 +02:00
Orgad Shaneh
bf31eb5195 Debugger: Fix debug log
Change-Id: Id02b310e24d7f13fd444b30f20e0af10244f1798
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-08 09:43:02 +02:00
Christian Kandeler
da85540971 LinuxDeviceProcess: Quote environment variable values.
The current code breaks for values that contain spaces.

Change-Id: Ia2a318dcac09a8d1c1ce368378a33c633f28bf49
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-08 09:37:32 +02:00
Orgad Shaneh
93cdde544c Upgrade to GDB 7.7.1
Change-Id: Id705cb577171386f1d313adb751541787c9c6ce2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-08 09:37:12 +02:00
hjk
f1cfb5c515 Debugger: Base DisassemblerAgent on documents, not editors
Change-Id: I7b7a0fc95ed4ce39b49e76755133030fffc13daf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-08 09:32:21 +02:00
hjk
5bc9461d83 Valgrind: Remove unneeded separate FutureWatcher
Change-Id: I21fde2125a4a5d653fe4209e3452dec59c783d24
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-08 09:00:42 +02:00
Joerg Bornemann
c8fc52bad6 fix qbs clang build
The clang flags for C++11 were incomplete.
The linker flag -lc++abi isn't needed.
On OS X the minimum OS version must be set to 10.7.

This amends 7309b6a2d9.

Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-05-07 17:02:25 +02:00
Christian Kandeler
07d4c29043 RemoteLinux: Provide a custom run configuration.
Like the existing "Custom Executable" run config,
but for a remote Linux target.

Task-number: QTCREATORBUG-12168
Change-Id: I0527c2f8080f0e3467fe7210968435fc401fbf76
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-07 16:34:57 +02:00
Orgad Shaneh
b9f79cbd01 Clean some trailing whitespace
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-07 16:19:47 +02:00
Orgad Shaneh
6886d0ac60 ProjectExplorer: Extend ApplicationLauncher
Implement some more QProcess functions

Change-Id: I1afe3fa5f5b353508cf300178cb50507b3dd4b3e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-07 14:44:44 +02:00
Alessandro Portale
db03240b61 Android: Show all download buttons in settings on OSX
Only hide them for Linux.

Change-Id: I31bdfc0368d71556476911aa20431ed3ea220f6e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-07 14:32:45 +02:00
Thomas Hartmann
28b512df44 QmlDesigner.ItemLibrary: remove forceEntry
This feature allowed items to show up in the library even if the import
was missing. This feature was error prone and increased the complexity
of creating items a lot. Since we now have an import manager this is not
required anymore.

Change-Id: Ia127077be0b6c82a047cbb8f86ac3ab24e2d82ae
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-07 13:45:41 +02:00
Thomas Hartmann
c4b1b16e9c QmlDesigner.ItemNode: Remove import handling
We have an import manager now and do not have to handle imports
in the code for item creation. This is just a possible source of bugs.

Change-Id: I5de40b874659f27f0f1a8d83dd78bcae2194aa32
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-07 13:45:34 +02:00
Thomas Hartmann
2e1c1df7f4 QmlDesigner.ItemNode: remove check for QtQuick imports
The Qt Quick Designer requires a Qt Quick import, so we
do not have to check for this case anymore.

Change-Id: Icbfa8fcf97eb43a503405e508e4afe1a16cc1542
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-07 13:45:24 +02:00
Thomas Hartmann
626364f661 QmlDesigner.DragTool: Remove import handling code
We have an import manager now.

Change-Id: If0123059a0fa1b51ef91c13bf24e3e6998195880
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-07 13:45:17 +02:00
Christian Stenger
9c3604ba20 ClangCodeModel: Fix build
Error was introduced with dc61b989ac.

Change-Id: I17217b6fc5f518104fb9f90f9a5fdbea6ef2f49d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-07 13:06:01 +02:00
Fawzi Mohamed
329b1535c8 Revert "qmljs: better defaults, more uniform handling of paths"
moving to master

This reverts commit 0c46692244def9edb89c2914b9b1e5eff10cb6ce

Change-Id: Ie09f6db02058f4a5539221f1a0cc4f9225f38300
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-07 12:36:38 +02:00
Fawzi Mohamed
29958b5706 Revert "qmljs: add qbs default paths"
moving original patch to master

This reverts commit 809d6b96be8842c854364f7e4181ee3bc15e495d

Change-Id: If875d22f8dad93d40be7a12e3fe3b308d6cafb8e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-07 12:36:16 +02:00
Fawzi Mohamed
307526da40 Revert "qmljs: fix compilation for Qt4"
moving original patch to master

This reverts commit c5b6e6ae1c60cb5692deef0db4c3dfbcf0859a1d

Change-Id: I84153a3aaf3ab5ca670ed62aa62babce5bbd51e9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-07 12:35:46 +02:00
Fawzi Mohamed
b1d5169b39 Revert "qmljs: fix compilation with Qt4 (attempt 2)"
moving original patch to master

This reverts commit 24c020baf00f0ccc3c8319da1261d6748d5a39b7

Change-Id: Iab24b97c058483d6d1dfbd557bf635ef3e102512
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-07 12:35:16 +02:00
Marco Bubke
622d42d4e3 QmlDesigner: Refactor NavigatorView
Change-Id: Ibe187cc432f212889f56ec6ef8a2b9ff742e8a9e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-07 12:33:17 +02:00
Marco Bubke
948990aa7b QmlDesigner: Add NodeAbstractProperty::parentProperty()
Change-Id: Ibb4e68cf80ab1d23680cfaf7a2c638fea5d6c5a0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-07 12:33:09 +02:00
Marco Bubke
0673a6a20d QmlDesigner: Refactor NameItemDelegate
Change-Id: I501da870a8ebfbeb80a2c12010eadadbb3a158a3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-07 12:32:59 +02:00
Marco Bubke
1099ecb9ad QmlDesigner: Add ModelNode::hasId
Change-Id: I0f6e46c2f3ee91579e754dde434aa51a33b9c671
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-07 12:32:52 +02:00
Marco Bubke
e401248ca8 QmlDesigner: Refactor IconCheckboxItemDelegate
Change-Id: I947b3f928a8a83e2930a0f996f9d04a8fe85ff0b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-07 12:32:43 +02:00
Marco Bubke
f9fe75a505 QmlDesigner: Move IconCheckboxItemDelegate in own file
Change-Id: I9b3d3fc6f9be382b6141a736b5d063eebecf8364
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-07 12:32:34 +02:00