Commit Graph

20593 Commits

Author SHA1 Message Date
Eike Ziller
fcebb2487f Use correct row height in search results pane.
We were always using the editor font height, even for searches like C++
Symbols which don't use the editor font in the search result items.

Change-Id: I2e937d5e934990aceb43898e4ee82dfbd0364d42
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-22 12:16:01 +02:00
Christian Kandeler
db0a4d5172 Fix qbs build for qmlprofiler.
Change-Id: I73347b5a7cc3866c7d7df9dec5c835fda8006938
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-22 11:26:12 +02:00
Christian Kandeler
53a1087d13 Move SSH support into a dedicated library.
It does not belong into libUtils, which is a collection of small
unrelated utility classes.

Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 10:51:53 +02:00
Aurindam Jana
b9d9bb7ba8 QmlJSInspector: New Objects created
Send the engineid, objectid and parentid.

Change-Id: I7b340c1f20ba3eb3f1690d45b28819f6efaae013
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-22 10:43:41 +02:00
Simjees Abraham
ad81c9823b Debugger: Response for DESTROY_OBJECT message is used.
Response for DESTROY_OBJECT message is used to refresh the object
tree such that the destroyed object is not shown in the tree view.

Change-Id: I32d72fa75bbdca6c63551e71395816597dcc0b75
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-21 14:55:06 +02:00
Christian Kandeler
0d6c47e447 Start adding qbs support for src/tools.
Change-Id: I70b9f13c6dffa107b12eac09ed4495a5318fdb1e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-05-21 12:35:29 +02:00
Christiaan Janssen
f1f8706578 QmlProfiler: state dialog as floating widget
Change-Id: I48ff1d729e49347881c82c7bd066d30ecaca47a5
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-21 12:15:21 +02:00
hjk
a4f486b8fb manhattanstyle: don't use defines for constants
Change-Id: I19a9b86c37dfcd1be7451d6fe67322a833d7b322
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-21 10:09:27 +02:00
Konstantin Ritt
a0d39a9acd explicitly enable exceptions where they are required
commit 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c in qtbase desabled the
exceptions support by default for most modules.
Make sure we explicitly enable them for plugins and libraries that uses
exceptions internally.

Change-Id: Id3dc9d572ac7ccd35a869046cfc5d6c4ffec3ba2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-21 09:49:13 +02:00
Eike Ziller
f1c77a8349 Fix closing document when split and two documents are open.
If one had two documents open, but the same document visible in both
split views, closing the document would lead to an empty view and
strange behavior of the close button while in that state.

Task-number: QTCREATORBUG-7361
Change-Id: I3c0673a82b9d11700326a946a04984a2d6d58fe8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2012-05-21 08:57:20 +02:00
Dmitry Savchenko
a788bf97f8 Fix small typos in argument names.
Change-Id: If90f441df6147253903e2c1765d8a6c10eb3b187
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-21 08:55:55 +02:00
Kai Koehne
8e2d5e5d72 Debugger: Enable 'Select Widget ...' only if one can add expression evaluators
Change-Id: Ie515e3d318137206f4f60021d7f154c370b83932
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-18 17:47:08 +02:00
hjk
616e81428d pathchooser: compile fix with stringbuilder
Change-Id: I6d48a40adcd53c8a9099116f5a8bbc74dd6509d9
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-18 17:45:20 +02:00
David Schulz
991157accf Debugger: Fix order of setting debug-file-directory
Change-Id: Ie4032edd4eebc1e3a79fbe15c0bc1292b4a3292a
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-18 16:08:26 +02:00
Tobias Hunger
5a79945ef6 DebuggingHelper: Move to QtSupport
* Move debugginghelper to QtSupport. ProjectExplorer should not start
  looking for Qt versions!
* Make autotools and generic project plugins depend on QtSupport

Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 15:48:26 +02:00
Orgad Shaneh
5c23c44ed0 Qt4PM: Support "Build File" for debug_and_release configurations
Task-number: QTCREATORBUG-106

Change-Id: I9aef17f8b57051ee4b7d22cc4e454d453ea4c821
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 14:14:25 +02:00
Friedemann Kleint
3815988c8a Gerrit: Make number a URL.
Change-Id: I15e07746290241ae10f0c9ecaaad1be5d86ed76c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 12:51:07 +02:00
Orgad Shaneh
473c28e128 Qt4PM: Add Build File context menu entry
Task-number: QTCREATORBUG-106

