Commit Graph

28971 Commits

Author SHA1 Message Date
Petar Perisin
fe1f7e4bf6 Gerrit: Added pushToGerrit dialog
Change-Id: Ic16eae2def11343ef7be5ce8378d24b5fd11a386
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:28:05 +02:00
Petar Perisin
83d51b2691 Gerrit: added ability to save path for applying patches
Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:27:57 +02:00
Petar Perisin
42547062af Git: dereference topic result
sometimes tags are annotated, and have different hash than head - now
all will be good with them too.

Change-Id: Ibd66b78e6dbc7f181ba05f45339f2d97bb611602
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:27:41 +02:00
Friedemann Kleint
19a4810ce8 CodePaster: Add setting for expiry.
Add a setting for expiry in days and additional setting for
PasteView dialog which can be used to override.

Change-Id: Ie45e26b5cefd8f468d2f5c47df148cce582b201e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:19:43 +02:00
Friedemann Kleint
9528671f42 Clean headers in Bazaar.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I004d756b351c3fdd9d13367627b1345f3efa7f2a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:19:36 +02:00
Tobias Nätterlund
0d79eda517 ProjectExplorer: Fixed kit sometimes not being marked dirty
Occassionally, the kit would not be marked for saving when changing
the device, due to an uninitialized bool member.

Task-number: QTCREATORBUG-9000
Change-Id: I85059cfd4b7e3106d7d353ba5884e6b93c480231
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 10:48:13 +02:00
Lorenz Haas
4f1e892feb Fix insert position for refactoring getter and setter functions
If the cpp file had unsaved changes (newlines at top or in the middle)
the inserted getter and setter functions were misplaced.

Change-Id: I15129df2c0bdb91e6fb5e22213e7b4f52733c6ae
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-05 10:41:50 +02:00
Aurindam Jana
adc7d65ca6 DeviceManager: Fix regression introduced by change id I38e4ea9da92
DeviceManager::fromMap() returned empty list of devices.

Change-Id: Iee0d1d102a8ff0855fb855fbde512f9a7f9ecee2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-05 10:27:46 +02:00
Tobias Hunger
036d977b93 RunConfigurationFactory: Centralize much of the restore code
Change-Id: I30c92dd5082eed050c2796a014919788710baafa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-05 08:55:11 +02:00
Tobias Hunger
1650c22b7b RunConfigurationAspect: Add RunConfiguration parameter to factory method
Change-Id: I7fbb82dc3ff83593473a57c69d0eb89bc33f50f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-05 08:55:01 +02:00
Robert Loehning
3c24824b0f Squish: Explicitly restricting tst_build_speedcrunch to Qt 4.7
Change-Id: Ib28f77d1da9573c4124e5db8e7e972bbabf6ac6a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 19:37:14 +02:00
Petar Perisin
5d4c4a6968 Git: Added submodule update
Change-Id: If8a4b0c572b0ca2d57f80f1304c7ebf141a40148
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-04 19:18:23 +02:00
Petar Perisin
b1c9d0eb37 Git: Added Checkout Commit
Change-Id: I9446060b9a8ee1717b832f1f7b7dbcaf8e739ad3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-04 19:16:50 +02:00
Petar Perisin
09b1cf78fd Git: refactoring ChangeSelectionDialog
> Dialog now combines show, cherry-pick and revert
> has fixed path, and no way to change it
> not created on stack

Change-Id: I7cee0b2e775a80941b51a4ca023064baf0d6575c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-04 19:15:59 +02:00
hjk
476eb8f72a Debugger: Remove workaround for GDB 6.8.50
Not supported anymore anyway, and gets in the way of the
refactoring for the LLDB backend. Might even save cycles.

Change-Id: I3fbffd1818ed044974e321078d46e5d3b592fa6b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-04 17:09:19 +02:00
Friedemann Kleint
e59ad83d53 Clean headers in Designer.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ia97b5bd9e4496cd824f35c5fda8ccf0db9af471c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-04 16:49:04 +02:00
Friedemann Kleint
5b1812eedf Clean headers in CPaster.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ica7093e3ea356c962d7a5ad8fd77bb89dbc11e18
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-04 16:48:44 +02:00
hjk
fe29d6a8a3 Core: Remove Core::Id(QByteArray) constructor
This was mostly used to disambiguate the char * and the QString
constructors.

