Commit Graph

32683 Commits

Author SHA1 Message Date
Tobias Hunger
9dd656914a Qbs: Fix memory leak in Qbs Project Manager
Make sure the root node of the project tree is actually deleted.

Change-Id: Idf32460d7b5d0518da9536084cccb074638cfce3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-22 13:26:50 +02:00
Eike Ziller
5686f5fd70 QUrl dumper: use correct string type name and extend test
Change-Id: I7fe88d11b3d52ba31d3e8564b673a35001e31488
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 13:20:03 +02:00
BogDan Vatra
d8aadac323 Remove adb daemon logs
If adb daemon is not started, adb devices command will add two lines to
the output, messing up the devices list.

Change-Id: I40dcf586d2661df2de0a56aaac543c3b4739ab0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-22 13:05:08 +02:00
hjk
bdf8655376 Debugger: Make LLDB auto test start again
Change-Id: I11358adc8c01dd1261627f35d0f35500e8b34989
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 12:46:25 +02:00
Eike Ziller
1eb88443d7 Merge remote-tracking branch 'origin/2.8' into 3.0 2013-10-22 11:38:21 +02:00
Eike Ziller
16c2ee1b99 Merge origin/2.8 into 3.0
Conflicts:
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: I1028a14230b9dea0cdb68068469a96e8ddb78754
2013-10-22 11:37:14 +02:00
Eike Ziller
8f00f261aa Merge origin/2.8 into 3.0 2013-10-22 11:34:20 +02:00
Marco Bubke
52d8cd2529 QmlDesigner: Remove qml2puppet test file
Task-number: QTCREATORBUG-10449
Change-Id: Ied72268910bc2312c3d293da0ef38c1ff8b72fc4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-22 11:14:14 +02:00
Eike Ziller
515a958083 Fix Qt5 QUrl dumper
Change-Id: I5da72aebe30a3f7030b44566561fca25ce867c0a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 10:47:21 +02:00
hjk
fc52b30450 Debugger: Simplify QVariant{Hash,Map} dumper
Change-Id: I4c5c79f9b2b2d739971d9f50a2b48cfde005e167
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-22 10:11:17 +02:00
hjk
43ceec94f4 FakeVim: Initialize new m_inFakeVim member
Also move initialization before connection setup.

Task-number: QTCREATORBUG-10443
Change-Id: I3f3d074534a44a0aa6b8cc60c8ffbcd22d96ca33
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-22 10:01:29 +02:00
Eike Ziller
4eabcdc8fd Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
2013-10-22 08:40:59 +02:00
Friedemann Kleint
4ffd5403d5 QNX: Fix compilation with Qt 4.
Change-Id: I8607dd339f5c6e3580f2e17c8ca3b7bcbbb11a8e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 08:33:04 +02:00
Friedemann Kleint
50f522b2f7 Remove most trailing newlines from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-22 08:05:09 +02:00
David Schulz
10f42df8b3 CppEditor: Remember project in preprocessor dialog.
Change-Id: If226707541b1fd4d5c22de2795fb39bc333cfa49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-22 07:38:24 +02:00
Thomas Hartmann
ffc90ba09f QmlDesigner.PropertyEditor: Adding PathViewSpecifics
Change-Id: I79192a68a0ac71970f4069a9ccc5696a56dda607
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-21 20:58:48 +02:00
Thomas Hartmann
bbe0acb26a QmlDesigner.Model: allowing some diagnostics for exceptions
Setting QTCREATOR_QTQUICKDESIGNER_WARN_EXCEPTION will give detailed
information about any exception thrown.

Change-Id: Ia11b98324e6f0c27e086778ddcb1afec67d92e6a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-21 18:21:06 +02:00
Thomas Hartmann
a66c122df4 QmlDesigner.PropertyEditor: fix specifics for controls
User the new Qt Quick 2 format.

Change-Id: I178ffe84c49df51bcf96983c3a0c89e240f5bf58
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-21 18:08:18 +02:00
Eike Ziller
d33f7fd2c7 LLDB: Implement qtVersion() for dumpers
Reads the version from Qt Core instead of just assuming Qt 5

Task-number: QTCREATORBUG-10427

