Commit Graph

31038 Commits

Author SHA1 Message Date
hjk
adc9817671 Debugger: Remove some deprecated methods
Change-Id: I67254bb6d3d23e9fa9e121df0b3b923330cfe84a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-19 12:17:41 +02:00
Nikolai Kosjar
e666da622c Locator: Refactor out filter_helper for tests
...and rename it to runSearch.

Change-Id: I12482b62751a234982f41cafb7e63a641012bc30
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-19 11:55:51 +02:00
Orgad Shaneh
d45b6d7871 Git: Fix side-by-side show opened from interactive rebase editor
Change-Id: Iceb9a536f6dc53bd9a61cbf5b6bab14154196628
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 11:45:40 +02:00
Orgad Shaneh
e1e1936073 Git: Add reflog
Change-Id: Id328492826bdcf4b7f7e6933a9dc3931174de0fb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 11:45:02 +02:00
Tobias Hunger
bbbdee7c60 Taskhub: Small improvements and a compile fix
Change-Id: I59738bb434b4daa664173404cb9bc7555aace4c8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 11:43:27 +02:00
Marco Bubke
d6a94b0dc0 QmlDesigner: Fix warning in ImportManager
Change-Id: I3c392ad333b9a7720495073fb8549996c6f1842d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-19 11:36:37 +02:00
Thomas Hartmann
d9ec96ab31 QmlDesigner: crash fix
prefixNames containing white spaces did crash.
This was lost during refactoring.
Instead of calling toLower one the string
we call toLower only on the first char.
This creates camel case ids.

Change-Id: I1093d12258e87d4f56ceef67a553d844afdfd376
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-19 11:35:11 +02:00
Marco Bubke
882d0e3562 QmlDesigner: Use different transform for QmlAnchorBindingProxy
Change-Id: I54bad5ddc239e3d8e91ff4f39c74bab780c658f2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-19 11:32:27 +02:00
Marco Bubke
02ca509a47 QmlDesigner: Remove unused attention from FormEditor
Change-Id: I9cb2b9f4bffe1c80cfaf6894c934d0eece74dbda
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-19 11:32:22 +02:00
Christian Kandeler
5094fe203c RemoteLinux: Make environment reader check for exit code from env.
A non-existing command may not always result in a "FailedToStart" error,
but can also lead to "normal" finish with a non-zero exit code (from the
shell), which means that people whose remote system is missing the "env"
command currently get no feedback at all when pressing the "Fetch"
button. (Independent of this, the exit code should always be checked
anyway.)

Change-Id: I1387897436825c18e7df2d03d5ee3870ff6b70f5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 11:29:59 +02:00
Joerg Bornemann
add39a58e3 fix warning C4267
We assing a DWORD to wParam when posting WM_DESTROY,
thus we can be sure that there's no loss of data.

Change-Id: I21c9b658ff06ea7792d0a357ff508bdab04fa5f7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-08-19 11:29:53 +02:00
Tobias Hunger
85b2017a69 TaskHub: Move code to be more conform with other singletons
Make methods static and add a instance() method for Signals/Slots.

Remove ProjectExplorerPlugin::taskHub() method and use the new
ones instead.

Change-Id: Ifae24ff19579fc524cbd61bddc826095c443adfa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-19 11:24:32 +02:00
hjk
53a49e3a64 Debugger: Minor re-organization in tooltip constructor
Change-Id: Ia8b1bf0f984c083a842c5814500ecb365a645280
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-19 11:03:33 +02:00
hjk
6e53b25f9a Valgrind: Compile fix.
Change-Id: I8e1254c6955b7fd3aa42cec8036daedc4301fcaa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-16 17:39:21 +02:00
hjk
20d7d5e5b7 ProjectExplorer/Analyzer: Merge RunConfigurationAspects
The Analyzer implementation is now simple and still generic enough
to serve as general base.

Change-Id: I050a21919bf128929b77a64da1f46d157691d849
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-16 16:20:45 +02:00
Christian Kandeler
02105ddf62 Utils: Untie the Environment class from the host system.
It is used e.g. in the RemoteLinux plugin
(via ProjectExplorer::EnvironmentAspect) and should
therefore not assume that it's meant for a host system process.

Change-Id: I9f44f862f133579b65951e43fc1e654c425fd3d7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-16 10:22:30 +02:00
Christian Kandeler
6d68422026 Utils: Introduce new class OsSpecificAspects.
This is basically a generalization of HostOsInfo for
a system that might not be the host system. HostOsInfo
is now implemented in terms of the new class.
Prospective use case: Untie Utils::Environment from
the host system.

