Commit Graph

20593 Commits

Author SHA1 Message Date
Aurindam Jana
e85886d638 QmlEngine: Attach to Remote Process
In the case of Attach to Remote Process, try connecting immediately.
While, in the case of Attach to Remote Server, wait for output message
or timeout.

Change-Id: I94570a2ab05bb069ea64819fcbb0055555fe0f33
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-13 12:51:37 +02:00
Fawzi Mohamed
debb638aa8 mdnssd: handle if indexes larger than one byte
fixes upstream bug

Change-Id: I7e1bc29ca293f25ffe837f5788bf7bc94e87e1c5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-13 11:46:57 +02:00
hjk
5d782df33f debugger: Replace adapter classes by GdbEngine subclasses
Change-Id: Iee6195b1eed5251545b9d688221ac2edf19325c1
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-13 10:55:59 +02:00
Aurindam Jana
07f10a025e QmlEngine: Connect to port for remote setup
In the case of remote setup, the application output
may take a while. The timeout is increased to 60s.
Additionally in the case of mixed debugging, we check
the state of the master engine to determine if we should
keep waiting for the application output.

Change-Id: I237a3501c1e70dbe62870929e50f12ede80e7c56
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-12 20:05:32 +02:00
Leandro Melo
2af60cb1bf C++: Track macro argument reference even when empty
Change-Id: I6d226b4e42f94ebee41d012050c5109895f0c432
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-12 18:10:56 +02:00
Tobias Hunger
f9007eefc7 Fix warnings
Change-Id: I2964fba30da3dc3a4e9d0c8f7709e32dfd8cd5ef
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-12 18:07:37 +02:00
hjk
bdd09dd2b6 debugger: close source file of main event loop on debugger exit
When opened by the debugger, but even if it is the "current".
This hits the expected behaviour more often.

Change-Id: Iaa488f350791473ecd4b10b43c90223411cf5217
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-12 17:16:02 +02:00
Takumi ASAKI
1f3f726280 QMake: Check $QT_HOST_DATA/mkspecs for cross-compiled Qt5
mkspecs for cross-compiled Qt5 is installed to $QT_HOST_DATA/mkspecs
instead of $QT_INSTALL_DATA/mkspecs.

Change-Id: Id8d64946d542d8b587bd1c2d4f79e9f8a843bfbe
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-12 16:47:21 +02:00
hjk
3383a7273b welcome: remove dead code
Change-Id: I60ff9a96f282e24f492bdf25ec01d53368dca05c
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-12 11:00:10 +02:00
Orgad Shaneh
8a447e0c2a qbs files: Add QtcDebugger tool
Change-Id: I020307941dd5844e3f8b9091bba3e19b61b366ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-06-11 18:00:51 +02:00
Orgad Shaneh
e6820b741d Gerrit: Simplify query model
Use plain QString for queries instead of QStringList

Change-Id: Ia8a9086937fa34bce91d62d7434b26aa33b41163
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-11 17:44:15 +02:00
Christian Kandeler
eebdd459dd Debugging: RemotePlainGdbAdapter should not need remote setup.
Change-Id: I652c23efe83b2679b2adf0984d6fcd28cdb96b25
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-11 16:40:45 +02:00
Eike Ziller
1ccde24c77 Merge remote-tracking branch 'origin/2.5' 2012-06-11 16:39:38 +02:00
Christian Kandeler
929bc18a7e Elf reader: Fix asserts for 64 bit hosts.
Change-Id: I624926a8ce09c6fbbb90fbd851f66c7cc65c4842
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-11 15:52:20 +02:00
hjk
e65b5b0c9f debugger: also accept external debug info as hint for a debug build
Change-Id: I97cc6cdf6b1f2b8f794ad166c0f2b3f8eadc98b8
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-11 15:26:28 +02:00
Joerg Bornemann
df473a1201 remove unused files from QmlDesigner
Change-Id: I5866d7a0103d70350c1f739d6a8e1d8c9ef31a44
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-06-11 14:02:25 +02:00
Eike Ziller
b2e566662b Mac: Sanitize shortcuts.
Task-number: QTCREATORBUG-7446
Change-Id: Ibad8f06e5f65bc01dc9fca6e9d900e24c5fc55a1
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-06-11 13:39:20 +02:00
Orgad Shaneh
e129fcdc19 Revert "ctrlc_stub: Send Ctrl-Break instead of Ctrl-C"
Ctrl-Break kills the compiler while writing object files.
This results in link errors on next build.

