Commit Graph

20593 Commits

Author SHA1 Message Date
Simjees Abraham
87c664058f Debugger: Apply on Save only when Engine client is connected
Creation of the Text previews are done only when the engine client
is connected and they are deleted once the engine client changes
from the connected state.

Change-Id: I325d0d1a281b9e8fab4ddf9ff8ea4f5e60d4ac2a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-15 14:26:27 +02:00
Christian Kandeler
69530f76aa Core: Add "canceled" signal to class FutureProgress.
This allows clients to get notified that the operation has been canceled
by the user without the need to create an additional QFutureWatcher
themselves.

Change-Id: I928f87eef98ce762d77dcc6962c082fe49f38f6e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-15 14:23:12 +02:00
Simjees Abraham
3b723d3a9a Debugger: Bugfix for Reloading Qml
Option for reloading the Qml files in case of unsynchronizable
changes is not provided for Qt versions less than 5.0.

Change-Id: I4bb942ab9d5c699fa8569f81502ba86bccfe1bbd
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-15 14:22:56 +02:00
Simjees Abraham
d8e3121a64 Debugger:Apply Changes on Save modified for unsync. changes.
The user is given an option to reload the QML app if he has done
any unsynchronizable change. If the user opts to reload the QML,
Inspector informs the qtdevlarative to do so.

Change-Id: Iefc044e64380e64415630b051a60d6fe9fedfe04
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-15 14:22:32 +02:00
Eike Ziller
ab875b72ec Add a CurrentProject::BuildPath variable.
Task-number: QTCREATORBUG-4885

Change-Id: I9098f42336b487626d181a677ac92db2382c3cfe
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-15 14:17:40 +02:00
Daniel Teske
d7c9f3deba CMake: Fix crash in makestep if used in the deploystep list
Task-number: QTCREATORBUG-7427
Change-Id: I8cc1e49e87d38c1a789bf3dee25b62668efc433d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-15 13:19:30 +02:00
Jonathan Liu
82a821fc9b SVN: Fix project status command when no document open
The SVN project status command is using currentFileTopLevel() for the
working directory when it should be using currentProjectTopLevel().
If no document is open, currentFileTopLevel() will return an empty
string which means the current working directory of Qt Creator is used.

Change-Id: I848b1adf7166836c5d15e88796af77f8700a43f2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-15 12:36:29 +02:00
hjk
bb2a2c3def cppeditor: guess file type from -*- C++ -*- comments
Change-Id: I33a0c4e60701f2d859b52063b7aaf4c1ebfdc1ea
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-05-15 11:59:52 +02:00
Kai Koehne
dd189d0787 Debugger: Remove 'Clear Code Model' context menu action
The use case of this action (introduced in 25ee70bb24) is unclear.

Change-Id: I5188d5c8c9b06c5e2663e2ddc4c89ef1e670d891
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-15 11:54:02 +02:00
Aurindam Jana
9eb539469d WatchHandler: Add isInspect()
Change-Id: I237f77554a06bf7c139a8ae5cfef79c6fb4c8507
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-15 11:35:20 +02:00
Kai Koehne
8e69ef5b50 Debugger: Fix compiler warnings about unused variables
Change-Id: I82f76dddb8b294f9a10dfa0f2ab5030c6f8edff3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-15 10:52:20 +02:00
Kai Koehne
7208cfe26c Debugger: Fix capitalization of 'When' in actions
Prepositions are usually not capitalized, even in book style.

Change-Id: Ibdca3843b349bf7aaac57e4e3ce635960f46ee0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-05-14 17:12:07 +02:00
Kai Koehne
56a9d9702b Debugger: Remove actions from object pool
The actions were added to the object pool so that QmlJsInspector
plugin can access them. This is obsolete now.

Change-Id: I7c33428b834c372fab354b39ffeb6c8d181c162a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-14 17:11:58 +02:00
Fawzi Mohamed
f995ebc89f zeroconf: ensure that a broken pipe does not crash creator
Change-Id: Ib8e408d3d7323728333ac8615240684e7f86867f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-05-14 17:09:17 +02:00
Kai Koehne
c7a431455e Debugger: Show locals when loading core dumps
Make sure locals are shown (instead of inspector) in Locals and
Expressions when a core dump is loaded.

