feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thorbjørn Lindeijer
92298a5c43 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>
 2011-05-31 09:44:33 +02:00
Thorbjørn Lindeijer
335f6ad0f7 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>
 2011-05-31 09:44:09 +02:00
Christian Kandeler
e0f79761f3 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>
 2011-05-30 17:38:04 +02:00
Christian Kandeler
d627a3ebb1 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>
 2011-05-30 17:37:44 +02:00
Oswald Buddenhagen
7b9ef7923f fix read beyond eol on missing expansion terminator 
now we uniformly increment the read pointer only if we encountered a
terminator (which also implies that we were not at non-eol yet).

Task-number: QTCREATORBUG-5022
Change-Id: If4a4e7aec7423684297393fa10e50a69773b2048
Reviewed-on: http://codereview.qt.nokia.com/222
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-05-30 16:54:04 +02:00
Erik Verbruggen
eadd0e4577 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>
 2011-05-30 16:29:55 +02:00
Tobias Hunger
03047888b5 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>
 2011-05-30 16:28:01 +02:00
hjk
cf62837fab 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>
 2011-05-30 16:00:22 +02:00
hjk
7295d50591 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>
 2011-05-30 16:00:11 +02:00
Christian Kamm
83072da8b0 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>
 2011-05-30 15:19:06 +02:00
Christian Kamm
060ca8d1cb 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>
 2011-05-30 14:51:45 +02:00
dt_
2cc7bea066 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>
 2011-05-30 14:44:33 +02:00
dt_
8ea4b9700d 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>
 2011-05-30 14:05:27 +02:00
dt_
6b0e6072f5 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>
 2011-05-30 13:46:42 +02:00
hjk
2761e8da5a 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>
 2011-05-30 12:59:08 +02:00
Orgad Shaneh
ef19691309 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>
 2011-05-30 12:57:40 +02:00
hjk
66dd03cccc debugger: add manual test for QTCREATORBUG-4997 
Change-Id: Ib8dddfecd5fa139193797541e23d115d83c943a5
Reviewed-on: http://codereview.qt.nokia.com/210
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-30 12:57:15 +02:00
hjk
f897108198 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>
 2011-05-30 12:57:03 +02:00
hjk
7223cf00e6 cplusplus: remove unneeded declaration and destructor 
Change-Id: I5177c5d46409225a8debda2e0f78fffdea27b266
Reviewed-on: http://codereview.qt.nokia.com/208
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-30 12:56:38 +02:00
Christian Kamm
f762d93702 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>
 2011-05-30 12:02:04 +02:00
Thorbjørn Lindeijer
38c798a642 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>
 2011-05-30 11:59:40 +02:00
Thorbjørn Lindeijer
61fc11b9c0 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
 2011-05-30 11:59:12 +02:00
Christian Kamm
88dc2d71fb 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>
 2011-05-30 11:38:51 +02:00
Christian Kamm
f0a4e7e225 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>
 2011-05-30 11:32:23 +02:00
Tom Sutcliffe
ec97fc95a0 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>
 2011-05-30 11:31:26 +02:00
Christian Kamm
715cee76a9 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>
 2011-05-30 11:26:54 +02:00
Christian Kamm
3adc021f4b 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>
 2011-05-30 09:31:44 +02:00
Christian Kamm
cf7663b2de 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>
 2011-05-30 09:31:37 +02:00
Christian Kamm
6e32742400 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>
 2011-05-30 09:28:42 +02:00
Christian Kamm
8742026380 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>
 2011-05-30 08:25:19 +02:00
dt_
42e5e5f00a 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>
 2011-05-27 16:58:05 +02:00
dt_
fb9fb87037 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>
 2011-05-27 16:57:58 +02:00
dt_
f88f4918a4 Fix ProxyAction if layered 2 times 
Change-Id: Icf17f93deb259bfed85e138311d39300d72ee4b5
Reviewed-on: http://codereview.qt.nokia.com/193
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-27 15:56:18 +02:00
dt_
fec98bdf80 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>
 2011-05-27 15:49:04 +02:00
Leandro Melo
2fd5057604 Documentation: Snippets support 
Change-Id: I40dd20a7da93ab7af3044d9bebf49e15dbfb7aa4
Reviewed-on: http://codereview.qt.nokia.com/184
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-05-27 15:25:54 +02:00
Leandro Melo
2e9931f9ae 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>
 2011-05-27 15:25:30 +02:00
dt_
a078f71872 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>
 2011-05-27 15:16:21 +02:00
dt_
0a7a1f5093 Remove dead code 
Change-Id: I935ecbc8616bff78fb5339f467a5832687461e5b
Reviewed-on: http://codereview.qt.nokia.com/188
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-27 15:16:03 +02:00
dt_
fc90ea3c10 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>
 2011-05-27 15:15:43 +02:00
dt_
f118242aaa Fix MaemoRunConfiguration::updateFactoryState() 
Change-Id: I1a79b4709c25fbaa5a09c907794fc6adf8165dd0
Reviewed-on: http://codereview.qt.nokia.com/186
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-05-27 15:15:16 +02:00
dt_
26d4de1ed9 Obviously redudant code 
Change-Id: Iee711600d55c52cef16d518cf70bf047d3bbe085
Reviewed-on: http://codereview.qt.nokia.com/185
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-27 14:47:45 +02:00
hjk
9e231e4407 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>
 2011-05-27 12:22:06 +02:00
hjk
184b079557 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>
 2011-05-27 12:21:52 +02:00
Christian Kamm
96cde1e9de 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>
 2011-05-27 11:49:01 +02:00
Christian Kamm
a7f4e5fab5 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>
 2011-05-27 11:48:53 +02:00
hjk
ca1eaca136 Merge "Merge remote-tracking branch 'origin/2.2'" 2011-05-27 11:36:43 +02:00
Oswald Buddenhagen
c2f2b9d430 Merge remote-tracking branch 'origin/2.2' 
Change-Id: Ia0b356840212aec92e712eb4c905f97a1c1dc53f
 2011-05-27 11:35:20 +02:00
hjk
de929e825d debugger: introduce a parameter struct for updateLocal 
Change-Id: I05ecc935e1b6cf9483f23624f18e4dc5b9f295f3
Reviewed-on: http://codereview.qt.nokia.com/178
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-27 11:23:08 +02:00
hjk
cdfcbcd0e0 debugger: simplify updateLocals() parameters 
Change-Id: I7da344c8eeade5153fb0b98a45e139654a2119dd
Reviewed-on: http://codereview.qt.nokia.com/177
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-27 11:22:53 +02:00
Christian Kamm
30fd098d9f 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>
 2011-05-27 10:56:07 +02:00