Commit Graph

31174 Commits

Author SHA1 Message Date
Nikolai Kosjar
b4c3cef863 C++: Fix crash for nameless using declaration
Task-number: QTCREATORBUG-9323
Change-Id: I52dfe8c03da14fc08723c3878fec0f6e9150152c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-24 09:38:57 +02:00
hjk
7fbcf01e40 Debugger: frame.GetFunction().GetName() is not GetFunctionName()
This makes 'start' show up in the stack instead of 'None'.

Change-Id: Ie277c4f86bb09e14c26babf63127d48871c09cfb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-24 09:30:02 +02:00
hjk
81b7ed3636 Debugger: Fix step out and instruction-wise for LLDB
Change-Id: I1017aefdece671f748f00b9c6bc2385d85b8c170
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-24 09:16:02 +02:00
Nikolai Kosjar
5402b8912c CrashHandler: Opt-in instead of Opt-out
Enable the crash handler by defining the environment variable
QTC_USE_CRASH_HANDLER=1 (evaluated on start up).

Change-Id: Ib7f9fa016ab24a15082fbd90fd334bd4f2b17234
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-05-24 09:02:35 +02:00
Thomas Hartmann
2e9f6a7935 Wizards: Adding a title to the Qt Quick Controls template
Task-number: QTCREATORBUG-9304
Change-Id: I9faa92bd9c1107066d7d312008a7e10613b414ff
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-24 08:47:48 +02:00
Christian Stenger
5deb6644a4 Squish: Fix strange infinite waitFor()
This caused WELP02 to wait forever on one testing machine although
running fine on local and other testing machines.

Change-Id: Ie66c3197f63f6f3224993107d039b0cf4b817483
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-23 17:33:18 +02:00
Christian Stenger
70709f7670 Squish: Added test for session handling
Change-Id: Ie177c4f86bb09e14c26babf63127d48871c09cfb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-23 17:33:10 +02:00
Christian Stenger
3590eed886 Squish: Clean up before and after Qml debugging
Change-Id: I592842964984b51669b773a9af1fdd81df032f7b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-23 17:32:52 +02:00
Christian Kandeler
8a0c8081a0 Update qbs submodule.
Plus some minor adjustments in the qbs project manager to an API change.

Change-Id: I41ea8571fee7ec666344464ecc4f808bf92f13ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-23 17:25:45 +02:00
hjk
f37cf85d16 Debugger: Make LLDB std::vector dumper work
Change-Id: Iaa1a0065f1b7db60be5ed6006cd64c853cecc001
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-23 17:16:58 +02:00
Leena Miettinen
df882155b5 Doc: snapping to anchors in the Qt Quick Designer
Add documentation for the new button and update
the screen shots. Fix changed field names.

Change-Id: I291f63b4c87090012a3f4bf2cbbc4172e3b58aa5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-23 16:54:01 +02:00
Marco Bubke
7e10ca6f1c QmlDesigner: Improve tool tips of the snap actions second try
Change-Id: I5efed5ffdccc5ce0aa13b1e7296137396ca28efe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-23 16:53:01 +02:00
hjk
484357035f Debugger: Don't show LLDB's "synthetic" name suffix
Change-Id: I4229792171edef807619ec4e68393ec3e91e12dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-23 16:51:17 +02:00
Marco Bubke
1b1054797c QmlDesigner: Change misleading name in designer options
Change Snap Margins in Parent item padding and item spacing to sibling
item spacing.

Change-Id: I4356cb415c93689e8dde96ad195aab254edabbc2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-23 16:48:07 +02:00
Leena Miettinen
26c412deac Doc: fix function signatures in code documentation
QDoc cannot find functions if the signature in the \fn command
is not identical to the declaration, including 'const' qualifiers.

Removed the \fn where the documentation comes immediately before the
function, as qdoc does not need it in that case.

Change-Id: If6a2a2e2d58b394905c803787d2a93489049e4ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-23 16:30:35 +02:00
Daniel Teske
86110d7038 Android: Clen libs on device: Fix memory leak
One QProcess per run of clean libs

Change-Id: Idcf6155e71ca5cec7cb4be1509191ba49c69cefd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-23 16:26:54 +02:00
hjk
dc2096e83f Debugger: Move templateArgument implementation to Dumper class
This sets the scene for LLDB which needs direct access.
The global functions in gbridge.py stay for now, to keep compatibility.

