OSDN Git Service
Christian Kandeler [Wed, 1 Jun 2011 08:41:00 +0000 (10:41 +0200)]
RemoteLinux: Refactor the way the enabled state is updated.
Until now, the widget had some of the knowledge and passed it on to the
run configuration. Now the flow of information is strictly the other way
around.
Change-Id: I7489910d8c48ad8aa63921ec861e429ea0d2949f
Reviewed-on: http://codereview.qt.nokia.com/294
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Tue, 31 May 2011 15:12:35 +0000 (17:12 +0200)]
Add missing plugin dependency change.
Change-Id: I5022b1861bc9b4c001bad3ddfac2a18030a343db
Reviewed-on: http://codereview.qt.nokia.com/280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Christian Kandeler [Tue, 31 May 2011 14:59:43 +0000 (16:59 +0200)]
Maemo: Leave dh_shlibdeps arguments intact when uncommenting.
Change-Id: I63a123cb452ba82866d10c4655acdcf362abcd3d
Reviewed-on: http://codereview.qt.nokia.com/279
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
hjk [Tue, 31 May 2011 13:34:17 +0000 (15:34 +0200)]
debugger: remove python 2.5 path fallback on windows
Change-Id: Ibffc8c0a62b34406cb9e2b5727eefdbd1da491b5
Reviewed-on: http://codereview.qt.nokia.com/271
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Tue, 31 May 2011 12:51:56 +0000 (14:51 +0200)]
debugger: cleanup temporary file used for determining Qt's namespace
Change-Id: I19a99fc54412557c51c792d2c11abb64f5848a42
Reviewed-on: http://codereview.qt.nokia.com/269
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Tobias Hunger [Tue, 24 May 2011 14:06:51 +0000 (14:06 +0000)]
Abi: Allow overriding the detected abis of the gcc tool chain
Change-Id: Ief8985a0f6c8746bb5a0c15c8dcec5387b379159
Reviewed-on: http://codereview.qt.nokia.com/267
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Leandro Melo [Tue, 31 May 2011 14:43:00 +0000 (16:43 +0200)]
Compile fix
Change-Id: I4e588e1f0dc666e19b954cfcd0caa6343101a1d4
Reviewed-on: http://codereview.qt.nokia.com/278
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Tue, 31 May 2011 13:05:39 +0000 (15:05 +0200)]
RemoteLinux: Reverse direction of analyzer dependency.
The way the analyzer plugin runs applications is a complete mess.
While it may make sense conceptually to let the respective plugin
handle the messy details (as it is done for the debug mode), the current
analyzer approach is not designed for that.
Change-Id: I00f0fdda823c45760d5591d0481d2b293c38dc89
Reviewed-on: http://codereview.qt.nokia.com/270
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leena Miettinen [Tue, 31 May 2011 12:12:58 +0000 (14:12 +0200)]
Doc: add texteditor
Change-Id: Ibd155903705e3ee1e238df7186905f666530cebd
Reviewed-on: http://codereview.qt.nokia.com/276
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
hjk [Tue, 31 May 2011 13:34:50 +0000 (15:34 +0200)]
debugger: always use tempfile module
Change-Id: Icd9c3be33ecd69c5ada48108e783f7b5b2967557
Reviewed-on: http://codereview.qt.nokia.com/272
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Leandro Melo [Tue, 31 May 2011 13:52:52 +0000 (15:52 +0200)]
Editors: Change Link color from inkpot scheme
In addition for the report below, the cmake highlighter
now uses the keyword color for functions. This was done
in the previous commit:
5ecd885af3d25acfd8f688428268da2d9198a1bd
Task-number: QTCREATORBUG-5037
Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2
Reviewed-on: http://codereview.qt.nokia.com/274
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Leandro Melo [Tue, 31 May 2011 13:49:14 +0000 (15:49 +0200)]
CMake editor: Use keywords scheme for functions
The Link color from inkpot still needs to be changed.
This will be done in a following commit.
Task-number: QTCREATORBUG-5037
Change-Id: Ia8a5203067761ff6622258fd16f2027667637583
Reviewed-on: http://codereview.qt.nokia.com/273
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Leena Miettinen [Mon, 30 May 2011 15:12:04 +0000 (17:12 +0200)]
Doc: technical support links
Links are now in the Manual, because they will be removed from the Welcome page.
Change-Id: I0845d6c909ce199c0145baac187cd0eedc55a912
Reviewed-on: http://codereview.qt.nokia.com/247
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Mon, 30 May 2011 11:37:53 +0000 (13:37 +0200)]
Doc: code style settings
Change-Id: Ib745a367b4e0cd53679a6f5463e2b4b4c83318a1
Reviewed-on: http://codereview.qt.nokia.com/214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
dt_ [Mon, 30 May 2011 15:02:03 +0000 (17:02 +0200)]
Add small stop icon.
Use the same as the small debug icon.
Task-Nr: QTCREATORBUG-5003
Change-Id: Iee32a7161869dc611d017cde53a4056b8be56315
Reviewed-on: http://codereview.qt.nokia.com/246
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Tue, 31 May 2011 12:40:00 +0000 (14:40 +0200)]
RemoteLinux: Get rid of redundant construction of command prefix.
Also remove unused function.
Change-Id: If3c1d7b61bb44bf8f40cf9443fe5bc93b2a9dc14
Reviewed-on: http://codereview.qt.nokia.com/268
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Mon, 30 May 2011 15:58:04 +0000 (17:58 +0200)]
Better disabled reason for runconfigurations
Check isEnabled() before the runcontrol factory
Change-Id: Ied7e0a9c951adf5ce10f50f901af6bf24f1e3c21
Reviewed-on: http://codereview.qt.nokia.com/249
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Mon, 30 May 2011 14:45:32 +0000 (16:45 +0200)]
Minor include fix
Change-Id: I50ba5ceb01a76ccf40ad6920060cbe986084b938
Reviewed-on: http://codereview.qt.nokia.com/245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Mon, 30 May 2011 12:42:37 +0000 (14:42 +0200)]
Readd editing of paths
The path can only be changed to a version that is of the same type.
That should prevent a few interesting problems
Change-Id: Ib9ddf4cfbeea7ac408ff7d177726005b90cf0205
Reviewed-on: http://codereview.qt.nokia.com/244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Tue, 31 May 2011 08:42:18 +0000 (10:42 +0200)]
debugger: rename 'abiOfBinary' to 'anyAbiOfBinary'
Change-Id: I857dc6d256cbcbfcbf3cfb5113c697b6403a3f38
Reviewed-on: http://codereview.qt.nokia.com/257
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Tue, 31 May 2011 08:27:32 +0000 (10:27 +0200)]
debugger: simplify attach-to-{external,core} code
Change-Id: Ia1af4b48d32b2de4c5f320ba7b8ab4594eb0e56d
Reviewed-on: http://codereview.qt.nokia.com/252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Tue, 31 May 2011 07:48:00 +0000 (09:48 +0200)]
debugger: let debugger attach to currently running process
Change-Id: I4aab1aa84a3dc9211d84d59be76005a8e841239e
(cherry picked from commit
55e399b524721e3561b6c7faae8aef84bf064565)
Reviewed-on: http://codereview.qt.nokia.com/251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kandeler [Tue, 31 May 2011 10:47:53 +0000 (12:47 +0200)]
RemoteLinux: Expose some currently internal classes.
This is needed in the short term to reverse the direction of
the dependency between this plugin and the analyzer.
It is expected that there'll be more users in the future.
Change-Id: I9603e8dfa70e442394ba5e8671c6353b65c46374
Reviewed-on: http://codereview.qt.nokia.com/266
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Tue, 31 May 2011 10:31:00 +0000 (12:31 +0200)]
debugger: make autotest compilable and non-locking again
Change-Id: Ia7cb9e3f4d8aabc1bcd2580dc9d03d06989df1dd
Reviewed-on: http://codereview.qt.nokia.com/265
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Tobias Hunger [Tue, 31 May 2011 10:12:24 +0000 (10:12 +0000)]
VCS: Update default value to current syntax
Change-Id: If640bacd36ad1d6bbffc91bc17a4320e1db34c6a
Reviewed-on: http://codereview.qt.nokia.com/264
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Leandro Melo [Tue, 31 May 2011 09:57:00 +0000 (11:57 +0200)]
C++ editor: Remove unnecessary line split in find usages
Avoid extra allocations since we only the actual line for the case.
Change-Id: I0d0f0db394d9075bbdce24d1d5b5efa55c52f9b3
Reviewed-on: http://codereview.qt.nokia.com/261
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Tobias Hunger [Tue, 31 May 2011 10:06:32 +0000 (10:06 +0000)]
Abi: Add unit tests and support for more unix flavors
Change-Id: I7a1cc69e36217c8d29e3ada0950cafa670f490b6
Reviewed-on: http://codereview.qt.nokia.com/263
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
DimanNe [Tue, 31 May 2011 08:55:57 +0000 (08:55 +0000)]
Added FreeBSD os and FreeBSD flavor support
Change-Id: If0e4351fd8736d14bb8f766ef6572d7260e1f01c
Merge-request: 338
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/262
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Leandro Melo [Tue, 31 May 2011 08:58:23 +0000 (10:58 +0200)]
C++ editor: Normalize line endings for find usages
Find usages and related rely on functions that assume \n as line
ending. This is true for the preprocessed files, but not for the
original sources.
Change-Id: I61b7e05c0116504d11c7df4b1aa10d519b705336
Reviewed-on: http://codereview.qt.nokia.com/260
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
hjk [Tue, 31 May 2011 08:51:21 +0000 (10:51 +0200)]
gdb auto test: compile fix with stringbuilder
Change-Id: Ic3cdeb7164dd1685c3dea6047e5bb6c4b496622a
Reviewed-on: http://codereview.qt.nokia.com/259
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Tue, 31 May 2011 08:47:39 +0000 (10:47 +0200)]
qmljsinspector: style
Change-Id: I4d776b9d0ce77a74d0347eb08c15026982ab8054
Reviewed-on: http://codereview.qt.nokia.com/258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Fawzi Mohamed [Tue, 31 May 2011 08:48:41 +0000 (10:48 +0200)]
Qml Editor: accept imports with absolute paths
qmljs code model now correctly handles absolute paths in imports
Change-Id: I6a4bcfbe9a8d9ab70b5fcac1df36ba9802ff5efe
Reviewed-on: http://codereview.qt.nokia.com/256
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
cerf [Tue, 31 May 2011 08:31:26 +0000 (08:31 +0000)]
vcsbase: support of combo boxes in EditorParameterWidget
VCSBaseEditorParameterWidget supports "choice-based" options
through mapping of QComboBox.
Change-Id: I46e1205e1b6f56b16782d9f0d81ec6f1d4961f1a
Merge-request: 331
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/255
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
cerf [Tue, 31 May 2011 08:31:25 +0000 (08:31 +0000)]
vcsbase: simplify mapping of toggle buttons in EditorParameterWidget
Change-Id: I9fee337731999f9ed4820cd2b449e1d3db661f65
Merge-request: 331
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/254
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
cerf [Tue, 31 May 2011 08:31:25 +0000 (08:31 +0000)]
vcsbase: add "exec command" mechanism to EditorParameterWidget
Based on BaseGitArgumentsWidget, it provides an "arguments changed"
handler that calls executeCommand() by default.
This handler can also further load/save settings
Change-Id: I7182ddfa6323205f2ee57a7ce67122be5b89102e
Merge-request: 331
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/253
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Thorbjørn Lindeijer [Tue, 31 May 2011 07:36:11 +0000 (09:36 +0200)]
QmlJSDebugger: Removed leftover connect statement
It was trying to connect a no longer existing signal to a no longer
existing slot.
Change-Id: Ic00553e5792a3687887e8253e8b2552c38448702
Reviewed-on: http://codereview.qt.nokia.com/250
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Thorbjørn Lindeijer [Thu, 26 May 2011 18:23:16 +0000 (20:23 +0200)]
DeclarativeObserver: Don't fade in the highlight edge
It feels more responsive when the highlight is immediately visible.
Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc
Reviewed-by: Kai Koehne
(cherry picked from Qt 4.8 commit
0b4e028ec294992df01430bdf978982835c7df5c)
Reviewed-on: http://codereview.qt.nokia.com/248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Thorbjørn Lindeijer [Mon, 30 May 2011 14:32:25 +0000 (16:32 +0200)]
QmlJSInspector: Renamed Observer to Inspector
Manually redid Qt 4.8 commit
206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.
In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.
Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kandeler [Mon, 30 May 2011 14:47:27 +0000 (16:47 +0200)]
RemoteLinux: Fix possible race condition.
When opening a new project, the deployables code can
apparently be run before an active project is set.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=251230
Change-Id: Ia8e3067823ee45553364b0e7a867563d008332cd
Reviewed-on: http://codereview.qt.nokia.com/243
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Mon, 30 May 2011 14:32:51 +0000 (16:32 +0200)]
RemoteLinux: Make run configuration's isEnabled() function smarter.
We move some checks over from the factory's canRun() method.
A a result, the disabled "run" button will show a more informative
tool tip.
Change-Id: I88e92c9221907ccfdc296fe13b8e8788cec865c2
Reviewed-on: http://codereview.qt.nokia.com/241
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Erik Verbruggen [Mon, 30 May 2011 14:19:26 +0000 (16:19 +0200)]
Fixed compile problem on Mac.
Change-Id: I411d30b6b269c42f221cf2ee8dbe0f041a7a1829
Reviewed-on: http://codereview.qt.nokia.com/240
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Tobias Hunger [Mon, 30 May 2011 14:12:22 +0000 (14:12 +0000)]
Fix maemo tool chain creation on Qt version changes
Make sure the old maemo tool chain is removed before adding it
again.
Change-Id: Iecb77455c21962a25576fca39d32bb35fe638722
Reviewed-on: http://codereview.qt.nokia.com/227
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Mon, 30 May 2011 14:01:50 +0000 (16:01 +0200)]
debugger: implement an option to stop on qWarnings (gdb only)
Task-number: QTCREATORBUG-842
Change-Id: If1a7d0cd9dfaa5b6b4915fa67a150683cf6786b9
Reviewed-on: http://codereview.qt.nokia.com/226
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Mon, 30 May 2011 12:00:29 +0000 (14:00 +0200)]
debugger: less system specific ui
Change-Id: I6d453a61e56ce52b682a90f03f07330b9a6e24a7
Reviewed-on: http://codereview.qt.nokia.com/225
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Mon, 30 May 2011 10:56:24 +0000 (12:56 +0200)]
QmlJS: Fix potential linking problem.
Don't use plugin from libs/qmljs.
Change-Id: Ia345c567cd1f244ab2191017810ef3eeb91fe0e4
Reviewed-on: http://codereview.qt.nokia.com/213
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Christian Kamm [Mon, 30 May 2011 08:27:29 +0000 (10:27 +0200)]
Prefer C++-style cast.
Change-Id: Id5e300c2e28bc704cbd1ae0d6022be4db8535429
Reviewed-on: http://codereview.qt.nokia.com/203
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
dt_ [Mon, 30 May 2011 11:30:10 +0000 (13:30 +0200)]
Remove BuildStepConfigWidget::init()
It serves no purpose anymore.
Change-Id: Ifc15b29c7736bacde3b310e6c4dc980314145d14
Reviewed-on: http://codereview.qt.nokia.com/217
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Mon, 30 May 2011 11:11:31 +0000 (13:11 +0200)]
Qt4Project: fix canceling codemodel prevents codemodel update
After a cancel the next codemodel needs to start regardless of whether
the underlying information is still the same.
Change-Id: I24eecaf2b8f5c96904002ca1e3dbe4df0061cc9c
Reviewed-on: http://codereview.qt.nokia.com/216
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Mon, 30 May 2011 11:01:33 +0000 (13:01 +0200)]
QMakeStep: fix linkDebuggingHelper
Just showing the widget was setting the linkDebuggingHelper setting.
Change-Id: I0188d713394e35c3519d9bbd822cb970363a68eb
Reviewed-on: http://codereview.qt.nokia.com/215
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
hjk [Mon, 30 May 2011 10:56:26 +0000 (12:56 +0200)]
debugger: unify naming of sysroot related variables and function
Change-Id: I77dd74ba7260622d9fec6cfca4a06d0f817495d8
Reviewed-on: http://codereview.qt.nokia.com/212
Reviewed-by: hjk <qthjk@ovi.com>
Orgad Shaneh [Mon, 30 May 2011 10:32:58 +0000 (12:32 +0200)]
debugger: Added Sysroot chooser for Attach to Core
Merge-request: 339
Reviewed-by: hjk <qtc-committer@nokia.com>
Change-Id: Iad451a0ad124c2eb992433fb0db95b962a551d6b
Reviewed-on: http://codereview.qt.nokia.com/211
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 27 May 2011 13:19:46 +0000 (15:19 +0200)]
debugger: add manual test for QTCREATORBUG-4997
Change-Id: Ib8dddfecd5fa139193797541e23d115d83c943a5
Reviewed-on: http://codereview.qt.nokia.com/210
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 27 May 2011 13:02:25 +0000 (15:02 +0200)]
debugger: fix partial display of children in locals and watchers
Change-Id: I4edc6875f3d24a75dd5554a01ae01946e5c9ae76
Reviewed-on: http://codereview.qt.nokia.com/209
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 27 May 2011 10:44:59 +0000 (12:44 +0200)]
cplusplus: remove unneeded declaration and destructor
Change-Id: I5177c5d46409225a8debda2e0f78fffdea27b266
Reviewed-on: http://codereview.qt.nokia.com/208
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Mon, 30 May 2011 09:49:05 +0000 (11:49 +0200)]
C++ indenter: Fix indent in body of function with default argument.
Change-Id: I9d4f5b3ae7b8a59f8350cf756979a3a430398112
Reviewed-on: http://codereview.qt.nokia.com/206
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Thorbjørn Lindeijer [Mon, 30 May 2011 09:20:06 +0000 (11:20 +0200)]
Made CrumblePath API a bit more consistent/generic
Was a bit confusing to pass QVariant data in and get an int back.
Change-Id: I613d2eb88ade45baee85a4f84d7db6d3ce7fb923
Reviewed-on: http://codereview.qt.nokia.com/205
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Thorbjørn Lindeijer [Wed, 25 May 2011 14:34:59 +0000 (16:34 +0200)]
Fixed missing border for tab widget in Projects mode
Usually for tab widgets we disabled the border of the first tab, since
the tabs are generally aligned to the single pixel black splitters that
we used in Creator (like in the case of dock widgets or application
output).
Since this particular tab widget is not aligned to such a splitter, it
should have its own border which can be achieved by disabling the
custom style on it.
Change-Id: I8c7af60847afb5cd73ecd8c39a834ed63298ec76
Reviewed-on: http://codereview.qt.nokia.com/122
Reviewed-by: Jens Bache-Wiig
Christian Kamm [Fri, 27 May 2011 09:47:12 +0000 (11:47 +0200)]
QmlJS: Import 'as' has precedence over types imported without as.
Change-Id: Iece286c9d1725d2bb1e3eff57cd73af97dd8c748
Reviewed-on: http://codereview.qt.nokia.com/181
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Mon, 30 May 2011 09:10:06 +0000 (11:10 +0200)]
QmlJS: Output qmltypes parse warnings to General messages pane.
Change-Id: I8ca100ef141082c7606bb98f8a2f81502b14e1af
Reviewed-on: http://codereview.qt.nokia.com/204
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Tom Sutcliffe [Thu, 19 May 2011 13:41:03 +0000 (14:41 +0100)]
USB management fix added to OS X
Task-number: QTCREATORBUG-4933
Change-Id: I03275344fbb85ce2bf3c83a8117075a8d45b12b5
Reviewed-on: http://codereview.qt.nokia.com/34
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Christian Kamm [Mon, 30 May 2011 08:00:23 +0000 (10:00 +0200)]
qmldump: Bump to QtQuick.tooling 1.1, make parser more permissive.
The qmltypes file reader now ignores unknown bindings and components
to allow for better forward-compatibility.
Change-Id: I2e31c17344dc8fdcd301a62c8d08e98c29ef53ee
Reviewed-on: http://codereview.qt.nokia.com/202
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kamm [Mon, 30 May 2011 07:21:26 +0000 (09:21 +0200)]
QmlJS: Update qml-builtin-types for Qt 4.7.4.
Change-Id: I595c1962a71ea5b110e9050f04d1dede3c50fd0b
Reviewed-on: http://codereview.qt.nokia.com/201
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Mon, 30 May 2011 07:01:52 +0000 (09:01 +0200)]
QmlJS: Read the 'revision' property generated by qmldump.
Change-Id: Ia31b1845b1e1e5aabc347dc115e580c72e36f4e3
Reviewed-on: http://codereview.qt.nokia.com/200
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Mon, 30 May 2011 06:41:19 +0000 (08:41 +0200)]
qmldump: Add dumping of 'revision' for Qt >= 4.7.4.
Change-Id: Ib86c771be9540e22b48685eacd29d81056b53588
Reviewed-on: http://codereview.qt.nokia.com/199
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Fri, 27 May 2011 12:51:30 +0000 (14:51 +0200)]
QmlJS: Allow for QML modules with version subdirectories.
That means
import Foo 2.1
can resolve to
/path/Foo.2.1 or
/path/Foo.2 or
/path/Foo
Task-number: QTCREATORBUG-4607
Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1a
Reviewed-on: http://codereview.qt.nokia.com/194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
dt_ [Thu, 26 May 2011 17:57:07 +0000 (19:57 +0200)]
Show tooltip on disabled run actions
Change-Id: I9b5eaa49e14b71b9d1f8ac84aa7cb7bb4d014cac
Reviewed-on: http://codereview.qt.nokia.com/192
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 17:31:51 +0000 (19:31 +0200)]
Set a tooltip on the build actions if they are disabled
Change-Id: Ie10704249a45656ef6173c478607a8351961d560
Reviewed-on: http://codereview.qt.nokia.com/191
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Fri, 27 May 2011 12:34:48 +0000 (14:34 +0200)]
Fix ProxyAction if layered 2 times
Change-Id: Icf17f93deb259bfed85e138311d39300d72ee4b5
Reviewed-on: http://codereview.qt.nokia.com/193
Reviewed-by: hjk <qthjk@ovi.com>
dt_ [Thu, 26 May 2011 14:30:35 +0000 (16:30 +0200)]
Add RunConfiguration::disabledReason
Not used yet
Change-Id: I76b3b81282dea4bca97eaf64e297154a20cf2096
Reviewed-on: http://codereview.qt.nokia.com/190
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Leandro Melo [Fri, 27 May 2011 12:30:17 +0000 (14:30 +0200)]
Documentation: Snippets support
Change-Id: I40dd20a7da93ab7af3044d9bebf49e15dbfb7aa4
Reviewed-on: http://codereview.qt.nokia.com/184
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leandro Melo [Fri, 27 May 2011 08:58:26 +0000 (10:58 +0200)]
Documentation: More on code assist
Change-Id: Icd4edd9fbd2067e46b1c8933d8e9139dafba3e67
Reviewed-on: http://codereview.qt.nokia.com/183
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
dt_ [Thu, 26 May 2011 13:56:36 +0000 (15:56 +0200)]
Add BuildConfiguration::disabledReason()
Not yet used.
Change-Id: I1f8763163e5f19e41d8e98517cf13d9bbb1e6ff8
Reviewed-on: http://codereview.qt.nokia.com/189
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 13:39:52 +0000 (15:39 +0200)]
Remove dead code
Change-Id: I935ecbc8616bff78fb5339f467a5832687461e5b
Reviewed-on: http://codereview.qt.nokia.com/188
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Thu, 26 May 2011 13:33:24 +0000 (15:33 +0200)]
Remove BuildConfiguration parameter from RunConfiguration::isEnabled
Noone used it anyway, makes the code easier to refactor later.
Change-Id: I367c3f15ec5034740760dfe1becd3063b2e19dc1
Reviewed-on: http://codereview.qt.nokia.com/187
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 13:32:34 +0000 (15:32 +0200)]
Fix MaemoRunConfiguration::updateFactoryState()
Change-Id: I1a79b4709c25fbaa5a09c907794fc6adf8165dd0
Reviewed-on: http://codereview.qt.nokia.com/186
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 12:19:40 +0000 (14:19 +0200)]
Obviously redudant code
Change-Id: Iee711600d55c52cef16d518cf70bf047d3bbe085
Reviewed-on: http://codereview.qt.nokia.com/185
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Fri, 27 May 2011 09:02:57 +0000 (11:02 +0200)]
debugger: fix expansion of object in gdb tooltips on first click
Change-Id: Ia157f8fb7f1b9ff8a8161c8a726d1d483b81e54f
Reviewed-on: http://codereview.qt.nokia.com/179
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 25 May 2011 06:58:25 +0000 (08:58 +0200)]
Debugger: don't auto-continue on SIGTRAP if the user ordered a stop
Task-number: QTCREATORBUG-4968
Change-Id: I48d49c3098be3392c9ef7e6b0112149c7def22f9
Reviewed-on: http://codereview.qt.nokia.com/97
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Fri, 27 May 2011 09:00:39 +0000 (11:00 +0200)]
QmlJS: Fix import cache usage with 'as' imports.
Change-Id: I6c057e494f87df927adc7b83c6caf1ecc729ac65
Reviewed-on: http://codereview.qt.nokia.com/176
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Fri, 27 May 2011 08:43:06 +0000 (10:43 +0200)]
QmlJS: Separate imported types and imported JS scopes.
Task-number: QTCREATORBUG-4981
Change-Id: I06d3e428ca4928296a3d5977aeff29fc3217c37c
Reviewed-on: http://codereview.qt.nokia.com/175
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
hjk [Fri, 27 May 2011 09:36:43 +0000 (11:36 +0200)]
Merge "Merge remote-tracking branch 'origin/2.2'"
Oswald Buddenhagen [Fri, 27 May 2011 09:18:14 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/2.2'
Change-Id: Ia0b356840212aec92e712eb4c905f97a1c1dc53f
hjk [Thu, 26 May 2011 14:35:36 +0000 (16:35 +0200)]
debugger: introduce a parameter struct for updateLocal
Change-Id: I05ecc935e1b6cf9483f23624f18e4dc5b9f295f3
Reviewed-on: http://codereview.qt.nokia.com/178
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 26 May 2011 13:13:37 +0000 (15:13 +0200)]
debugger: simplify updateLocals() parameters
Change-Id: I7da344c8eeade5153fb0b98a45e139654a2119dd
Reviewed-on: http://codereview.qt.nokia.com/177
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Fri, 27 May 2011 07:35:47 +0000 (09:35 +0200)]
C++ indenter: Make CppCodeStyleSettings a class.
Also register it with the meta type system.
Change-Id: Id720e43d19765283765e7dbbd46820ba9cfb1be7
Reviewed-on: http://codereview.qt.nokia.com/172
Reviewed-by: Bill King <bill.king@nokia.com>
Leandro Melo [Thu, 26 May 2011 16:09:17 +0000 (18:09 +0200)]
Documentation: Code assist API
Change-Id: Id703725708823edc24171f7c1b28befe99032d63
Reviewed-on: http://codereview.qt.nokia.com/154
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thorbjørn Lindeijer [Thu, 26 May 2011 12:21:44 +0000 (14:21 +0200)]
QmlJSInspector: Fixed multi-selection bug
Nothing useful can be done with multi-selection at the moment, but this
bug was introduced in
8d0601515ebf54568609b2c7e73a8a91c63fdc26 and is
better to fix straight away.
What happened was that when multiple items are selected in the observed
QML application, Qt Creator would pick the first and send that back as
the new selection. This made it impossible to select more than one item.
Task-number: QTCREATORBUG-3426
Change-Id: I68283480af5e0a21e32e51a49848ff9a809ed5ec
Reviewed-on: http://codereview.qt.nokia.com/151
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kandeler [Thu, 26 May 2011 14:42:20 +0000 (16:42 +0200)]
RemoteLinux: Get rid of unnecessary proparser dependency.
Change-Id: I9c6d3b23b2faceb78f4c2a07e577d83c51889f5c
Reviewed-on: http://codereview.qt.nokia.com/152
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Leena Miettinen [Wed, 25 May 2011 11:49:53 +0000 (13:49 +0200)]
Doc: selecting Qt version when building apps for Symbian for the Ovi Store
Change-Id: I54aadfbafd18601a3b0d6420b8ebb00cb082d803s
Reviewed-on: http://codereview.qt.nokia.com/150
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Molkentin [Thu, 19 May 2011 15:14:53 +0000 (17:14 +0200)]
Fix context help for examples
- createRightPaneContextViewer() needs to be called up-front. In the old
order, it would fail the first time.
- Queue opening of help, because we need the editor window to be drawn
before it can be assessed wether to show the help in split mode
Change-Id: Ib2054285efb07ccbfaf3faf089085c16ba432be8z
(cherry picked from commit
c86e81c362411d1f766d36f0f0946a5039fb65fd)
Reviewed-on: http://codereview.qt.nokia.com/149
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Molkentin [Wed, 18 May 2011 09:38:35 +0000 (11:38 +0200)]
Don't open files and help if someone chooses to cancel loading an example.
Task-Number: QTCREATORBUG-4414
Change-Id: I0272091d185fe6a9ac23022eb4efb723eb541494x
(cherry picked from commit
15ac4f0e21c63826a70650e68c433898306307d1)
Reviewed-on: http://codereview.qt.nokia.com/148
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kandeler [Wed, 25 May 2011 09:23:25 +0000 (11:23 +0200)]
Maemo: Create dedicated plugin.
No change in functionality for now. More support for generic remote
Linux support is planned to be added.
The changes in decreasing order of magnitude:
1) Move contents of qt4projectmanager/qt-maemo to new "RemoteLinux" plugin.
2) Make some classes in qt4nodes public for now. More decoupling
in that area will follow.
3) Fix some minor problems uncovered by the move.
Change-Id: I51d0c7977c10019eb6080cd6620bc28ecebad3c4
Reviewed-on: http://codereview.qt.nokia.com/106
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Alessandro Portale [Wed, 25 May 2011 18:47:02 +0000 (20:47 +0200)]
Native dir separators in "Import build" dialog
Change-Id: I532943d61b46046ad3ce36b0b85a5ef5a0208376
Reviewed-on: http://codereview.qt.nokia.com/127
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leena Miettinen [Thu, 26 May 2011 10:58:02 +0000 (12:58 +0200)]
Doc: fix capitalization
Change-Id: I00526a662ea6721256f7bda23d870261f4f43558
Reviewed-on: http://codereview.qt.nokia.com/147
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Leandro Melo [Thu, 26 May 2011 10:10:08 +0000 (12:10 +0200)]
C++ editor: Share the model data acrross completion items
More than one proposal item could be accessed during an iteration.
So they should not take ownershipt of the data, but simply share it.
Change-Id: I7b81b8772cd8ad4d6c2332ba6b5bc320055cd5a2
Reviewed-on: http://codereview.qt.nokia.com/136
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Pawel Polanski [Wed, 25 May 2011 14:14:34 +0000 (16:14 +0200)]
CODA: Coda renamed to CODA
Change-Id: I9d9ca8f576c3ecfa19fd3832d3aa685c6ac7fa89
Reviewed-on: http://codereview.qt.nokia.com/120
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Wed, 25 May 2011 14:08:13 +0000 (16:08 +0200)]
CODA: Rename TCF, TCF TRK to CODA
Change-Id: I92d9bc873f62d04c149e7347145701d8a11c232c
Reviewed-on: http://codereview.qt.nokia.com/119
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Leandro Melo [Thu, 26 May 2011 09:29:25 +0000 (11:29 +0200)]
C++ editor: Check _ to accept idle editor completion
In addition to letters and numbers.
Change-Id: I89ec68c50a62516cc0b91d267fd96bb908cbf8bc
Reviewed-on: http://codereview.qt.nokia.com/131
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Leandro Melo [Thu, 26 May 2011 09:07:41 +0000 (11:07 +0200)]
Completion: Apply perfect match whenever not invoked explicitly
This should not only be when the editor is idle but whenever the
completion was not invoked explicitly.
Change-Id: I0f3dbbe2f5db66ae3e1f57c7039a93f74f31e1dc
Reviewed-on: http://codereview.qt.nokia.com/130
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Thomas Hartmann [Thu, 26 May 2011 10:10:02 +0000 (12:10 +0200)]
QmlDesigner.rewriter: crash fix
When converting nodes into implcit components the default properties
turns from a list property into a (single) node property.
This patch takes this into account.
Change-Id: I85f7ee1f8109da0c001804a0804a07b7acdee3ca
Reviewed-on: http://codereview.qt.nokia.com/135
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>