Change-Id: Ib6923ef8e8c0e5d514a883e73aa001a1cd9fb534
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-04 16:47:59 +02:00
Thomas Hartmann
12f4bf02a9 QmlDesigner.FormEditor: crash fix
Change-Id: If5b5b2d4f4bacda7381400a09a971f116e8c4eab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-04 15:44:53 +02:00
Eike Ziller
52575f1c62 Add hint to text editor settings pointing to coding style
The tab and indentation settings in Text Editor > Behavior are only used
for non-code files. Add a hint with links to the respective coding style
settings.

Change-Id: I1d7c1154269c4914d511ef6ef3308a2b1f933d52
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-04 15:36:35 +02:00
Eike Ziller
43969c4e56 Rename PluginManager::runningTests() --> testRunRequested()
Change-Id: I209ebb85ad2a3cc32be0c45ee37ba4918ec42828
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-04 14:58:52 +02:00
hluk
1bea9b98fb FakeVim: Option 'passcharacters' (not in Vim)
Option to pass some key presses in insert mode to editor widget
(replaces 'passnewline'). This allows to rename symbols in insert mode,
complete parenthesis blocks, expand comments etc.

Macro expansion and code-completion works with dot command.

Task-number:QTCREATORBUG-4828
Change-Id: I5ff43818d4f7f183cd6f4ed8cc3a4586469ab65d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-04 13:50:08 +02:00
Tobias Hunger
90c5f4244b Remove declaration of method that is never defined
Change-Id: If20fd2b98f829d9cc230dc794656edaa49b4e22c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-04 12:43:26 +02:00
hjk
8212af6e52 Debugger: Progress on LLDB integration
Some breakpoints trigger real state changes now,
some locals display name and type (no values yet)

Change-Id: I1736d4b499f22b92d4680519853a09558e9dbbf4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-04 12:29:36 +02:00
hjk
df674a2add Debugger: Somewhat more robust LLDB output parsing
Change-Id: Ia54d99df15240db4c56fe0ba6b6282319056f59f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-04 12:29:21 +02:00
Daniel Teske
64f373e6cc Android: Create directory for gdbserver
Task-number: QTCREATORBUG-9035

Change-Id: I2b22bebe7340105155b6efd3cb070f1a839a6d3c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-04 12:17:56 +02:00
Tobias Hunger
3eb7c99f1e Remove unused declaration
Change-Id: Ifad1444939407ec5187aa6e1c69bdd143f33db46
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-04 11:46:47 +02:00
Eike Ziller
62743e8e46 Kits: Fix uncorrect warning about missing Qt version.
The warning that a kit doesn't have a valid Qt version was also printed
for kits that explicitly had Qt version set to "none"/

Change-Id: I7aabb4c339f7c0b4236d5dbb8d6a9817f5bd3c73
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-04 11:45:25 +02:00
Eike Ziller
46dcfc30a4 Activate window of editor when setting focus on it.
Both fixes a bug with Qt4 and is needed when having multiple toplevel
editor windows.

Task-number: QTCREATORBUG-8735
Change-Id: I151164a6ad00beb92cb241e581d381a9534733f8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:42:57 +02:00
Robert Loehning
d3b68556fa Squish: Let iterateBuildConfigs() give information about kit
Change-Id: I283fbc773c0490c4c9cb5558e9aedfdb94ba5366
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:42 +02:00
Robert Loehning
4319b64c62 Squish: Fixed typo in getQtInformationForBuildSettings()
Change-Id: Ice68ff84354fa35da7d1217abc3e40acc3783691
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:27 +02:00
Robert Loehning
286240af0e Squish: Removed pointless lines
Change-Id: I867acd4e00531d6d50553710a00b1cadfc0c3cee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:15 +02:00
Robert Loehning
f694b04b68 Squish: Replaced duplicate bugreport
Change-Id: I73bc3a633e47ddd0580976dd355da323e2426b4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:30:01 +02:00
Friedemann Kleint
7dce2f9899 Clean headers in QmlJs.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it (Parser excluded).