Change-Id: I434acac59a2c575a2425e2ba06a13020c17547e4
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-14 16:15:06 +02:00
Kai Koehne
33ec5eb246 Debugger: Rename actions dealing with watched expressions
Unify naming: Expressions are added/removed inside an "Expression Evaluator".

Task-number: QTCREATORBUG-7308
Change-Id: I47c8f7bee3673fe8378fab7977d8b57e5e4ad1c1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-05-14 16:13:14 +02:00
Kai Koehne
02973b9681 Debugger: Move std:: Qt namespace actions to options
Rename 'Debugging Helper' options pane to 'Locals & Expressions',
and move the two actions for showing/hiding std:: and Qt namespaces
in type name to the page.

Change-Id: If7ec66016b330a4c579597bcc81f1fa5a3eff815
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-14 15:27:24 +02:00
Daniel Teske
d64cced130 TaskHub: emit taskAdded before adding the task to a document
As the adding to the document calls updateTaskLineNumber(), which will
emit a signal. The TaskModel needs to know the task before getting that
signal.

Task-number: QTCREATORBUG-7401

Change-Id: I35deba8696adc14199c6c56e45c414016e094088
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-14 14:21:36 +02:00
Konstantin Tokarev
406a3d5f51 Don't build current file when build of subproject is requested.
Change-Id: I0432c5d90fa6eb762745f458693747383cf5b0d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-14 13:54:17 +02:00
Christian Kandeler
5a3431ea32 Debugger: Fix refactoring artifact in name demangler.
Change-Id: I5fcb60fc7e46b558e1627e91f6272f963bacf491
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-14 13:30:08 +02:00
Konstantin Tokarev
0741c7de6d Renamed TaskHub::popup to requestPopup and removed boolean flag.
* TaskHub does not pop up itself because it is not a widget.
* popup(true) is never used and may lead to bad user experience.
* use boolean flag goes agains Qt API design guidelines.

Change-Id: Idf28a8d4af66022961d94f1d1cdeeaf155b67c52
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-14 11:03:14 +02:00
Kai Koehne
34206b0385 Debugger: Add documentation to QmlAdapter
Change-Id: I6a8a4e0e220cde51fa16c33b9fa468b41521d88f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-14 09:46:08 +02:00
Kai Koehne
7bd350febb QmlDebug: Rename signal
Rename signal connectedStatusChanged() to newStatus(). We're using
newStatus also for the EngineDebugClients.

Change-Id: Ic793b4b74e629b602b9467f3abc8127c9c0174d5
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-14 09:46:01 +02:00
Kai Koehne
13d36b2af3 QmlInspector: Don't show root element twice (4.x)
Change-Id: I1871f4c0d4ccb7339f4cea64e6119e0a74459630
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-14 09:33:58 +02:00
Aurindam Jana
b9bc68c370 QmlInspector: Fetch objects for location
Since the object tree is fetched lazily, we might have
objects whose debugIds are not known. In such cases,
objects can be fetched by passing the location info.

Change-Id: I2001460cc14401e011efef9be9194c9f7868d617
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-13 18:24:27 +02:00
David Schulz
12e7c26291 Debugger: GDB: Append debug-file-location
Now the debug-file-location will not be replaced, but enhanced when new debug-file-locations are defined.

Change-Id: Ibabcd5814f281e5e378b29abcee1ac646b01cdcd
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-11 18:02:29 +02:00
Christiaan Janssen
84b4b52aed QmlProfiler: manage premature disconnection when app killed
The profiler tool was assuming that the socket would get
disconnected after the application was stopped by the user.
Sometimes it is not the case.  This patch manages the
oposite situation gracefully.

Change-Id: I4ae439bf2ce6caece37e97f735e980d18c446df0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:27:01 +02:00
Christiaan Janssen
bbbc08a6ea QmlProfiler: reordered tabs
Change-Id: I9c198aef9ab97a8a956280a8637fcb011f10aa6e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:21:43 +02:00
Christiaan Janssen
af72e4bb3f QmlProfiler: show empty trace
In the case that the application did not generate any event
after running the profiler, still show an empty trace.
Otherwise the user will think that the profiler didn't work.

Change-Id: Idd15225270d55d834719f66387864433fcb9026d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:16:12 +02:00
Christian Kandeler
a9680ec23c Device support: Streamline device saving.
We used to save the device settings only when the user pressed "Ok" or
"Accept" in the settings widget. Therefore, remembering auto-detected
devices never worked. Now we connect to the saveSettingsRequested()
signal.