Change-Id: Ia81f682ac2066acde3239f2d1e27f5e442361b11
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-23 16:17:32 +02:00
Marco Bubke
9a1a0065f1 QmlDesigner: Rename margins to padding
The old name was misleading.

Change-Id: I253b21530e0f2c7c68c4850190d791aeb8567172
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-23 15:37:14 +02:00
Thomas Hartmann
61828eda74 QmlDesigner.PropertyEditor: Adding sheet for QtQuick.Window
Change-Id: I99eee33ee7557aa94069b4dc999cb9f9a711caaa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-23 15:35:53 +02:00
Thomas Hartmann
c884f629d6 QmlDesigner.Instances: custom rendering for QQuickWindow
Change-Id: Id2d9bd6b7f5cecefffddece30bb93a69699beeff
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-23 15:35:46 +02:00
hjk
1cc957d47b Debugger: Remove hard coded python path for LLDB modules on Mac
Change-Id: I4229792171edef807619ec4e68393ec3e90e12dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-23 15:07:38 +02:00
hjk
4786cee969 Debugger: Issue "threadnames" command again
Was accidentally disabled in 066efcd6a6.

Change-Id: I64de0609a254aa2914142a4f75105b4140b6ae5b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-23 15:07:21 +02:00
Friedemann Kleint
98856feeea Convert BlackBerry permission tooltips to HTML.
The manual wrapping is hard to handle for translators.

Change-Id: Iec1247bcb54c4ceedc90c721e7c2fab5b96b1545
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-23 14:59:25 +02:00
Leena Miettinen
6a29734714 UI text: fix caps and punctuation in QNX text
Change-Id: I5f09a1275806b93f777b6f6e8ebb3cad9cf1fa05
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-23 14:46:38 +02:00
Thomas Hartmann
6f32c398a1 QmlDesigner.MetaInfo: Do not limit running the parent hierarchy
Change-Id: I95ba118c8ddd7e01117f649f2ff974f2c6ee4444
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-23 14:04:18 +02:00
Marco Bubke
e31cb4e4a4 QmlDesigner: Improve tool tips of the snap actions
Change-Id: I931ef58655e896f276617ce21fb1c6fc9d912973
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-23 14:01:22 +02:00
jkobus
b8acf23ec4 Synchronize horizontal scroll bars in diff editor
Synchronize horizontal scroll bars by default.
Added corner widget to toggle synchronization off.

Change-Id: I52316f1d9399b9ad21a346d65873b37ce0a9b98f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-23 11:53:23 +02:00
Marco Bubke
f1d141b915 QmlDesigner: Make the snap padding the same value like in the controls
Change-Id: I68e15adae4f19a3b9ad62e2e1693fb83d6423fb1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-23 11:49:48 +02:00
Orgad Shaneh
9617005e1d Cleanup PythonEditor and Todo project files
pluginspec.in and dependencies.pri are included by qtcreatorplugin.pri