This reverts commit 6147419f87

Change-Id: I623e3ecb9f2f8a8613a731364a7e3b3a0abe8c15
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-11 12:33:04 +02:00
Simjees Abraham
fdabb6d6f9 Debugger: resetting of newObjectsCreated done only for Qt5.x
done to correct the regression introduced in
2574a58469

Change-Id: I0d9fb8fabcd134f53f1a1c9d0fa04ca7b542a88c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-11 09:58:10 +02:00
Simjees Abraham
953334967c Debugger: Adding objects to be watched corrected
Adding the objects to be watched corrected in case new objects
were created.

Task-number: QTCREATORBUG-7529
Change-Id: Ica5f852f47882242a0e97692c97c0ca4ee662a4e
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-11 09:57:54 +02:00
Leandro Melo
a66e344b42 C++: Fix crash on invalid class name
Task-number: QTCREATORBUG-7462

Change-Id: Ic1df4b535c5a617efa707110138c76e6e7ef1e4b
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-11 09:14:59 +02:00
Orgad Shaneh
4a0a7d8801 qbs files: Add qtpromaker tool
Change-Id: If13caf1eac00c786830c3237da7677fe13f50c56
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-11 07:21:05 +02:00
Orgad Shaneh
f29d9a60c4 qbs files: Add AutotoolsProjectManager
Change-Id: I9976f8328c04f95d08e0603f40915058f62fa63f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-11 07:15:54 +02:00
hjk
609bef7520 debugger: Fix section flag reading on 64 bit targets
Change-Id: Ib69e4484ed14aba4a024be7d3868f58ea76f60b1
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 17:29:27 +02:00
Leandro Melo
c95a0e40f3 C++: Break on newline when lexing char/string literals
Actually this behavior was already in the Lexer for regular string
literals (although erroneously not for wide ones) and was lost
in the recent commit 23c637c4f6.

Change-Id: I36609038ce22dc6389e9da5b078f7bf7f6c031be
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 17:24:15 +02:00
hjk
81754b7857 debugger: extend elfreader to 64 bit targets
Change-Id: I0ba7984c4b1916f63ce499411b807b61f83d40d0
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 17:19:11 +02:00
hjk
d693df391c debugger: read file type and machine type from binary
Change-Id: I3faa92ef8add807389ca3d87197e83df948f149a
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 17:18:39 +02:00
Christian Kandeler
c310f1671c SSH: Add parent object to SshConnection constructor.
There's no mandatory use of shared pointers anymore, so client code
should be able to make use of QObject-based ownership.

Change-Id: I2344ca66a40c310ef739b32502eb8471da98c03a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-08 12:41:31 +02:00
hjk
92c7dce14f debugger: more elf shuffling
Also distinguish between debuglink and buildid.

Change-Id: I1b55d1df42576c004050d319f46fb8c2ced9c85f
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 12:40:08 +02:00
Christian Kandeler
79de09f266 SSH: Streamline SshRemoteProcessRunner's output handling.
Make it just like SshRemoteProcess (and QProcess). The current
implementation annoyingly forces client code to establish additional
signal/slot connections, even if they only want to evaluate the output
at the end.

Change-Id: Id8c30dd156574d7d26d848d8e0705856a16d3747
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 10:15:43 +02:00
Christian Kandeler
303e67304e SSH: Name SshRemoteProcess::ExitStatus values like the QProcess ones.
(We cannot use QProcess::ExitStatus itself, because it does not contain
FailedToStart.)

Change-Id: I83ed6de621e2693e539562cd8e56ef478fa4fcb9
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-08 10:12:11 +02:00
Christian Kandeler
69a437873a Fix compilation.
Change-Id: Iabaa6fd23ae3ab80c405a698e005eed6d5b4c9d1
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-08 09:09:06 +02:00
Christian Kandeler
74bedd0583 Message manager: Fix newline handling.
Appending it once is enough.

Change-Id: I6133e4240c3434bc4a08afdb15ad4a1f6416fee4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-08 08:44:51 +02:00
Aurindam Jana
6ae69447a4 QmlInspector: Update inspector
Update inpector when evaluating expression in
inspector for mixed debugging.

