Commit Graph

31137 Commits

Author SHA1 Message Date
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
2013-08-21 14:39:18 +02:00
Przemyslaw Gorszkowski
bf69b4c444 C++: wrong tooltip behind function without args
Example code:
float fun()
{
    return 0;
}

Hovering in the area behind the function without args(but in the same line,
in above example after "float fun()") will bring up tooltip with returned
value of this function(in the above example it will be "float").

Fixed by checking this special case after gathering results for tooltip
and don't show confusing tooltip.

Task-number: QTCREATORBUG-4780
Change-Id: Iab2bacddf33a70d5ea941001a2dd317c824d9db5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-21 14:27:47 +02:00
Tobias Hunger
a79d47c888 OutputParser: Simplify detection of fatal errors a bit.
Change-Id: I46f6942a8bee8a1c9711dc97db6424893dd3f276
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-21 11:42:36 +02:00
Tobias Hunger
b5de1fa518 Simplify code to set up output parser chain a bit
It is save to set 0 as a parser.

Change-Id: I57e9a6e2c3c4661356b5b79371946edad367888a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-21 11:42:13 +02:00
Robert Loehning
01b3e1fa54 Squish: Fix __startDebugger__()
Change-Id: I1f87346ad12f4a6e749042b3c1bcabbc71bdbf7a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-21 11:01:42 +02:00
Orgad Shaneh
96e97d1392 Fix compilation with Qt4
Change-Id: I537c800bb29cfcaf8e8242122a7a1fd7d89d7d7e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-21 10:09:42 +02:00
Leena Miettinen
19bc8442c6 Add dist/changes-2.8.1
Change-Id: If5ca031b927a81d68abb333604cdee4fa8d09f1c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-20 16:39:36 +02:00
Tobias Hunger
772c9f72e2 BaseQtVersion: Make sourcePath calculation available as static method
Change-Id: I7a4c4d4ad2cdf1c36d1bc3eb046725e29716bba3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-20 15:07:38 +02:00
Tobias Hunger
3aa37f2e07 Android: Do not use #warning
Change-Id: I3981d60f5f38c4a738250f43336f981b844dc4a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-20 15:00:41 +02:00
Tobias Hunger
ee47b652a6 Snippets: Allow lowercase/titlecase/uppercase modifiers for variables
Use the same syntax already used in the custom wizard to denote
variables that are modified to be lower-/title-/uppercase:

 $tESt:u$ will become TEST
 $tESt:c$ will become TESt
 $tESt:l$ will become test

The snippet will be inserted without any name mangling happening.
Once the editing is done the name mangling is applied to all fields.

Change-Id: I7c1f5a1ad2bb5acf1b88b54de51bb39391c64763
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-20 14:49:17 +02:00
Tobias Hunger
b589336e54 Snippets: Move snippet parsing into the snippet class
* Move the code to parse snippets into the snippet class
* Allow to escape $ so that this character can be used in
  snippets
* Add unit tests for the snippet parsing

Change-Id: I134f3c0de8290e1d7fcaf808577b31f5ac8fbc63
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-20 14:49:09 +02:00
Nikolai Kosjar
6ac341467d Tests: Extract TestDataDir to the coreplugin
Change-Id: Ie290c07c07c13134a57f328e9ae876b2af6974db
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-20 14:19:08 +02:00
Nikolai Kosjar
d185849150 CppTools: Tests: Introduce basic BuiltinSymbolSearcher tests
Change-Id: I25f11e80747863f797d146980d8ee0e605acb6e5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-20 14:18:45 +02:00
Przemyslaw Gorszkowski
3256b7b2ef C++: fix matching type with using from other namespace
example code:
struct S { int s; };

namespace std
{
    template <typename T>
    struct shared_ptr
    {
        T* operator->();
    };
}

namespace NS
{
    using std::shared_ptr;
}

int main()
{
    NS::shared_ptr<S> p;// for this shared_ptr
    return 0;
}

Fixes:
* find usages
* follow symbol
* highlighting
* marking

Task-number: QTCREATORBUG-7978
Change-Id: I28994c960b87ddd400e1d7b860fca6c6683bbb5a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-20 14:13:19 +02:00
Tobias Hunger
9de44134c0 Fix whitespaces
Change-Id: I80381a43cdae20654ebecf341a48cb22c1c018e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 13:59:22 +02:00
Orgad Shaneh
e2d247cee8 Fix windows compilation
Change-Id: Id65e6e915ef7e3d7f3be0858e2ff534cf5ad1a03
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-08-20 13:44:15 +02:00
Orgad Shaneh
68b5542cdb Git: Show success message when command ends
Change-Id: I501c69df2a436d90270a6c2543c3e286bafef427
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:54:30 +02:00
Orgad Shaneh
a9095ee104 VCS: Introduce message style
Similar to compile and app output panes