Change-Id: Ifa7944c37449afe95c26b2c57e694be8eb8cbf4d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 17:13:45 +02:00
Leena Miettinen
db055b9cf9 Doc: turn the number icons green to match text color
The blue icons did not match the new UI style and
font color in docs.

Change-Id: I7d4cdf71944ab37bd6b01a6a66c7b23b8f816a09
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-21 16:59:03 +02:00
Leena Miettinen
1dfa61bf6f Doc: update screenshots of output panes
Change-Id: Ie4eeed456b7eeb28d14e8dc2ad5dba64a2c37e6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-21 16:58:40 +02:00
Christian Kandeler
e2fa2d71fd QbsProjectManager: Clean up qbs::Preferences object.
Change-Id: I5921b97b42a94aaa9c06d47f8581538c12c4fcab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 16:09:22 +02:00
El Mehdi Fekari
6cc396efed Qnx: Fix broken qmake environment
Fix the way we parse PATH and LD_LIBRARY_PATH.

Change-Id: I9928bf3573728580af6f361ce30101d8db142fc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 16:07:13 +02:00
hjk
fafc00da4a Debugger: Fix QVariantMap/QVariantHash dumper with Qt 5
Change-Id: I71358adc8c01dd1261627f35d0f35500e8b34989
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 15:02:40 +02:00
hjk
6f6999bee3 Debugger: Fix boost/time dumpers with Python 3
Change-Id: Ia93034641889603c4de57babf0117132eeb0c0cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 15:02:24 +02:00
hjk
bec053528e Debugger: Add a README on how to handle the dumper auto tests
Change-Id: Ic14ab793369fd5fb5649dac6518152bcbfa5ac29
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 14:43:01 +02:00
hjk
3eac8daba9 Debugger: Add a few 'unused' to auto tests
Spoils the optimizer's fun a bit.

Change-Id: I3321d6c1fb75a9ecc6e603422116636c3c6cc4c2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 14:42:48 +02:00
Tobias Hunger
d558d077e2 Vcs: Do not leak parameter widgets
Executing a parameter widget command calls a diff() or log()
of VcsBaseClient. The editor already existed, but
parameter widget is always created (call to setConfigurationWidget()
will be ignored in this case) - and parameter widget gets leaked.

Change-Id: I25591d5a54b80fed25ff11ce26108882c421e9fc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 14:42:47 +02:00
Tobias Hunger
5126f01fd6 Qbs: Do not throw away old project data if parsing failed
Change-Id: Icc54abcfcee1f8deea5247d46d8d13b75741feda
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 14:27:35 +02:00
hjk
8c02d6e0dd Debugger: Fix QChar dumper with Python 3
Change-Id: I7da412c9bdaf3a8f65484ac99f06fc31a5cdc1c3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 14:15:56 +02:00
Leena Miettinen
59fd03abc3 Doc: fixing the table on the front page
The table broke when the Publishing section was removed.

Change-Id: If39dd5842a267500bc5c8ef0d39b397d06a101a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-21 14:05:54 +02:00
hjk
11bf267604 Debugger: Offer base changes for all integral looking values.
If it talks like a duck, and walks like a duck...

Change-Id: I166a452a9d067285467b346a4ef5d4de646d3a31
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 14:05:22 +02:00
Eike Ziller
e11f9e55b5 Add binary compatibility policy to coding style document
Change-Id: Ib70216a555eea0c3bc88d0ab3177839bb11c879d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 13:38:08 +02:00
Tobias Nätterlund
5fb7e6f1f7 QNX: Use slog2info on pure QNX devices for debug output
If available, slog2info should be used even for pure QNX devices
to get hold of the debug output.

Task-number: QTCREATORBUG-10442

Change-Id: If85855e94803a4b8648e84c0295bfdd2271e8d76
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-21 12:51:12 +02:00
Eike Ziller
51a257637e LLDB: Set environment for debugged process
Task-number: QTCREATORBUG-10030