Change-Id: If333b96674652109fcb0ad79f75aaaf5e86e17e3
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-16 08:05:41 +02:00
Orgad Shaneh
ffae1fcb24 VCS: Always set window title when repository is changed
Change-Id: I74be65ab4bdec45b3a9679dfd86c112b38358cd6
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-08-16 02:52:30 +02:00
Orgad Shaneh
6a87d8d347 Git: Cancel adding a branch if the git operation fails
e.g. If a branch with the chosen name already exists

Change-Id: I22be3001ed68d6bf6f45d9180ad60403267d4ad9
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-08-15 22:04:29 +02:00
Thomas Hartmann
3533ad2b48 QmlDesigner: code cleanup
toLower() is called inside generateNewId().

Change-Id: I8526c25f5d2898946f0a1568e6203297c9672093
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-15 17:04:58 +02:00
Marco Bubke
04f29127a1 QmlDesigner: Fix transformation bug for tab widgets
Change-Id: Idc33ddf04f0b6fc317aeb5ed72fd7164ba174ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-15 15:51:02 +02:00
Marco Bubke
aa4e4e382b QmlDesigner: Hide the filter widget for import in the ItemLibraryWidget
Change-Id: I3a7120793d3a6a34b45a22dbb25cf6a5381580e8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-15 15:50:56 +02:00
Marco Bubke
04d7ece089 QmlDesigner: Cleanup the ItemLibraryWidget
Change-Id: I4686ed5e5c218e1e37a189bdfc19cdb4ea4640f6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-15 15:50:50 +02:00
Marco Bubke
cf3e8163fb QmlDesigner: Move ImportManagerView to ItemLibrary
Change-Id: I546199945e4b0b0acc7e4b656da547868b1cc99d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-15 15:50:42 +02:00
Radovan Zivkovic
f6fc78eaea Dialog that prompts to add files to VCS is now resizable.
Change-Id: I8b440c76255b0cd2b952539ad4945443e293a661
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-15 14:22:45 +02:00
Thomas Hartmann
119316a1dd QmlDesigner: fix regression
We want to use the lower cases name instead of always image as an id.

Change-Id: I7b266c3f7658918236baf0b7805552852cc3a854
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-15 13:58:26 +02:00
Thomas Hartmann
2781fd632e QmlDesigner: compile fix for Qt 4
Qt for need the direct include.

Change-Id: If7dd2f52edd44d39eaa85f1d4f0d83e327bcfa30
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-15 12:20:59 +02:00
Tobias Hunger
0ce0cd8055 Analyzer: Silence warning about unused variable
Change-Id: I87d83e848bccacec7afa940d2931f3702343cb4b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-15 11:45:05 +02:00
David Kaspar
2e94c2b91e Qnx: Fixing compilation error - outstanding include for ui_...sshpage.h
Change-Id: I22a67a99f64e3711d8a2475c948abd6f45353aa5
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-15 09:50:36 +02:00
Orgad Shaneh
46653d4572 Fix compiler warnings
Change-Id: I51b86be846618df45595cb176c34ee8a8558082d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-15 09:49:50 +02:00
Daniel Teske
a25008ad2d Doc: Qt Versions: Add requirements onto a minimal qt
Some people want to hack, so give them enough rope to start.

Change-Id: Ic8b3f873c322b02c3df91ee267d1e5f07c2ab507
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-08-14 18:35:46 +02:00
Daniel Teske
a02144318d Doc: Adding qt: Integrate Blackberry section into the normal setup
There's just one difference for adding a Blackberry qt version, that
doesn't require a duplication of everything else to explain.

Change-Id: I097d3b30bc823e47b89efe219dd5447608958ee6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
2013-08-14 16:13:54 +02:00
Thomas Hartmann
09d0f77733 QmlDesigner.PropertyEditor: crash fix
The method parentProperty() throws an exception instead of
an invalid ModelNode().

Change-Id: I56ce782338cf66ab81b660905f48fe433ca4e843
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-14 16:06:51 +02:00
David Kaspar
3991379ffe ProjectExplorer: Relayout of DeviceSettingsWidget UI
The DeviceSettingsWidget is using vertical-scrolling-only ScrollArea
for both General and Type Specific groups.
This provides "Type Specific" group more space to display information.

Task-number: QTCREATORBUG-9981