Change-Id: I50e2068648e6d58405de63ef5f1b575e69b676da
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 12:23:05 +02:00
Orgad Shaneh
9aa69344c5 Qt4PM: Enable Build File manually
Build File should be enabled iff current file is a source file
and current project is not building

Change-Id: I8b5a083b79d00cbe49ff3e5df29f07fd4db94f71
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 12:07:47 +02:00
Orgad Shaneh
32b5bd2778 Qt4PM: Re-enable context "Run qmake" for root project node
Change-Id: I4e4abf8dfc7997d3fdf4525fc97ff277f112b7d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 11:52:50 +02:00
Friedemann Kleint
615f35f144 Gerrit: Fix compilation with MSVC2010, Qt 5.
Change-Id: I8fe5047d99bcac8e81053f750d5ce038773a0ca2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 11:15:57 +02:00
Christian Kandeler
32fc2219a4 Device support: Show availability in settings widget.
Change-Id: If82b23ac71d8c94c6ff659cba10f2858234ddca6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-18 10:15:46 +02:00
Orgad Shaneh
674fce3aca Gerrit: Make dialog narrower
Change-Id: I2c298cde61b7643578c1c2665f8aee994a7289cd
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 09:22:27 +02:00
Orgad Shaneh
231da017f6 PathChooser: Read version info also from standard error
Some apps (e.g. OpenSSH) write version info to standard error

Change-Id: I8dee64709930f4984dba23e71a54ab47faac0778
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 09:18:28 +02:00
Orgad Shaneh
123c5570cd Fix qbs build
Change-Id: I0c2f11b5ad064d1c8e51000f6295ae23608d32bb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-18 07:55:40 +02:00
Orgad Shaneh
1f7ab0dfaa SubmitEditorWidget: Add isDescriptionMandatory()
Usable for SCMs that do not require a message to commit

Change-Id: I6cf0c55698172ad1f53ab31cc8060fa2cbd1a5f5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 23:15:48 +02:00
Christian Kandeler
f3f9f30668 RemoteLinux: Don't assume the ln command understands "-v".
Some busyboxes don't have it.

Change-Id: I235673169a443665743c078c93622464cc2d005d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 17:39:38 +02:00
Friedemann Kleint
f1b52256cd Gerrit: Add 'Details' text to dialog.
- Add a splitter and a text browser containing detailed text
  for the change using HTML links for email and URL, allowing
  for removal of 'Open', 'Copy URL' buttons.
- Remove large tooltip from list, rename methods to toHtml()
  and use them for the details text.
- Parse out reviewer email.
- Display approval level with sign.

Change-Id: I2d71a80bbe19643e5bfa9deeaaeb3650976f00b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 17:38:02 +02:00
Christian Kandeler
6e224d502d Fix qbs build.
Change-Id: Ie708efc4f852c82ae7d932569eb2b6e2d970811f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-05-16 17:02:55 +02:00
Konstantin Tokarev
338524baab Added "Open URL" action.
It was implemented in CodepasterPlugin because it provides facility
to fetch files from network into editor with proper error reporting.

Change-Id: I1ea7f1799dfa3ca8423a06a64b43b419f23046eb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 16:58:00 +02:00
Eike Ziller
e7aded981a Merge remote-tracking branch 'origin/2.5' 2012-05-16 15:01:07 +02:00
Eike Ziller
0b57c4938e Throw out useless safety measure.
Change-Id: I57ef285fc4846638c35433d33980846c68631985
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 14:27:42 +02:00
Friedemann Kleint
37def2aa1c Gerrit: Differentiate by approval type.
- Parse approval type and description.
- Format tooltip as HTML table, listing approvals by type
- Format the approval column similar to the web view by
  type character.
- Fix the special character issue in Qt 4.8 (query tool
  actually outputs UTF8 instead of escapes).

Change-Id: I803f289a03c5a8ede0029d972a19381b5e783d36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 14:26:59 +02:00
Eike Ziller
d8a0b025b4 Remove dead code.
Change-Id: I693fa221027a10c739bde0d27813a57fefbf836f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 14:10:46 +02:00
Eike Ziller
6e7e6acba4 Remove some old TODO items
Change-Id: I43c893176e5a83530f909371fc143dbb0cafd3ba
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 14:10:01 +02:00
Daniel Teske
cec8f23879 Custom wizard: Respect defaultText for Utils::PathChooser
Essentially the same code as for TextEdits and LineEdits

