Commit Graph

25792 Commits

Author SHA1 Message Date
Eike Ziller
659cf49b8b Merge remote-tracking branch 'origin/2.6' 2012-07-25 14:28:43 +02:00
Eike Ziller
5ae9f32d0b Merge remote-tracking branch 'origin/2.5' into 2.6 2012-07-25 14:28:20 +02:00
Eike Ziller
bdbcb1f8af Version bump.
Change-Id: I889b2f6a572bfc6083cd2129b51a18f5250699fd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-25 14:26:05 +02:00
Christian Kandeler
873ed7186f Name demangler: Fix some substitution bugs.
Also try to collapse references as much as it is possible with the
current design.

Change-Id: I1de55eac2d681a36f8b77d77968c4a06d19b6fac
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-25 11:45:53 +02:00
Leena Miettinen
b125f4f25f Doc: Android target
Change-Id: I03bb68dac3a6a2af7424ee31ca14ef66236101e7
(cherry picked from commit 64c5d45b0f6f7a2e3aa6eb1929d56fa52fa8252c)
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-07-25 11:04:16 +02:00
Friedemann Kleint
977ecf1f97 Remove unused unconfiguredsettingsoptionpage.cpp.
Change-Id: I04dacaa93c55aa32943fdd50383d04461b925974
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:53:01 +02:00
Francois Ferrand
7b8cd42729 Disable theming of menu bar.
This causes strange look e.g. with Ambiance theme on linux.

Change-Id: I9f56ca0c43d474a1db6f79c78e7d3653ea44ca46
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-25 10:40:36 +02:00
Friedemann Kleint
f1e7fcf64a Clean up includes in autotools-plugin.
Fixing an lupdate warning about cyclic dependencies of
autotoolsbuildsettingswidget.h.

Change-Id: I0e1c721df2c5f70ae9de38dd9bc5a34b63622ba7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-25 10:39:39 +02:00
hjk
04c97da81e debugger: simplify StartGdbServerDialog
Change-Id: Icd2b009b9d69faf4361868d9561df9e2c5ced928
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:29 +02:00
hjk
6cbcdf243f debugger: remove unued gnutarget parameter
Change-Id: Ic1c663bb11f7bf9420b35686ddeb581d31242b7f
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:14 +02:00
hjk
26e7ed14b7 debugger: remove unused code
Change-Id: I105aa0433530abb4e9f53de19c0846281ccda0cf
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:00 +02:00
hjk
c6f7eaea59 debugger: remove channel lineedit in StartRemote dialog
The information can be retrieved from the Profile information
nowadays.

Change-Id: I964cb4a782bb746bb97edbdb03cc99d64153106c
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:38:50 +02:00
Christian Kandeler
0c0c592038 Allow dashes in project names...
... for mobile and QtQuick projects.
This effectively reverts 8eb60c6598, which
was probably done for the then-relevant Symbian platform.

Change-Id: I2bfdec822dfdcc353790f0b5980960e30336d147
Task-number: QTCREATORBUG-7602
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-07-24 18:12:19 +02:00
Andy Shaw
a4bd79f732 Ensure first quote is accounted for when stripping the command itself
When the command line was processed to remove the call itself, it would
not be removed correctly if it was quoted because it would not see the
first quote.

Task-number: QTCREATORBUG-7656

Change-Id: I016b1534e14563ddd8cadad8c0effcd6b4a9203b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
v2.5.1
2012-07-24 17:29:42 +02:00
hjk
e3a5e27eb7 debugger: merge local and remote core selection
Change-Id: I1659eb5a13283814d307c4b4b7adaec87bbbbe9d
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 17:11:19 +02:00
Friedemann Kleint
d1f8e120bf Fix messages in Qt4ProjectManager.
- 'can not' -> 'cannot'.
- Make messages about toolchain not being able to build for
  Qt version more verbose, listing the ABIs.

