Commit Graph

40996 Commits

Author SHA1 Message Date
Lukas Holecek
1ef66857cb FakeVim: Allow to remap shortcuts
Allows to remap main window shortcuts with command for passing keys.

    noremap <C-S> ,<C-S>
    noremap ZZ ,<C-S>,<C-W>
    noremap f<C-O> ,<C-O>
    noremap f<C-F> ,<C-F>

Task-number: QTCREATORBUG-14413
Change-Id: Ib86637d55223b1f4ce31a88c1c7ae2e05cb2aff1
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-11 14:36:44 +00:00
Tobias Hunger
8211e6a084 JsonWizard: Simplify handling of bools via JS
Change-Id: I5381e83f6714886b7bf8cbcb859e1dd3b115a6c3
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-11 13:33:10 +00:00
Tobias Hunger
94dc35694a CheckoutWizards: Use IVersionControl::createInitialCheckoutCommand
Change-Id: I09dd38f66b9cad46d561493c2e27a833595d8728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 13:22:49 +00:00
Tobias Hunger
f21d2023e8 Utils: Add a WizardPage to show progress of a ShellCommand
Use the new page in favor of the CheckoutProgressWizardPage.

Change-Id: I7801c146fa67d6fcf550616f3798a7a919aafb96
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 13:21:35 +00:00
Tobias Hunger
caca9dfa6f CheckoutWizards: Simplify code to look up specific pages
Change-Id: I0098e17585d73e05632027676e7712ef9c843da2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 11:52:00 +00:00
Tobias Hunger
75f067550f IVersionControl: Add method to get a ShellCommand for initial checkouts
Change-Id: Iabc056dad186d788003b221afb34303c37fef728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-11 11:51:53 +00:00
Ray Donnelly
f5dcc93b7e Debugger: Handle case of os.path.sep being '/'
On MSYS2, if QtCreator is launched from one of the msys2 shells
then the MSYSTEM env. var is set and our Pythons set os.sep and
os.path.sep to '/' so that it aligns with the default separator
of those shells.

fromNativePath(str) then fails to convert '\' seprators embedded
in binaries since str.replace('/', '/') is a noop. The operation
we want here is to convert all '\' to '/' anyway so this is more
explicit regardless of any opinions on our choice to dynamically
vary os.sep and os.path.sep

Change-Id: I76c05b188abca41c6a1b516c68b584e0c06e7235
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-11 11:23:11 +00:00
Orgad Shaneh
79d3d23488 Git: Use side-by-side layout for Fixup Previous Commit
Similar to simple commit layout.

Change-Id: If9470d47159cba21f11aefc8e2cc4895d10ff409
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-05-10 20:10:44 +00:00
Leena Miettinen
0c26483d0f Doc: Qt Quick 1.1 component was removed from wizard
Change-Id: Ife7a77e7e04fff88cb7c0760be5e81e798553056
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-08 15:07:02 +00:00
Daniel Teske
54f53794ec SettingsAccessor: Also read hidden or system files
If the user uses a name with a . in front, those files need to read
too.

Change-Id: I5d8a762afa5dc4cff646f2a5cf2e4eabf6f9bc99
Task-number: QTCREATORBUG-13127
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-08 13:46:41 +00:00
Tobias Hunger
2bfb4fbf80 Vcs: Sprinkle overrides over IVersionControls
Do this in a separate step to keep the next patch more readable.

Change-Id: I37cfd5481dcbfda52135eccec30852aefde1b950
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-08 13:44:49 +00:00
hjk
5c58293a36 Debugger: Some Python 3 support for PdbEngine
Change-Id: I052bc093086a5da0b2cbd4e99df32e42627ceaf5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-08 10:50:34 +00:00
Nikita Baryshnikov
5b5192d344 BareMetal: fix warning
QObject::disconnect: Unexpected null parameter

Change-Id: I9b7fe695f7d9d6acb233d8e9ff1030636559d548
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-08 10:48:00 +00:00
hjk
c5ac8fc21b Debugger: Use simpler construction of basic types in LLDB dumper
Cheaper, more robust.

Change-Id: I989853dc288864f4088f09f60c8c5b717e4faef0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-08 10:35:08 +00:00
Nikita Baryshnikov
5dc0ac7324 EditorManager: do not show endless errors
when there are removed files in navigation history. Steps to reproduce:
Open file in editor. Remove it outside the qtc. Activate qtc. "File Was
Removed" prompted - agree to remove it. Navigate back(alt left two
times). Qtc goes crazy with endless Error messages like a "Cannot open /
path/to/that/dead.file for reading: No such file or directory"

Change-Id: I10a4c178ba83a8dc769895830b6f76da2e676556
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-08 10:33:02 +00:00
Eike Ziller
98abbd39a0 ManhattanStyle: Remove unused special property
That was used during the times where OS X still had alternating row
colors in item views.