Change-Id: I5ec6e1076430009bb72094411b2c3386f8bea548
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-04 10:08:07 +02:00
Friedemann Kleint
ebfb3bbca7 Clean headers in RemoteLinux.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ie7559562218ecab65da17f58e3515556a4a1d5c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-04 09:10:40 +02:00
Knut Petter Svendsen
a78bc196ae ClearCase: Refactor ClearCaseSync
Moved code to the scope where it is used.

Change-Id: I5af8e7cfca45b475d859e04ed448bf5793bf91fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-03 20:49:19 +02:00
Tobias Hunger
4eb71aa2dd Gcc: Handle new warnings/error messages from gcc 4.8
Change-Id: I992be31dcf4a4dd91a419c43b5d9797fcf3a955c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-03 16:42:01 +02:00
Eike Ziller
3da6b04a82 Show kit details in menu tooltips in TargetSettingsPanel
Change-Id: I47e611b7d1efaa99e19b06ddb7e2684b9fd5744c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-03 15:58:20 +02:00
Oswald Buddenhagen
32cdfa0ae8 auto-derive subdir dependencies from plugin dependencies
Change-Id: I96eb36703099b6c6de9f2f9a5438a33d6f300cc1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 14:38:20 +02:00
Oswald Buddenhagen
b8cb7ecef8 parallelize libs build
Change-Id: Ic52eff8fc5f23e63cc4683d36078bda99622aa71
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 14:38:06 +02:00
Oswald Buddenhagen
06acd82ada derive TARGET from QTC_{LIB,PLUGIN}_NAME
the information is redundant now

Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 14:37:56 +02:00
Oswald Buddenhagen
66a3553107 make library and plugin dependencies declarative
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.

Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-03 14:37:45 +02:00
Christian Kandeler
eb872d3204 Fix potential quoting problem in .qmake.cache on Windows.
Unlike mingw makefiles, system() actually always uses the real
host shell, so use the host OS instead of the makefiles' path
separator as the discriminator.

Change-Id: Iaba6fc76f469e75fadd9d07e0c9e1ac07016338c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-03 14:10:59 +02:00
Tobias Hunger
c320f65d1c IOutputParser: Make sure to not cut too much output
Introduce a method to cut away whitespaces from the end of a string
and use it consistently. This avoids a chain of parsers to repeatedly
cut away the last character, assuming that will be the line-break.

Task-number: QTCREATORBUG-9032
Change-Id: I68261c10873535faf94c885c914cd00510ed75d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-03 14:07:51 +02:00
Oswald Buddenhagen
85cf6b0e55 move 3rdparty INCLUDEPATH to cplusplus' _dependencies.pri
merely for the purpose of making the library .pri file trivial.

Change-Id: Idadbff0c9f7460e007721aa8181b31bdfef06704
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 13:40:55 +02:00
Oswald Buddenhagen
7923032022 fix include style relating to cplusplus libraries
... and adjust INCLUDEPATH accordingly.

while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.

Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 13:40:39 +02:00
Orgad Shaneh
6f26a46e7a GitIgnore gzip files in dist/gdb
Products of the Makefile

Change-Id: I75cf3b2e0b72f1ede32edaec72d2e656c7bc3d42
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 12:58:40 +02:00
Knut Petter Svendsen
91fe5f84d9 ClearCase: Fix: Status actions was not correct for unix
A set view on unix will get / as topLevel. The output of
"cleartool -ls" with / as topLevel listed files with absolute path,
while with relative path for the the other cases (working directory
view and on windows). Root as topLevel is not 100% correct and should
be fixed in another patch. However, this patch fixes an annoying bug
for unix. (Before this patch multiple entries for the same file was
inserted in the status map - one with relative path and one with
absolute. Resulting in wrong lookup in updateStatusActions and thus
wrong status on the active file.

Change-Id: I178bafd21d712a445aca8e60ae3346549b55faaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-03 12:57:35 +02:00
hluk
4fc706d7e0 FakeVim: Don't handle user mapping in some commands
Don't handle user mappings in commands that cannot be followed by
movement command. For example, key "<SPACE>" in after "t" command cannot
be handled as user mapping.

Change-Id: I97582d23ae637b30b1058b9d2b381a869bbebb79
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-03 12:33:21 +02:00
hluk
7b885b583d FakeVim: Don't check for "UseFakeVim" in standalone mode
Change-Id: Iad82bcdce429764f3ceef07d9894ab817b844336
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-03 12:32:41 +02:00