Change-Id: Ib9ac6d8be880739ae78d0a39f7051cbe616e46c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:54:17 +02:00
Orgad Shaneh
f9c4889a7f VCS: Use runVcs for Command
* Removes duplication
* Supports all flags accepted by runVcs
* Supports output while running

Change-Id: Id067791760753184cd2516c23634564880ca5db0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:54:02 +02:00
Orgad Shaneh
cc2610aa71 VCS: Enable calling runVcs from non-GUI threads
* Introduce a proxy class for thread synchronization
* Use signals for appending text to output window

Change-Id: Iecbb010e6b6e9dab27d9862a43dafa450f2bb1f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:53:33 +02:00
Tobias Hunger
1dd44cfba1 Remove some useless Core::Id(...) and ProjectExplorer::
Change-Id: Iebf4302bb5e3f893dc573e504efc214861d80848
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-20 12:21:10 +02:00
Tobias Hunger
c821e7c5ed Qbs: Do not clean compiler issues when reparsing
Task-number: QTCREATORBUG-9979

Change-Id: If66146a6a5764b916470426e094c9f3f617ef2cd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-20 12:20:03 +02:00
Tobias Hunger
d468f072cf CMake: Put cmake errors into category "Build system"
Change-Id: Ic331ddf90e7d3c74f18dbe65be2dcc458777bc3a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-20 12:19:54 +02:00
Tobias Hunger
f5224a6db6 Task: Add a new Task category for deployment issues
These are not build system issues and deserve their own category.

This has the side effect of avoiding them to get cleared when e.g.
reparsing Qbs files.

Change-Id: Ib949504533f7f15a560796bea91cae329f19a20b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:19:42 +02:00
Tobias Hunger
ffe0b969b6 Customwizard: Handle unicode pecularities when capitalizing the first letter
Example: 'LATIN SMALL LETTER DZ' (U+01F3) is rendered as "dz".
The uppercase of that is 'LATIN CAPITAL LETTER DZ' (U+01F1), or "DZ".
The titlecase is 'LATIN CAPITAL LETTER D WITH SMALL LETTER Z' (U+01F2) "Dz",
which is what I would expect here when capitilizing the first letter.

Change-Id: If4fe342e310168dd6190034d4f1ceca4c2ef4a1a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-08-20 12:19:22 +02:00
hjk
6ef5aaad67 Debugger: Set model object names at construction time
Change-Id: Ib1d273ef2c2bb97a2343da6d361fde7c01012040
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-08-19 17:16:06 +02:00
Christian Kandeler
ca1716281a QmlDebug: Remove redundant dependency from qbs file.
Change-Id: I2d3fd1286f185bff5eb5374d411087fad15a9568
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-19 16:59:45 +02:00
Robert Loehning
9a3e999f97 Squish: Add test for codepasting
Change-Id: Icba9a10d0269353f7b11e341ffa62ca78593cf2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-19 16:57:51 +02:00
Tobias Hunger
4eccb04eaa Android: Fix warning about ! being applied to left side only
Change-Id: Ic48e4efb4992f1724ff150c2686e3e99c39dbd97
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-19 16:36:37 +02:00
Christian Kandeler
22599094b0 Introduce the concept of a "device process".
Provide a QProcess-like abstraction that can be used
to implement processes running locally or on a remote
device. Objects of a concrete class implementing the functionality
are created by IDevice objects.
Current implementations are:
     - Local execution (QProcess-based), provided via the DesktopDevice.
     - Remote execution via SSH.
     - A specialized case of the former for remote Linux systems (provided by
       LinuxDevice).
The latter is already being used in a number of places. As a result, lots of
code dealing with details such as setting the remote environment could be
moved to a central location. These things are no longer the concern of whoever
is wishing to run a remote process.