Change-Id: I6622604502a768c4abeb42f25bcfea5c65f66395
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-08 10:07:19 +00:00
hjk
51b05427d3 TextEditor: Simplify definitiondowloader.h
Change-Id: I01621753851a99275ef8bee2c55c69840dc29580
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-08 09:06:16 +00:00
Denis Kormalev
5615c406ea ToDo: Proper filenames eliding
It is more reasonable to elide filenames at left and messages at right

Change-Id: I980026eb558c6528da85a5ddb1a7125bb3d7fdce
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-08 07:21:34 +00:00
Eike Ziller
1b30462f3d ManhattanStyle: Fix size of field in form layouts on OS X
The default in QMacStyle, to use FieldsStayAtSizeHint, just almost
always is the wrong thing to do. Additionally this goes undetected for a
while most of the time, because most people do not run their code on OS
X. Override it globally to AllNonFixedFieldsGrow like in other shipped
styles.

Task-number: QTCREATORBUG-14337
Change-Id: I3b0719c0201871fbf0163b54b1a54823bf5d14f3
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-07 16:14:55 +00:00
Daniel Teske
4ddcafad34 Android: Properly quote parameters to make install
Change-Id: Id39b63876938c6759829786f54f2448ff730d500
Task-number: QTCREATORBUG-13868
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-07 14:37:33 +00:00
Eike Ziller
6390a6233e Update change log
Change-Id: I9b7b7a7e0f4170e58433a5e1fcfbbcf635751beb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-07 14:20:14 +00:00
Eike Ziller
a4cbe2ac11 CommandMappings: Do special filtering only for keyboard shortcuts
The view is also used for the regular expressions for FakeVim's
ex command mapping, so we should not do special filtering for
keyboard shortcuts on OS X

Change-Id: I437b45a53beb93caeaec43af2f898c55b2a1601f
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-07 14:20:04 +00:00
Alexander Drozdov
2de9de7ef3 Fix loading project settings
Incorrect conversion from the Variant to the String is fixed.

Change-Id: I082cdbeee1568d0b6b567232b50419d76572a197
Task-number: QTCREATORBUG-14404
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-07 14:15:48 +00:00
Tobias Hunger
a44c403b5f ShellCommand: Rename some signals
Rename the signals used to report stdout/stderr to make it clearer
what they actually do. Remove some unimplemented private member
functions while at it.

Change-Id: I7e856f906ccb45964f3b1b64336d4d8ebca7b9ee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-07 13:07:14 +00:00
Orgad Shaneh
bba6515562 C++ Dumper: Fix potential endless loop on invalid pointer
Change-Id: I554f2cd0b97c549767453ad3df290d93da483360
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-07 12:46:02 +00:00
Eike Ziller
4058ff6fe9 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010
2015-05-07 14:42:46 +02:00
hjk
fa704e0b84 Valgrind: Use some initializer lists when appropriate
Change-Id: Ic1988a3a046bf5a4c262d1e648376f077ed97448
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-07 12:40:12 +00:00
Eike Ziller
384437e994 Refactor CommandMappings to be a widget instead of options page
The IOptionsPage parts in it were trivial, and we need more flexibility
for the shortcut settings options pages.

Change-Id: I93ddaf060ac88ef339da9f542719f2d695660ac0
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-07 12:35:40 +00:00
Eike Ziller
13a947d119 Debugger: Fix attaching to running debug server
For example when developing on Windows, cross compiling to Linux, the
result is not executable from the Windows perspective.
Reverts f2cfd3c01a which changed the code
to use ExistingCommand to get the automatic expansion of app bundles on
OS X, and do automatic expansion of app bundles also when using path
chooser of type File. Choosing an app bundle in a path chooser of type
File would previously lead to an invalid entry in the path chooser
anyhow, because the app bundle itself is not a file.

Change-Id: Ie710c47918d2b8735009e290301ed2683e354f2c
Task-number: QTCREATORBUG-14412
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-07 12:34:31 +00:00
Tobias Hunger
2b66e48bcf SubversionClient: Use Qt5 style connect
Change-Id: I88f1de02edcb6c4406de64745ccc4cfc85f3d562
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-07 12:32:29 +00:00
Daniel Teske
d2bb73ffb2 ProjectExplorer: Fix to eager clearing of output window
The window was cleared even if the option to clear it wasn't
selected. Moving the cursor to the end, has the side effect of
clearing the selection, so do that always.

Change-Id: I6b61981f46394c61e61066aa8033c7e3391e6c07
Task-number: QTCREATORBUG-14410
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-07 12:29:50 +00:00
Christian Kandeler
d1ab9cdcbe QbsProjectManager: Fix deriving qbs profile names from kit attributes.
Turns out that using Id::uniqueIdentifier() is not deterministic across
invocations of Creator...

Change-Id: I8b78a5b36c2cd61e4b9c5d8cc8eb2c6083282c01
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-07 12:19:00 +00:00
hjk
5b7e8f42c1 PathChooser: Use a std::function as callback
... instead of a SLOT(...)