Change-Id: If2bad9d59b3ec3c0f2aa2a2d5f8a594701662bd0
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-08 02:53:40 +02:00
Christian Kandeler
ffb19c510c Fix Core::Id cleanup.
qstrdup() uses new[] to allocate the array.

Change-Id: I014cfb697d792ff7bae5f1fdc58d8e6069f06e14
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-07 18:37:18 +02:00
Orgad Shaneh
b25dfed9ff Gerrit: Prevent losing portFlag when changing other settings
Change-Id: I2ca531b8d9ea9a01739c2f28b7b36e189b0b9b9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-07 13:54:54 +02:00
Tobias Hunger
d10b52741a Make custom process step and custom exectuable step UI more similar
Change-Id: I7d3c5109ac56f5d4627ad590d8e13e235433fe59
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-07 13:38:52 +02:00
Kai Koehne
ee76110cf2 Debugger: Fix automatic connection to QML when we don't get app output
Change-Id: I34dff23401c34d3d0c940fac40a6d1d95e830ccb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-07 13:27:11 +02:00
Tobias Hunger
ec5c280e21 Fix commit to mercurial repositories
Tasknumber: QTCREATORBUG-7511

Change-Id: I07991c1d96b3239e66d47d9c7d5c85f8fdc14af4
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2012-06-07 13:07:02 +02:00
Christian Kandeler
f1a0c2ac0c Device support: Use the right type of quotes in the settings widget.
Change-Id: I90f6c899be453fa70ae609cb5204f5976333fe65
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-07 11:38:29 +02:00
Tobias Hunger
8113465f41 DetailsWidget: Remove useless code
setAlpha(...) takes an int, so due to rounding the alpha is actually
set to 0. Fixing that adds a rather ugly highlighting effect that we
don't want, so remove the code completely.

Change-Id: I61f06dcff7908ea1527c22e3c61ee6c027ed7553
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-06-07 10:30:14 +02:00
Tobias Hunger
80b40164f6 Fix warnings count
Only count build system/compile warnings

Change-Id: Id1a09fdef5d08aafec0a366584132a9c11d10b10
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-07 10:30:01 +02:00
Tobias Hunger
bf9b3e589c Abi: Recognize harmattan as linux flavor
... when parsing an abi string

Change-Id: Icb6fc352ff2d58f6ae7f38eba803c12f2d3d082a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-07 10:29:45 +02:00
Tobias Hunger
047cdc284e Fix warnings about uninitialized variables
Change-Id: Ifa3555e603314e1f5084ca487e21b004e6da7c44
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-07 10:29:27 +02:00
Thiago Macieira
e638dc8232 Fix compilation error with C++11: space needed for string concatenation
The error was:
filenamevalidatinglineedit.cpp:101:47: error: unable to find string literal operator ‘operator"" SLASHES’

Change-Id: If990dd75a7b2cb4186b81115087c66e0dd1d888b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2012-06-07 08:07:49 +02:00
hjk
545f9846d5 debugger: handle new 'LoadRemoteCore' in switch
Change-Id: I650d666a3d1eef23cbf34b0d7a3308666abcd42c
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 23:00:15 +02:00
Joerg Bornemann
0e1d7c6b14 Windows compile fix for elfreader
Change-Id: Ie7c0d9d57cddc609fe621876cfc63e0c60b0fa39
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 15:43:29 +02:00
Christian Kandeler
3e809de1cf SSH: Fix send buffer flushing.
There might be more data to send than what fits into one packet. This
case was not handled correctly.

Change-Id: I5a415223c37ec8a041503d901bbcc81e903f46d9
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-06-06 15:39:25 +02:00
Fawzi Mohamed
cc35259431 mdnssd: avoid leaking descriptors
fixes upstream bug

Change-Id: Ic971e5a9566319ec3baea0a381271fd3bd8d49bc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-06-06 15:28:33 +02:00
Simjees Abraham
2574a58469 Debugger:Clearing the object tree corrected.
newObjectsCreated reset while clearing the object tree.

Task-number: QTCREATORBUG-7519
Change-Id: Ie5ee9bfd0faafb60f968a0c219b372eea6679761
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-06 15:02:39 +02:00