Change-Id: I919260ee6e77a020ca47226a4a534e7b8398106f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-19 16:13:21 +02:00
Christian Kandeler
dc07796c23 Debugger: Add missing Utils dependency to qbs file.
Change-Id: I8438695997bc7f5cad1bdb1b14c61c3b05485162
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-19 15:44:58 +02:00
BogDan Vatra
24b14fa2b4 Export android specific settings to QBS
Change-Id: I3640272dc027047a1d27a2b55329c9f5093e8f1f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 15:29:05 +02:00
BogDan Vatra
92a5402f65 Make QBS setings constants accessible for other plugins.
Change-Id: I7e66136d2b75a932b981713ccc27e3e69fd44baa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 15:28:57 +02:00
Christian Kandeler
8a28b2f042 Fix compilation with namespaced Qt.
Change-Id: Iaed86d3b0ccab4f7018f0cbf2e178a892a580606
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-19 15:03:23 +02:00
Nikolai Kosjar
dcf618469d CppTools: Tests: Add basic tests for locator filters
Change-Id: Ie71aa8a39f4584a024a4f104841ad8e57947e489
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-19 14:43:58 +02:00
David Schulz
a9e737b0fe CppTools: Test: Skip framework test on Windows.
The soft links inside the framework can't be resolved.

Change-Id: I9f328bc074091236fb33eee63e725e49efeac5c9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-19 14:07:01 +02:00
Marco Bubke
df75ec5e96 QmlDesigner: Disable States for ApplicationWindow
Change-Id: Ia86ee67cdb0ab25f5ba00877997ae6b74fe4687a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-19 14:01:31 +02:00
Nikolai Kosjar
5ee0ab93e6 Locator: Tests: Introduce BasicLocatorFilterTest
Change-Id: I06b798549bf9ce02d824477ea945c389da50ebce
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-08-19 13:59:03 +02:00
hjk
f393743840 Debugger: Remove now unneeded DebuggerEngine::taskHub function
Change-Id: Ifcb3ca832f55b2dc0ab7f5ea0a981042fc03814d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 13:49:35 +02:00
David Kaspar
8350298ee0 Qnx: Improved layout of BlackBerryDeviceConfigurationWidget
Widget margins has been zeroed so the default margins of
the 'Type Specific' group applies only. Request and Upload buttons
has been placed on a separate row to allow better width stretching.

Task-number: QTCREATORBUG-9981

Change-Id: I86d3be06d0057e92289fe6ed5cf38f16f5f3158b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-19 13:24:39 +02:00
Daniel Teske
2f1d585f2b GenericProjectManager: Add *.autosave to the default ignored files
Those are our own autosave files.

Change-Id: Iefbca9d9eaa201a4650b157272c0b7d6ac875ac0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 13:09:16 +02:00
Daniel Teske
64ae43c62f Qt4Project: Ignore autosave files
Don't show them in the project tree and don't tell the codemodel that it
needs to update itself. Not the cleanest code.

Task-number: QTCREATORBUG-9957
Change-Id: I37fc1e2d401f59365ffbbb53617eeb7b86eb6456
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 13:08:00 +02:00
Daniel Teske
08409a46c5 CustomWizard: Tweak replaceFields, replace %% with %
Otherwise there's no way to have a '%' in a file after replacement.

Task-number: QTCREATORBUG-9793

Change-Id: I3c9bfac9f3bd8a19bbc293839d9d69ccf951e264
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-08-19 13:07:00 +02:00
Erik Verbruggen
073e5d6632 C++: optionally let the highlighter handle ifdefed-out blocks.
Change-Id: I38cc0e55348cac0245d2ab8f3e39c68de76e3e6d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-19 13:01:07 +02:00
Daniel Teske
480f7c09fc Android virtual devices: Fix starting a avd
This cleans up various bits of the avd support in Creator.
- Adds a abi combobox to the create avd dialog.
- Moves the startAvd code into a separate thread, so that
  starting a avd while deploying doesn't block creator anymore.
- Implements a better waitForAvd function that works even
  if a emulator is already running and accurately can
  detect that it has finished booting.

Note: There are still many problems in the avd support in creator.
- The "clean libs on device" and "install qasi" functionality block
  the gui thread if they are run on a avd.
- If no avd exists and no suitable hardware is attached, the user gets
  a create Avd dialog, which doesn't tell him why he needs to create a
  avd. That information is hidden in the compile output.

Still this fixes the main use case of hitting run on a newly created
project with no actual device attached.

Change-Id: I76b3fdb1bdf3eadac07f82ad7d145ce6af453326
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-08-19 12:58:49 +02:00
Nicolas Arnaud-Cormos
14d05eade8 Fix compilation errors
Change-Id: I6b0d4956b5dcbd13ee26c72081f77e5d8a4f219b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-19 12:47:59 +02:00
hjk
e84f7f33a6 Debugger: Disable inapplicable context menu entries for sub-breakpoints
Task-Number: QTCREATORBUG-9984

Change-Id: Id4197b8d0db917606eb0e2767d2b05195e6cfbcd
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-19 12:45:43 +02:00
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