Change-Id: Id4812882258385d35bc5939ecba7433109ec6d2a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Titta Heikkala
2012-05-16 13:57:24 +02:00
Kai Koehne
0fea030cf4 Debugger: Show 'Remove expression evaluator' actions only for watches
Change-Id: I481ec7ff450cb250e9c3ad7718f56f223f65dbcb
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-16 13:50:29 +02:00
Kai Koehne
6af1cc8606 Debugger: Make sure Locals & Expressions use mini splitter
Fix regression introduced in 7f09d0b756.

Change-Id: I01136bf3efc887be1bd71db9356d41bbd8b2f32c
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-16 13:24:42 +02:00
Kai Koehne
871c75a223 Debugger: Rename LocalsAndWatchersWindow
Rename LocalsAndWatchersWindow to LocalsAndExpressionsWindow.

Change-Id: Ifc73ce0e9ec831bc93594b5a600f82d33845b2f7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-16 13:24:35 +02:00
Christian Kandeler
092134f539 Device support: Use Core::Id for device type.
Change-Id: Ic51f6239a34ad752064d7ee6b6f48a9851311135
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 12:55:12 +02:00
Kai Koehne
383b9e00ad Debugger: Add profiling output for objectTreeFetched()
Change-Id: I9407b7617c6e74ab71a72360a72b5f6d1e334ee7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-16 12:35:16 +02:00
Christiaan Janssen
4f6cda3ba0 QmlProfiler: added missing break in switch statement
Change-Id: Ia6ca80e494c2bb61749e50be47bff8cf1cdaf108
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-16 12:18:59 +02:00
Daniel Teske
8264470346 Ups, unbreak overriding make command
Task-number: QTCREATORBUG-7430
Change-Id: I3e2fa49f749ef33a6abece5d98fd4a1ee6d6e66d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-16 11:53:42 +02:00
Tobias Hunger
60191a68dc Make ids handle unicode strings
This should not have any effect on existing ASCII-only ids (not
even when it comes to conversion costs), but will make sure that
ids generated from user data (file names, etc) will work.

Change-Id: I0a086ad433190a038f20fe3f98f525ad8c56db81
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 11:50:54 +02:00
Konstantin Tokarev
dec03a0d6c Open file with default editor when it's activated in ResourceEditor.
This patch provides more convenient way to view/edit resource files than
"Open With" context menu.

Change-Id: I1c1fbfe48ed069d004f900e040b6517a4064b0f1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 11:45:58 +02:00
Kai Koehne
9b3e46b08f Utils: Make sure raiseWindow() works on X11
Fake the source of the _NET_ACTIVE_WINDOW message to be 'pager'
to make sure that all window managers actually raise Qt Creator.

This unfortunately doesn't work on Qt5/QPA, since we don't get the
native window handle ...

Change-Id: Ia5abf743487b2990feceebed3cec9a4d034065aa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-16 11:45:45 +02:00
Jonathan Liu
1f435bcbce SVN: Fix project status command when no document open
The SVN project status command is using currentFileTopLevel() for the
working directory when it should be using currentProjectTopLevel().
If no document is open, currentFileTopLevel() will return an empty
string which means the current working directory of Qt Creator is used.

Change-Id: I848b1adf7166836c5d15e88796af77f8700a43f2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
(cherry picked from commit 82a821fc9b)
2012-05-16 10:20:33 +02:00
Kai Koehne
576d87ab6d Move Component refactoring - ask before adding file to vcs
Task-number: QTCREATORBUG-7391
Change-Id: I746266976f2fb9cd1b38751bf185a747b32780a5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-05-16 08:39:41 +02:00
Friedemann Kleint
e7fe8de4dd Qt versions/qmake dialog: Join filter list correctly.
Do not add a trailing blank.

Change-Id: I0b187345415d96508be495860c530bd2f0c292c6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-15 15:38:35 +02:00
kh1
e9b8d1f929 Remove some objects from the objects pool. Fixes race condition.
Since the central widget would access the local help manager in
its destructor, we need to handle deletion of the objects ourself.
The object pool would release it to early, thus we could never
write some settings back into the collection file.

Change-Id: Ib4e003214d9d0b32bee3922dd23d27624b5d110e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-15 15:34:00 +02:00