Change-Id: I28964ebbc809596963d718bb66d518607174a841
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-11 16:06:18 +02:00
Tobias Hunger
badd22ebd6 Qt4PM: Fix crash when updating actions
Change-Id: I0d64616288ce6d1756b54ad146e53fd147ca67ce
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-11 16:04:28 +02:00
Kai Koehne
94300bf7a5 QmlInspector: Make sure children list is always displayed on expansion
Change-Id: I2c55e5a4c95088c1a1944916678483792ffaba95
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-11 15:32:47 +02:00
kh1
d762373b95 Make it possible to Show/Hide the sidebar in help mode.
Task-number: QTCREATORBUG-1533

Change-Id: I0ac767db5bcbda12a9d8ba1572ee75881308d0d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 15:14:07 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Eike Ziller
2359fe3610 Merge remote-tracking branch 'origin/2.5' 2012-05-11 13:41:04 +02:00
Orgad Shaneh
dc52fbfc11 Qt4PM: Make enabling/disabling of subproject actions consistent
Change-Id: I56e139e364b71d71a6cf8db9f3add01ab56611c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-11 12:29:22 +02:00
tjenssen
bbfc49fe4d Prepare Qt Creator to have a flexible settings-path.
Change-Id: I4fcb5cbf36013eb5ba9c93155a167ee7f097627b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 12:18:00 +02:00
Konstantin Tokarev
8bad963dee Show editor display names in "Open With" dialog instead of their Id's.
Change-Id: I5cf7b5b53ce05b422aec87f7cf347670133a81a9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-10 18:45:38 +02:00
Kai Koehne
eba7b13c00 QmlAdapter: Don't translate status messages
Change-Id: I4f540cf4ccf3f75e5743c4c65fd265b8f2298671
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 17:20:24 +02:00
Kai Koehne
a0f7d6b5ec QmlAdapter: Move isConnected() to private
Change-Id: I0b8bd76af6492bf85c5dfdef3863d8ebc9babab3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 17:20:16 +02:00
Kai Koehne
4884200b5a QmlAdapter: Remove unused method
Change-Id: I83c71e7683c5c6840e767df652599af25de62a88
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 17:20:08 +02:00
Christiaan Janssen
9694dcffd1 QmlProfiler: adapt binding location at call to gotoLine
Change-Id: Iceff7120a5e88181e5aad452d3f0f90b3215ce1d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 16:47:47 +02:00
Christiaan Janssen
d1224783d5 QmlProfiler: use project file finder in detailsRewriter
Change-Id: I838180820da54baf0f334de36a8297bc8b461ccc
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 16:43:28 +02:00
Christiaan Janssen
cb12ef8f91 QmlProfiler: Set sysroot for embedded targets
Change-Id: Ieae3956a6ed47c40392b1f5bb2af8b97e01a19b0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 14:57:12 +02:00
Kai Koehne
232a1272d4 Gdb: Print missing tokens in timeout
Change-Id: I5a5693fa2c60511ee581bb2b4f5fa3f5604d0e42
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-10 14:51:55 +02:00
Kai Koehne
c9dad3cff2 Debugger: Don't trigger gdb calls for inspect properties
Change-Id: Iaed71894cb2b2e340e7fbbe2045842bc85bd5fe0
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 14:34:13 +02:00
kh1
c1fbe9ddb1 Let the desktop system handle mailto links.
Task-number: QTCREATORBUG-4058

Change-Id: If48f8150bc05418c3ac0b9e132b84ed7836e08fa
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-10 14:04:51 +02:00
Christian Kandeler
c5b2ca298b Debugger: Make some name demangler operations static.
These variables are conceptually const and only have to be initialized
once.

Change-Id: I49adaa19909bb132982ae02b389bc43664a8dc9e
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 13:57:01 +02:00
Christian Kandeler
9d44e07843 Debugger: Fix coding style issues in name demangler.
Change-Id: I2ded86aa98576fe059f372b83fc8f9e17a4943ce
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 13:42:26 +02:00
Christian Kandeler
bc78b228fa Debugger: Use exceptions in name demangler.
This saves repetitive and annoying checks after every function that can
potentially fail.

Change-Id: Ic8f8a070195a6eff3e7b1d631e5d67e4fe23bad2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 13:35:00 +02:00