Change-Id: If72fec7ba08c7c0c9fb173a1f264691fc24c43dc
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 16:58:38 +02:00
Friedemann Kleint
1b9cf76600 ProfileChooser: Introduce flags specifying which profiles to list.
Introduce flags to filter profiles that have a debugger
configured, restrict to host abi and include invalid profiles
(which is not relevant if only debugging is desired).
Introduce convenience flags for debugging.

Introduce populate() function for cleanliness.

Change-Id: I476c40cc9a59e4dd5b1bc7c49597e9169c053754
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 16:54:59 +02:00
Konstantin Tokarev
3fc4511fdf Use plain QrcEditor* instead of QPointer
Change-Id: Ie8529d0daf1573130212be7c0acfd42f7627a092
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-24 16:36:13 +02:00
Christian Kandeler
a628fdb6a5 SSH: Make SftpFileSystemModel::data() public.
So clients can retrieve the file path.

Change-Id: I6c6fa3473a8b374373c3dfe437f3f4779a46505b
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 16:32:22 +02:00
Konstantin Tokarev
1134c17b55 Moved QrcEditor to Internal namespace, fixed namespace usage.
Change-Id: I24a142318cd6898ce32991085dcbeb7f00507f4e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-24 15:51:20 +02:00
Robert Loehning
e0ffb2f6e0 Squish: Updated tst_build_speedcrunch
Change-Id: Ie5228fec880b3c9c1d5c24799973107677b724f3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-24 14:57:35 +02:00
hjk
02d3fc9062 debugger: simplify label handling in special launch dialogs
Change-Id: Id009db64c885280f6925369b4daa7950e318899c
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 14:31:34 +02:00
Montel Laurent
4063241626 TODO-KeywordDialog: Disable Drag and Drop.
Change-Id: I9a857dbae813704b79f4b76d1f0fe0115e8b4225
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-24 14:30:13 +02:00
Eike Ziller
10c188d1e4 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2012-07-24 14:17:43 +02:00
Eike Ziller
42f4595e37 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/cplusplus/cplusplus-lib.pri

Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
2012-07-24 14:17:33 +02:00
Robert Loehning
bef8f58fe8 Squish: Updated calls to iterateBuildConfigs
Change-Id: Idca2d311399194b455e211fb72d1fcf810cbb624
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-24 13:55:33 +02:00
Orgad Shaneh
3f6eed50c9 Valgrind: Add RemoteLinux dependency
Change-Id: I6e4993ecbe24500ff0746f5258a6a300fc454848
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-24 13:39:02 +02:00
Eike Ziller
cebf6b9329 Add changes file for 2.5.1
Change-Id: I3d02ab9423eb9d55ddf79791ca0c7c4514bcf47f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-24 12:36:01 +02:00
Christian Stenger
a4fa090e11 Squish: Improve handling for 1-target-projects
If there's only one suitable target for a project
the TargetSelector will be missing and the DoubleTabWidget
must be used instead.

Change-Id: I140b483d8afaaed7f25a3adb58bab65bffbf7322
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-24 09:04:43 +02:00
Robert Loehning
abe5f8ad92 Squish: Added toolchain
Change-Id: I411cdd7e0dcc913b3c858a64e32e3d761158a10f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-23 15:48:45 +02:00
Pavel Fric
78d72c916b Update Czech translation
(take 2)

Change-Id: I8e9626701b7cc1c2adf99e3567d35a2ae37b98f7
Reviewed-by: Tomas Pospichal <tm.pospichal@gmail.com>
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-23 15:21:40 +02:00
Leena Miettinen
a333ebb2ac Doc: update screenshots of sidebar and close button
Change-Id: I0d9bf73124a9cf6a5b055f0823293829f6e656d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-07-23 14:59:07 +02:00
Lukas Holecek
d4576a4b7a fakevim: Fix block selections
Selection anchor should be in front text cursor position.

Last block with nested block should be selected properly.

