Commit Graph

31174 Commits

Author SHA1 Message Date
Orgad Shaneh
f298b063c8 Ignore dirty working directory for qbs submodule
The submodule is mostly used for building against, not
for editing.

On most cases, its internal status is not interesting,
and git scans it for no reason.

Change-Id: Ic290bd78fdb6704a15264a022125c99cf006a0db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-02 12:38:13 +02:00
Eike Ziller
00885ca9a5 Remove code duplication in open editors window
Change-Id: I9007e1171fa6d519df8cf62978bbd2936d901876
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 12:29:54 +02:00
Daniel Teske
111392f6c5 Android: Make cleanPackageName automatically correct more errors
Disallow keywords, and parts that start with a digit.

Task-number: QTCREATORBUG-9200

Change-Id: Ia8b42c3015393f3e76126e311eebb728425726b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-02 12:19:18 +02:00
Eike Ziller
bb37f111a7 Fix wrong unsplit icons when splitting without open documents
When doing splits while no document is open, the wrong unsplit icons
where set on the individual editor views (the ones next to the split
menu button and the close editor button).
This also happened when restoring sessions with splits.

Task-number: QTCREATORBUG-9121
Change-Id: I793670518eddee3e57fef5a4ac4a266edb450b14
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 12:17:28 +02:00
Przemyslaw Gorszkowski
64d80150fa C++: fix code completion when 'using' declaration inside function
Looking for using declaration when lookup a type

Task-number: QTCREATORBUG-2668
Change-Id: I11600c5be262840472dd4c9e72334760a35aa4a0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-02 10:42:19 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal()
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-02 10:13:19 +02:00
Nikolai Kosjar
6441c258e6 Fix typo (|| operator instead of |)
Change-Id: I2a5707f04175ef96d678e57b7c61fb8d6cec4d75
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-02 10:11:07 +02:00
Tobias Nätterlund
082bf324fe BlackBerry: Browse for debug token now starts in the correct directory
Change-Id: I471f24bc65b393ee9d619198c1bb982cf93e2786
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-05-02 08:54:51 +02:00
David Schulz
ae3a25e05d GDB Makefile: added define for SOL_IPV6
Added in the ipv6 patch.

Change-Id: I2d6257b9deb1f1fdec85dd89d799e69b04b1a462
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-05-02 08:05:23 +02:00
Orgad Shaneh
3245b706bc Fix crash
Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-05-01 09:33:39 +02:00
Sergey Shambir
ec8a01c150 CppTools: added ProjectPart::evaluateToolchain()
At this moment each project manager duplicates code that reads C++ code
model information from ProjectExplorer::ToolChain.
This change provides unified way.

Change-Id: If9ecfc40991aab90768dd69f5f10f31bbf5fbc21
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-30 17:31:43 +02:00
Sergey Shambir
6faf45a465 ProjectExplorer: extended Toolchain::CompilerFlags
Now it provides information about C language standard and C++
extensions. No new behavior added to project managers.

Change-Id: Ib7c19641f452a75c9b14cd7e33d104dcd1603720
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-30 17:31:22 +02:00
Kai Koehne
369351cbf2 Make sure QtQuick2 plugin is installed into right directory
Task-number: QTCREATORBUG-9229

Change-Id: I0ec3fef8cdc795f041c7ec39c1fd6b68a138046f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
2013-04-30 16:39:41 +02:00
Thomas Hartmann
22f63eddb7 WelcomPage: fix video description
Task-number: QTCREATORBUG-9087

Change-Id: I80866ace00f940000407cc25cecaad6fac8b6eee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 16:08:33 +02:00
Thomas Hartmann
2130c49102 QmlDesigner.PropertyEditor: allow translation of all strings
This patches adds the tr checkboxes to all string in the
generated property  sheets.

Task-number: QTCREATORBUG-9184

Change-Id: I4a3ff8120d7ccd5a6b9e11d212f955cd66ba01aa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 15:15:02 +02:00
Nikolai Kosjar
6ab892f067 CppEditor: Clean up
Removing an unused variable and fixing whitespace issues.

Change-Id: Ib410eb5b1d7be15a58817d000891ff3c12d129c0
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 15:10:41 +02:00
Nikolai Kosjar
e6e30c3fd3 CppEditor: Tests: Add initial Follow Symbol Under Cursor tests
Test cases are examples from

    Working Draft, Standard for Programming Language C++
    Document Number: N3242=11-0012