Change-Id: If37d8bb9a65b5392ef4fd488b4c8f0c9f3cf35e8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-14 15:51:51 +02:00
Christian Kandeler
aaa970fffe SSH: Add missing library initialization.
Botan requires to be initialized before first use. We do that on-demand,
but currently we miss one of the two places where this is necessary.
The problem only manifests itself with multithreading, because Botan
itself also does an on-demand initialization, but does not guard
against concurrent access when doing so.

Task-number: QTCREATORBUG-9980
Change-Id: Id65c428e3d8842c8a6f16942b11d52412239d3c9
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-08-14 15:49:47 +02:00
Marco Bubke
21347cd71f QmlDesinger: Add combo box to add imports
Change-Id: Ic626f07d4a2bde32495b70b8c5726cb4b6821da3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:26:59 +02:00
Marco Bubke
45b6fd2530 QmlDesigner: Remove special hack for QtQuick import
Change-Id: I29b0361054673058588fd7dec9b0cd63d98a8c5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:15:48 +02:00
Marco Bubke
8e293cefb2 QmlDesinger: Add MetaType for Import
Change-Id: I7be9bd6c3d03a5b488ee4013b64f9927217f67b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:15:41 +02:00
Marco Bubke
c9938fef82 QmlDesigner: Add isSameModule to Import
Change-Id: I5d06ad83adcd48b311d9c270ffcc5d1cf85e3afa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:15:35 +02:00
Marco Bubke
737838c3bf QmlDesigner: Add usedImports and possibleImports to the model
This are dummy implementations.

Change-Id: I555ac15509350497edfdd3bdc5e5e3a2a046a496
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:15:29 +02:00
Marco Bubke
14455083d8 QmlDesigner: Add remove functionality to the ImportManager
Change-Id: I7227f84ae808ac449bc92f5a068696295b6814ab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:15:20 +02:00
Marco Bubke
662df29efa QmlDesigner: Fix remove imports in the Rewriter
The import should be removed and not the import list.

Change-Id: I6d9017141ea9c0d5885ed6d3dc3d227c2fe7b2f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:14:41 +02:00
Marco Bubke
b488d97594 QmlDesigner: Show imports
Change-Id: If72caf241fcb3cda69790102e369e0ddac9d8d50
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:14:34 +02:00
Marco Bubke
5dfde6e0a4 QmlDesigner: Show the imports in a view port
Change-Id: I3a69662c97931155cc589ca86f61e5deb67ffd12
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:14:22 +02:00
Marco Bubke
1882a7706f QmlDesigner: Add toImportString and change toString in Import
Change-Id: Ic6d4fc225b7f1ccc78593b28a0a96dc4fefec614
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:14:03 +02:00
David Kaspar
8b92500769 Qnx: Auto-generating SSH key used for connecting to a BB10 device
BlackBerryDeviceConfigurationWizardSshKeyPage wizard page has been removed.
It is not needed anymore. The wizard automatically generates or reuses
a SSH key that is stores in __settings__/qnx/id_rsa file. The same SSH key
is used for connecting to all BB10 devices.
The generation of 'default' SSH key is gone as a second step of
BlackBerryDeviceConfigurationWizardQueryPage wizard page.

Disabling device-tester for BlackBerryDeviceConfiguration.
Task-number: QTCREATORBUG-9977

Change-Id: Ice6068530c9c72fa82907decaaa3dca6077e9c3a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-14 13:38:02 +02:00
Marco Bubke
772e6698d1 QmlDesigner: Add ImportsWidget
Change-Id: I0e7ba19c09c1477e9e0a1040e0b1ef731ef11424
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 13:03:18 +02:00
Erik Verbruggen
b6ee336b52 Debugger: give item delegates a parent.
These delegates would otherwise be leaked. This is not a serious leak,
as a few (about 10) are created once and kept/used for the whole
lifetime of the application, but they do show up in leak-analysis tools.

Change-Id: I1e281f06f21ae828199078253ae5719668d26bbc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-14 12:31:46 +02:00
Orgad Shaneh
70f0e168e4 Git: Keep panel data when editor is changed
Change-Id: I3c6a1ff6206b5b412c9ae89eb9b8f5a27dab2e62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-14 12:18:45 +02:00
Przemyslaw Gorszkowski
7e7fb2244a AutoTests: fix test framework in case of tests for class members
Change-Id: I564ea9cccc24509957481b6726f25833f35a4da4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-14 12:15:04 +02:00