Change-Id: I796875ef7bce3527fb703ece5fdf944123f12315
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-23 14:53:22 +02:00
Lukas Holecek
ead1ea2471 fakevim: Selection command for strings
Selection commands for strings (blocks enclosed in double or single
quotes or backtick characters). E.g. "di'", "ca`" etc.

Change-Id: Ic83a5230eab317c9e730a1ddb421f2df432cb8e6
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-23 14:51:58 +02:00
Friedemann Kleint
f393ad1640 Fix exit crash in fakevim plugin.
Introduced by cf9895ae01.

Change-Id: Ia5e7f92fb05313826e5ffd8b080b8a711bc6e793
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-23 11:37:53 +02:00
Christian Kamm
8dc0f69ed1 C++: Fix broken merge of 9121c21230.
Change-Id: I0cca1851132245430d59840728362ddea1475655
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-07-23 07:19:26 +02:00
Christian Kamm
23777da0e8 C++: Add dumpers for common datatypes to simplify debugging.
Change-Id: I03f907dd0e8d9d63f0dfd38499c98296b5c7871a
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-07-23 07:19:17 +02:00
Christian Kandeler
94dda38664 Name demangler: Try to fix template parameter packs.
Hard to test at the moment: gcc and clang produce different manglings,
neither of which c++filt can decode.

Change-Id: Ic4ad8887a3ad76086cd8be911334dda21afa85db
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-20 15:47:37 +02:00
Christian Kamm
9121c21230 C++: Fix class scope completion for templates.
* You now get completion for std::vector<int>::[complete].
* Also added a test.

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h

Change-Id: I596ebf6bd18ec9a347113f8d162cc124c8a0d6b4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-20 13:41:15 +02:00
Orgad Shaneh
cf9895ae01 Fix some memory leaks
Task-number: QTCREATORBUG-7645

Change-Id: I34253d063a20ebf927bf651cf68af4fe1b71bc89
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-20 09:13:09 +02:00
hjk
ebc63659c1 debugger: apply custom type display settings also to references
Since a reference is "the same thing" it does not make sense
to offer different choices of displays.

Change-Id: Id9ee31b6f1a8fcc9ff3a523a055017e781249d18
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 23:41:39 +02:00
Konstantin Tokarev
728579ef52 Added VCS integration to ResourceEditor.
Made add and remove operations of ResourceEditor VCS-aware. Also, remove
operation now can remove files from filesystem.

FileUtils::removeFile() and VcsManager::promptToAdd functions were
extracted from ProjectExplorer to prevent code duplication.
RemoveFileDialog was also moved to coreplugin.

Change-Id: Ia51127288030e52ce9475b369e56ea034dfa5d1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-19 22:26:47 +02:00
Orgad Shaneh
bd7499b896 Git: Do not append formatting when log failed
Happens for 00000000 for example

Change-Id: I1ab3157dd87744a4b16284d91dd26f42898965e9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-19 22:24:57 +02:00
BogDan Vatra
e73025d0ab Fix Android toolchains detection (ndk-r8b).
Change-Id: If0824d859fbf50d76798711642b4996db66cd46f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-19 22:24:01 +02:00
hjk
6db108afdd Rename ./src/libs/glsl/specs to specification
It's the second time someone runs into something like
 http://www.digipedia.pl/usenet/thread/12153/5022/
Avoid the problem by renaming the (unneeded...) directory.

Change-Id: I061b5bab3965cdfd31021417b007dc64a4e204ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 18:04:47 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget*
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:15:53 +02:00
hjk
a4fcd8d3cb debugger: allow (most of) the manual test being run gui-less
Change-Id: Ib620b33ea477b154a1ec64af6f57e392a1827e4d
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:03:14 +02:00
hjk
c946b9e4bf analyzer: use ProfileChooser in remote valgrind dialog
Change-Id: I93acd2bb778e9a0b98b227591fc86250ad990147
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:02:40 +02:00
hjk
d92df40125 debugger: fix display of member function pointers
Change-Id: I957e805aad45bf62b6fb8318accd29f54b474b11
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:01:26 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00