Change-Id: I624c315943d6a00e821abb52eef6e0ff4a40f0d7
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 15:00:07 +02:00
Orgad Shaneh
c702639a8e Git: Factor out the central widget from LogChangeDialog
To be used for "amend previous commit" feature

Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:38:05 +02:00
Orgad Shaneh
7b851602cc Git: Use an enum for simple/amend commit
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:38:00 +02:00
Orgad Shaneh
2b41210b3f Gerrit: Add accelerators for Push to Gerrit dialog
Change-Id: If806dd9b8aefcc1ecaccf326bd08ad1fc23d71c8
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:37:49 +02:00
Fawzi Mohamed
ad254a980c projectexplorer:gccToolchain: add support for platform flags
Add platformCodegenFlags and platformLinkerFlags to gcc toolchain.
This also improves support of compilers (like clang) that can support
different architectures by passing the correct flags, but are not
detected without passig them.

Change-Id: If707558e704f554f27fde7948f7601c5d11835ce
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:20:14 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 14:09:58 +02:00
Eike Ziller
a25d66a944 EditorManager: Get rid of weird logic when finding next view
Removes another algorithm that was starting from the root and took the
whole tree into account.
Instead, make findNextView a method of EditorView, and avoid any
explicit usage of a single root splitter.

Change-Id: I343030521472741a8dfd7134ed16d9beeb10d10a
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 13:44:56 +02:00
Petar Perisin
f4eabcfa0e Git - ChangeSelectionDialog select from recent history
Change-Id: Ib87f9bd997a5c7c07abfd56a05d9e454c1a9ea93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 13:37:05 +02:00
Eike Ziller
21ce4e59a4 EditorManager: Replace another root-to-leaf search by leaf-to-root.
For finding the "parent" SplitterOrView it's much easier to go up the
parent hierarchy than doing a depth-first search from the root.

Change-Id: I4c8e195dae2d1f834fb89ab3c213bad5a0fa7d2a
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 13:32:28 +02:00
Orgad Shaneh
711315f383 Gerrit: Add topic in Push to Gerrit dialog
Change-Id: I4f2df0d40d7518b1a88595ad2ff52fd50b8ac92d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 13:26:29 +02:00
Thomas Hartmann
af1231b6d5 QmlDesigner.SubComponentManager: We have to use importPaths
Otherwise we skip items derived from types only available via imports.

Change-Id: I102a4843652029dff777e12594efc4d5e5e50999
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-04-30 13:25:21 +02:00
Thomas Hartmann
2ee3bae40f QmlDesigner.MetaInfo: avoid endless recusion into "." properties
Actually "." properties can recurse infinitely.
If a type MyType has the property parenType of MyType and
it is a read only pointer, we get an infinitely recusion into
"." properties.

parentType.parentType.parentType...

Actually this seems to be valid QML and is really the case with Menu.
(In the private API though, indicated by "__")

Since we enumerate "." properties in the Qt Quick Designer, we
run into an infinite loop.

I just cut the recursion at level 3.
So we stop at myParent.myParent.myParent which I think is reasonable.

Change-Id: I80866ace00f940000407cc25cec9ad6fac8b6fee
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-04-30 13:14:08 +02:00
Thomas Hartmann
bdeb9371ee QmlDesigner.Instances: The engine does set the QObject parent first
We should follow the engine and set the QObject parent first.
Actually some items (e.g. menus) do not like it differently.

A note: The engine seems to always set the QObject parent even for items.

Change-Id: I700e8802300b8eee093f73ea11e07c4cdb0338aa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:11:18 +02:00
Thomas Hartmann
7a5836d257 QmlDesigner.Instances: emit component complete signal for 5.1
Emitting the Component.onComplete signal.

This is only available in Qt 5.1

Change-Id: I77503333296cccd9999d2610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:11:05 +02:00
Tobias Nätterlund
8f3a8d47c1 BlackBerry: Only add the Bar Descriptor category once to the taskhub
Change-Id: Iaaa565559a38753bb08ef986557d2ca489e5e190
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-30 13:10:00 +02:00
Thomas Hartmann
9763e9e325 QmlDesigner.Instances: always set the QObject parent.
We follow the QmlEngine/VME and always set the QObject
parent before reparenting into list properties.

Also we set the QObject parent for all objects.

See qqmlvme.cpp line 622
QQml_setParent_noEvent(o, parent);

Change-Id: If889e6cc07e99ea443b80de13c4be9dce6c2ceee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:08:22 +02:00
Daniel Teske
4e37f1cd7f Android: Speed up project opening by caching the sdk version
The slowness is due to AndroidToolChain::addToEnvironment() being called
a lot on project opening. Thus we need to avoid any file opening or
process on loading.

This patch does 2 things:
a) It removes the call to sdkTargets() which is unneeded. That actually
checks which avds are available.

b) It caches the target sdk inside a named target setting. That means,
we assume that the file does not change behind our backs.

Task-number: QTCREATORBUG-9164

Change-Id: I9287934a0624db0b3e8318b8cf76e605418850c2
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-30 12:55:37 +02:00
Daniel Teske
b89ca41d97 CustomExecutableRunConfiguration: Use sourceDir if the project has no bc
For the workingDirectory