Change-Id: Ib487cee704ea30f52c52f6f025823637fa4199eb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 12:25:49 +02:00
Thomas Hartmann
1a960865a2 QmlDesigner.PropertyEditor: fix for point and pixel size
Task-number: QTCREATORBUG-9769
Change-Id: I1a1a9ebbda78daec0a62cb2e7c7859a636da57dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-21 12:12:48 +02:00
Tobias Hunger
e7c51ebd05 Abi: Add unit tests for MSVC2013 detection
Change-Id: I7ab801761d88c4dde45fe1fb9f6731b65ac3d0f0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 12:00:40 +02:00
Yuchen Deng
67a7eba6fa Add MSVC2013 support
Change-Id: I956b5796a67792f826ddc72e7681609372a9c029
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 12:00:29 +02:00
Nikolai Kosjar
18cba4fcf9 CppEditor: Remove duplicate code in cppeditorplugin.cpp
Change-Id: Ifeff4455b1ce0a0a7299f009beaf6319e9abb523
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-21 10:33:26 +02:00
Tobias Nätterlund
c35a6d610c QNX: Refactor BlackBerryLogProcessRunner
This change introduce a separate class for running the slog2info
process, in order to be able to use that for pure QNX (non-BlackBerry)
devices.

Also moved from using QSsh::SshRemoteProcessRunner to use
ProcessExplorer::SshDeviceProcess for the tail/slog2info processes
instead.

Change-Id: If917bd2a1099800f1a7333639d674c8d1b16de7b
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-21 10:31:15 +02:00
David Kaspar
3d2ef178f6 Qnx: Fixing Bar Descriptor XML file editor to provide editor actions
BarDescriptorEditorWidget is using TextEditorActionHandler class
to provide editor actions e.g. Undo, Redo, Cut, Copy, Paste accessible
from main menu and using shortcuts.

TextEditorActionHandler.resolveTextEditorWidget() virtual function is
added to all resolving TextEditorWidget for an Editor. This allows
to have IEditor->widget() to have non-BaseTextEditorWidget instances too.

Task-number: QTCREATORBUG-10040
Change-Id: I6f433fc307c13ef2b2a20c48e6473826f2619544
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-21 10:26:29 +02:00
Mehdi Fekari
ab4207acf2 Qnx: Use Utils::Environment for qnx environment
Change-Id: I499ca9be0abc15fc0c57847ff288e80612a536fe
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 10:24:48 +02:00
Tobias Nätterlund
295c688469 QNX: Fixed killing processes on QNX and BlackBerry
The commands were mixed up in previous commit, we have to use
pidin on BlackBerry, at least the older ones.

Change-Id: Ibff1f386c6570814a4bccfef5404e60854222f24
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-21 10:02:36 +02:00
David Schulz
34ef3f244e CppEditor: Add action to open a preprocessor dialog
Change-Id: I5ed09f6b8a358652145012e137ab717729999aca
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-21 08:27:51 +02:00
hjk
ffe50efa00 Debugger: Remove wrong check in boost::shared_pointer dumper
Task-Number: QTCREATORBUG-10441
Change-Id: I404fe9848444c2b03c086d027c0f3716f0bb3542
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 02:12:34 +02:00
hjk
daf8d9bcf5 Debugger: Fix QVariant dumpers of Gui types.
Ouch...

Change-Id: I5cf5b660b451c26f55663bd81ea7fab4404c2884
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-21 01:20:33 +02:00
hjk
49a2d45e59 Debugger: Fix encoding switch between Python 2 and Python 3
Change-Id: I29260139fa82f63c3e278913c5e3aa9f658d15d6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-19 15:22:23 +02:00
Tobias Hunger
9816763b01 Debugger: Make ABI matching a bit more fuzzy
The debugger ABI might not be fully defined, so ignore any field
that is undefined in the debugger ABI.

Change-Id: Idf57b76efff12d4ab4c21f18721a02970efbf217
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 17:53:00 +02:00
Tobias Hunger
78dafd4f1f BaseQtVersion: Remove some useless calles to updateVersionInfo()
qmakeProperty and qtVersion call that implicitly already.

Change-Id: If4596740b9da02ef662b9831019f19c4d679cd39
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-18 17:52:08 +02:00
Tobias Hunger
66c52af89a Qbs: Do not copy build step and build step list
Those are owned by the DeployConfiguration and we should not copy those
settings since we may belong to a different DeployConfiguration.

Change-Id: Ibb80eb808c8e0f790b35e38bb3dfcf357cf579d2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-18 17:51:57 +02:00