Change-Id: I05a0ffba320e470216f2272ad39390d04b7f54e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-23 11:16:13 +02:00
Eike Ziller
3e25f61e74 Fix crash when closing extra editor windows.
Change-Id: If1aaceabedc76bb82e90eecb2a83f07c5d114d02
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-23 10:34:33 +02:00
jkobus
a033beecc8 Simplify code
Change-Id: I1576c3b8d370fdae660a399654b77af11a5f5d36
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-23 10:19:23 +02:00
Eike Ziller
d017495a9f Fix positioning of open editors popup
Make it position over the editor root view of the active window (of
the current editor view if the active window doesn't have editor views)
instead of always over the main window.
For this to work we should not make the editor manager parentless in the
editor manager placeholder.

Change-Id: I55d38340939a37960ec619b89f2e768bbfab7f24
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-23 10:07:20 +02:00
Nikolai Kosjar
0d9bf5e543 C++: Fix 'already seen files' when indexing
Resetting the environment (after each *.cpp file) did not clear the
already seen files (m_included). Because of that the succeeding header
files were not parsed correctly - the environments of the mistakenly
already seen header files were not merged in.

Note that this change slow downs the parsing/indexing of files to its
original speed, as it was before the problematic commit (and it is in
2.7):

    commit 82e347095c
    C++: Untangle include file resolving from loading.

Task-number: QTCREATORBUG-9205
Change-Id: Iea57b7c59ea04a3c8843fd1291f4c375382958fc
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-23 08:37:36 +02:00
Nikolai Kosjar
3e80f52414 C++: Tests: Generalize for using different test data dirs
...for the modelmanager tests.

Change-Id: I91f163df1ed958a3915ce263b12e3e30cda0b78f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-23 08:37:31 +02:00
Aurindam Jana
bb85fcdbb5 CustomWizardParameters: Parsing of replacement fields
Parse each possible pair of %%.

Change-Id: If1f504c16cd7c3b171a1df62efd2927fd28ab4fa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-23 08:15:25 +02:00
Eike Ziller
c88d7be702 Merge remote-tracking branch 'origin/2.8' 2013-05-23 07:26:09 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Christian Strømme
35b96f2fc1 Android: Detect conditional dependencies.
To solve the problem with libQt5MultimediaQuick_p we need a way to detect
if an application is using both QtMultimedia and QtQuick.
This change adds logic to parse the -dependencies.xml file and look for
lib elements that have the extra attribute "extends". Libs with the
extends attribute will only be added to the list of dependencies, if the
library it extends is available.

Task-number: QTCREATORBUG-9300
Change-Id: I6f3e0a6d9158a91824e1e113f6aab7ec1112dd56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-22 18:24:40 +02:00
Thomas Hartmann
1c6a3b9dbf QmlDesigner: Check for QtQuick 2.1 in states editor
Task-number: QTCREATORBUG-9298
Change-Id: I8660e7d9614e77d23e1ef6515904941505f410dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-22 17:42:46 +02:00
Tobias Hunger
24ee641543 Fix dependency information according to output of dependency checker
Change-Id: Ic1259f04f4120b6e495ebb3672f7f360c71cba7f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-22 16:41:39 +02:00
Tobias Hunger
ec442f5504 Plugin dependency checker script
Change-Id: Icf83c978cd576e0d23e5183d688ef0c96210d484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-22 16:41:30 +02:00
jkobus
8311e20246 Fix highlight artifacts in diff editor
Which appeared after pressing "..." mark and scrolling right.

Change-Id: I779d4a7e76ebb01857d7313b5099a5482c455136
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-22 16:15:33 +02:00
Daniel Teske
6622aa91ce AndroidManifestEditor: Use indent 4 for formatting source
Change-Id: Iece75754acafda7c3bcaa8fe043a2aae98ef7e32
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-22 15:08:16 +02:00
Daniel Teske
942e415866 AndroidManifestEditor: Disable text actions if the editor is hidden
Change-Id: Iac60829f9db5d425c70f7ff7a1124ec33f2d5173
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-22 15:08:11 +02:00
Daniel Teske
c58c33764e AndroidManifestEditor: Readd some tweaks from the .ui file
Fx the version code spinbox being too big and readd some tooltips.k

Change-Id: I6e2e10d64d9616809f3b97c8c9a5d1e668c025ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-22 15:08:03 +02:00
Daniel Teske
bf1afce579 Andoid Manifest Editor: Adjust look to be more in line with a editor
Use the same styling as e.g. the submit editor.

Change-Id: Idb396b6971f75d9f4a876edf992c917ee81820df
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-22 15:07:58 +02:00
Marco Bubke
7976456002 QmlDesigner: Add content item hack
There is no stand content item interface, so try to work around to enable
snapping and anchoring.

Change-Id: Ib2eaf0d6c35e3ba289dd7d55b2ba4c064ad40748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-22 14:45:43 +02:00
hjk
288d239656 Debugger: Handle LLDB differences between Linux and Mac
Change-Id: Ie97c628ece272249c23aab6d5438555c051f5aa7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 14:25:37 +02:00
Friedemann Kleint
292cfce0df Fix change selection dialog.
Remove context help button and prevent it from showing up at 0,0
by setting a minimum size only.

Change-Id: I41d019b0074a47a20ecacd557f1ea05235dda995
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-22 12:38:20 +02:00
jkobus
55717e1167 Respect tab settings in diff editor
Currently it's not possible to respect language specific tab
settings in diff editor. It can happen that one view
contains C++/Qt Quick files, while tab settings
are common for the whole view.

Change-Id: I45c6113afd7d41667b68a4daba0ac0fa4472b4e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-22 11:19:34 +02:00