Task-number: QTCREATORBUG-9118
Change-Id: I63079e95d1da169507a5d932680df955127f0f65
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 12:45:56 +02:00
Tobias Nätterlund
dceb1c3acc QNX: Refactored bar descriptor editor
The Bar descriptor editor now uses the PanelWidget with PropertiesPanels
instead, to make it more similar to the rest of the Qt Creator UI.

Split the BarDescriptorEditorWidget class into multiple, smaller,
classes. Also moved the Entry Text & Images panel to the General tab,
as the Application tab was getting too crowded.

Change-Id: I691ccf3638aaad4b5f0ad0d040094f2144d2cec0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 12:42:45 +02:00
Friedemann Kleint
e3b03d77b7 Fix broken "git blame" on Windows.
Change 48b9747550 caused an
empty string to be passed as argument, resulting in "invalid
revision ''".

Change-Id: I0bcfad3f64298f0d14b00347bc12f42c3c00270e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-30 12:36:41 +02:00
Thomas Hartmann
1bdf7225f9 QmlDesigner.MetaInfo: updating metainfo for controls
These items have proper default sizes.

Change-Id: I102aa843662029dff757e11194efc4d5e5e50a99
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 12:21:18 +02:00
hjk
8d4289bb9c Debugger: Re-organize communication with LLDB
Change-Id: I2916a2e4a180506f01dda237fd356e9a35119117
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-30 11:54:00 +02:00
David Schulz
19bfd1bcd4 Editor: Fix crash on switching sessions.
Task-number: QTCREATORBUG-9220

Change-Id: I0671eaa1e9785ee0327bc8cbd4519c5d696ea0ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-30 11:51:18 +02:00
Eike Ziller
3177c8535a Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/clearcase/clearcaseplugin.cpp
	src/plugins/clearcase/clearcasesync.cpp

Change-Id: Ie696e82f28770f3288c19e2174979f838f2876ad
2013-04-30 11:46:11 +02:00
Knut Petter Svendsen
629c130062 ClearCase: Fix checking if a directory is managed
Now both dynamic and snapshot views are supported under both
Unix/Linux and Windows.

The implementation is based on "cleartool pwv" which gets the
working view.

Change-Id: I0d21d2c84fae4a641a3bac8b1087cfeffb89c447
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-30 11:44:47 +02:00
Knut Petter Svendsen
c222a4f623 ClearCase: Fix checking if a directory is managed
Now both dynamic and snapshot views are supported under both
Unix/Linux and Windows.

The implementation is based on "cleartool pwv" which gets the
working view.

Change-Id: I0d21d2c84fae4a641a3bac8b1087cfeffb89c447
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
2013-04-30 11:44:17 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
2013-04-30 11:43:33 +02:00
Kai Koehne
3aa0e50039 Debugger: Do not set absolute breakpoints for remote targets
Fixes a regression introduced by cb857b47a

Task-number: QTCREATORBUG-9226
Change-Id: I619df0eb8b5f016aac54a0260eb941fd91a348aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-30 11:02:42 +02:00
Eike Ziller
71f1919de9 Mac: Deploy and patch qml imports and qml2puppet
The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.

Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 09:18:43 +02:00
Tobias Nätterlund
9728afadb0 QNX: Improved generation of SSH keys for BlackBerry devices
The user is now asked where to store the generated SSH key,
before it is generated, and if that would fail, is still
enabled to select a different key.

Task-number: QTCREATORBUG-9101
Task-number: QTCREATORBUG-9102
Change-Id: I8e2f732dbcbe7bd3bd3fa9b512a7a195fa868c17
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
2013-04-30 07:35:09 +02:00
Aurindam Jana
22fcb71a8e QmlProfiling: Attach to QML application
Redo the Attach dialog to use Kits. This is in sync with
the Valgrind Attach dialog.

Change-Id: Iaf0c8bc2c5a912b6a93ed21b9757a074a60041c0
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-29 15:50:51 +02:00
Orgad Shaneh
cb02e45b4a Git: Fix commit message highlighting
Fixes the following pattern:

    Subject

    # comment

    Another line - considered as subject

Change-Id: I708521efde886c6f5be748795251ce0aafc8f590
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 14:45:29 +02:00
Christian Stenger
c77395d379 GDB: Fix Makefile for Linux
Change-Id: I5e20bd4e335c1cd9e0ffeb07dd8fdf1f5d4747ac
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-29 12:57:01 +02:00
Orgad Shaneh
5383c4581c Git: Use bold instead of italic for decorated commits
Italic is harder to read, especially when there are many of them

Change-Id: I15bf054356a996308820e5c7969041933aeb538a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-29 12:38:04 +02:00