Change-Id: I32ed3ea014d1efde54bac2d5153f3083e37ef7ec
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-07 11:20:19 +00:00
hjk
9ff6cfdde4 CPaster: Remove unneeded declaration
Change-Id: Idba2af421e07f09b89392b490d0b2eb388553ec9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-07 11:19:28 +00:00
Eike Ziller
3fc7222062 Get rid of FancyLineEdit::validate
Use aggregation instead of inheritance for customization of validation.
Gets rid of a few additional classes.

Change-Id: Iaf8f12026c40a55bfde98b3786100f8ac431d750
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-06 15:47:27 +00:00
Tobias Hunger
e8862cd21f Core: Remove some unused images
Change-Id: I7bd688333eba40c798e5ba7ae094ee27bac977f4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-06 15:38:05 +00:00
Daniel Teske
2e2d07788e PersistentData: Allow for user types with suitable conversions
I ended up not needing that, but this might be useful for others.

Change-Id: Ie3a5a731d9f3f3f456d7cd4164cfa1753e2b54f1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-06 11:58:46 +00:00
Daniel Teske
d9425c5cc4 ProjectTree::currentProject: Introduce a fall back to startupProject
If no node is selected, e.g. no document is open, the ProjectTree
currently claims that there is no current project.

This adds a fallback to startup project in that case. This especially
fixes the case where only one project is open and as such it is clear
from context which project the user expects to be current.

Revert a few places where I implemented this fallback manually.

I do not like this. If multiple projects are open, this fallback can be
surprising and not what the user wants. Everything works fine in the
simple case with one project open but breaks with multiple projects
open, this actively hides bugs.

Change-Id: I6259834ca2220dd83bdffb16c3a0eac8f98e504b
Task-number: QTCREATORBUG-14394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-06 11:58:10 +00:00
David Schulz
68a00c12a3 Editor: Do not assign unknown style to text style.
Just return the last style sentinel.

Change-Id: I2bd1a6e12913e0c208b11efae3baae87c183f39a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-06 10:31:02 +00:00
Daniel Teske
e7d6ea6ad3 Fix Add Library for static libraries
Broke in 7481bff2b4 which split up
LibraryTemplate in SharedLibraryTemplate and StaticLibrary.

Change-Id: I797c007fff09ffd09b7744cf3543217b936dea12
Task-number: QTCREATORBUG-14382
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-06 10:07:50 +00:00
Christian Kandeler
8b833b8261 Remove some workarounds for Qt bugs that have been fixed.
Change-Id: I0e7112ee3f3790fba42fc882cb98e06ec6a2186d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-06 09:56:02 +00:00
Robert Loehning
9073c55035 Class view: Fix expanding of items on double click
Task-number: QTCREATORBUG-2536
Change-Id: I94471c265c9f9dbffe253d7c6e8a1e834b47f91f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-06 09:37:47 +00:00
David Schulz
f97069ebb2 CdbExt: Setting actively which nodes should be expanded.
Change-Id: I1470a67aa559e4d93a01cc70701fb160e873317d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-05-06 07:16:33 +00:00
hjk
e855de4037 Debugger: Fix GDB hanging
This partially reverts commit e33da6a6b3.
GDB seems to hang while executing str(some_pointer) in some setups.

Task-number: QTCREATORBUG-14374
Change-Id: Ia678533b9122e505b21ef6659d404239995ddb81
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-06 06:19:00 +00:00
Cristian Adam
ad9b4ce499 Perforce: Ability to use multiple workspaces/projects
By the use of P4CONFIG (p4config.txt) one can now specify workspace
details (P4USER, P4CLIENT, P4PORT) individually for specific projects.

Previously one had to reconfigure Qt Creator in Settings for every
workspace switch.

Change-Id: I117829ab3cf592562a4662f85314aa3c125e7610
Task-number: QTCREATORBUG-14378
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-05 16:32:28 +00:00
Christian Kandeler
74066f25b4 Device support: Only restore SSH options if we really saved them.
As the default-constructed value is not zero. This was not considered in
7aa8ae54ae.

Change-Id: I1f32b1c317e0de34b48dbe003c3968f66133a64d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-05 16:10:15 +00:00
Christian Kandeler
d2522905e0 qbs build: Don't treat templates directories as artifacts.
This dubious workaround is no longer necessary due to the new
qbs.installSourceBase property.

Change-Id: I352b82ddf445ea6e7d8f870769de805bf71e7dc4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-05 10:21:39 +00:00
Christian Kandeler
c7b11e5990 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I675cd578608380dbc20f67bdab0dbb414d605e08
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-05 09:03:59 +00:00
Orgad Shaneh
33d270976e C++: Fix highlighting of member on indirect specialization typedef
Missed a spot in ad4cb444fb

Task-number: QTCREATORBUG-14141
Change-Id: I1a6a25ce3e9c2a680e1b8eebec01a17749cdb026
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-05 08:59:28 +00:00
Orgad Shaneh
e335fd4c13 CppEditor: Support qDebug() for OverrideItem in tests
It is used in some comments but doesn't compile...

Change-Id: I5ba3afbe927c3b625218c0c2fee2c9ee6f53f4aa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-05 08:47:25 +00:00