feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,795 Commits 108 Branches 368 Tags
1f3896e8af6f4417588b65f0fa68759277ab6dac
Commit Graph

19795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswald Buddenhagen
1f3896e8af Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	share/qtcreator/dumper/bridge.py
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/remotelinux/remotelinuxapplicationrunner.cpp

Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
 2011-07-07 12:26:59 +02:00
Oswald Buddenhagen
600127e875 fix quoting of strings with spaces and backslashes at the end 
the regexp would match twice at the end, and thus insert a stray quote.
so use a discrete loop instead.
fixed the same thing in proparser/ioutils and consoleprocess before ...

Change-Id: I62b80fb4ea68e00145861f289bc13440c5078873
Reviewed-on: http://codereview.qt.nokia.com/1302
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-07-07 12:16:09 +02:00
hjk
fdb0876e9c debugger: style 
Change-Id: Ia3f2090ffac10149209d0152de65a90e1f822add
Reviewed-on: http://codereview.qt.nokia.com/1299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 11:59:04 +02:00
hjk
402db14943 qmlpuppet: remove unneeded declarations 
Change-Id: I488548fa84e743e0ed80dd68739d3d80a1cea92b
Reviewed-on: http://codereview.qt.nokia.com/1297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 11:57:55 +02:00
Christiaan Janssen
17623c877f QmlProfiler: removed unused images 
Change-Id: Ic28529c1dd309cbe455155f7f991d2b41088c28c
Reviewed-on: http://codereview.qt.nokia.com/1291
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-07 11:20:46 +02:00
Leandro Melo
c9b2809d4e Update changes file 
Change-Id: I7261c91b99db4bc0149346277226b8a01687e70c
Reviewed-on: http://codereview.qt.nokia.com/1271
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-07-07 11:04:45 +02:00
hjk
25ead2a20f analyzer: remove unneeded function declaration 
Change-Id: Iffee3a32a711085a4904e743a18d875306a4e546
Reviewed-on: http://codereview.qt.nokia.com/1289
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 11:04:32 +02:00
hjk
868613b5ed analyzer: merge dockwidget and toolbar creation. 
Now that dock and control widgets are always created as late as
possible and both are needed immediately afterward it makes sense
to merge there construction. This also reduces the chance to create
a partial tool gui in an inconsitent state.

Change-Id: Ic7f405d65b2b8f0b4ee3ff0ef991d6e4746bac0a
Reviewed-on: http://codereview.qt.nokia.com/1249
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 10:37:04 +02:00
hjk
4823487b59 analyzer: fix control/dockwidget construction order 
Change-Id: Id39c55617c6441b221fc321d71e73168f2b3e4bd
Reviewed-on: http://codereview.qt.nokia.com/1245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-07 10:36:44 +02:00
hjk
38c7f981cc analyzer: postpone selecting saved tool 
... until the analyze mode is actually selected

Change-Id: I7d03c48a4b4260d54bf3218b3a493ceacd2d2967
Reviewed-on: http://codereview.qt.nokia.com/1243
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 10:33:17 +02:00
hjk
11dde67267 qmlprofiler: instantiate docks when using the toolbar 
Change-Id: Ic839a4cf18494115a9a9ace4738ecb163722c40b
Reviewed-on: http://codereview.qt.nokia.com/1244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 10:32:50 +02:00
hjk
378da003e9 analyzer: use an enum for StartMode and add comment make intentions clear 
Change-Id: I10d78ad0dd8d410206fc0109b6a3d2b447404553
Reviewed-on: http://codereview.qt.nokia.com/1242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 10:28:16 +02:00
hjk
500981b9c0 analyzer: change default dockwidget layout for callgrind tool 
Change-Id: I7bdfa0a023f813c5da5fdec1d2c8a5abff6092b7
Reviewed-on: http://codereview.qt.nokia.com/1179
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-07 10:23:24 +02:00
Friedemann Kleint
6cf89dcf65 tr()-fix. Use Plural forms. 
Change-Id: I58612cedf33defa78d1cb58e69c49c62a755d726
Reviewed-on: http://codereview.qt.nokia.com/1287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-07 10:09:15 +02:00
Marco Bubke
92c0768691 QmlDesigner: Fix warning 
Change-Id: Ic43b3eab06b4f730ee5b4099e4438a280e00b418
Reviewed-on: http://codereview.qt.nokia.com/1240
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-06 18:20:19 +02:00
Marco Bubke
765ba3b4b9 QmlDesigner: Prevent item hoping for reparenting 
Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.

Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 18:19:28 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
hjk
5b0fc95354 analyzer: remove clutter 
Change-Id: I195b92107e90519d456dbd12a28e9ad236e4b298
Reviewed-on: http://codereview.qt.nokia.com/1241
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-06 16:23:20 +02:00
hjk
718d40aeca debugger: add note which patch to apply for FSF gdb on Mac 
Change-Id: If52ed2255bf10b3880ecb6a370d8268809612fd9
Reviewed-on: http://codereview.qt.nokia.com/1246
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-06 16:22:32 +02:00
Marco Bubke
60a4d2aa73 QmlDesigner.FormEditor: Fix painting of the background 
Caching of the QGraphicsView is broken.

Task-number: QTCREATORBUG-5258
Change-Id: I7db2bff4809b592aaccfa74c37a3212edb29d403
Reviewed-on: http://codereview.qt.nokia.com/1239
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-06 15:58:31 +02:00
Marco Bubke
7d4194d97b QmlDesigner.NodeInstances: Fix no dummydata 
Task-number: QTCREATORBUG-5296

Change-Id: Ia640e03a4a70f15001ab7476713677c52b964cf8
Reviewed-on: http://codereview.qt.nokia.com/1236
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 15:45:16 +02:00
Christian Kandeler
0efdb6cde6 SSH: Fix race condition. 
Change-Id: I4f52a2b604db14d088f2416989a502f91a16deab
Reviewed-on: http://codereview.qt.nokia.com/1237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-06 15:06:20 +02:00
Christian Kandeler
8bddd27a2b Maemo: Add possibility to set the SSH port in the device config wizard. 
This is for weird people who do port forwarding.

Task-number: QTCREATORBUG-5317
Change-Id: If15cab3cc3a12aa79aef0e1cfd1111db79e57b7c
Reviewed-on: http://codereview.qt.nokia.com/1235
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-06 13:54:08 +02:00
Eike Ziller
b37fda1aa7 Add dist files to OTHER_FILES 
Change-Id: I32f525a2478d4442041c52f22f972202ca61f0b8
Reviewed-on: http://codereview.qt.nokia.com/1231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 13:32:33 +02:00
Jarek Kobus
9018f5d355 Make the width of details button dependent on its text 
Task-number: QTCREATORBUG-5311

Change-Id: Ib50dfcb54f2cd23094ca51f2e5ce10890c92a732
Reviewed-on: http://codereview.qt.nokia.com/1166
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 13:30:47 +02:00
Eike Ziller
339f6160fe License Header 
Change-Id: I8d54198888abb9d2c73cf245065d097651b43bb7
Reviewed-on: http://codereview.qt.nokia.com/1230
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 13:30:04 +02:00
Tobias Hunger
212cb05cc9 MSVC: Detect 64bit architectures on 32bit hosts as well 
Task-number: QTCREATORBUG-5115
Change-Id: Ia284c308073f2ba826e964ea7d8ff03ce90e7959
Reviewed-on: http://codereview.qt.nokia.com/1234
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 13:14:53 +02:00
Christian Kandeler
fd560b2d24 RemoteLinux: Fix port collecting for Harmattan. 
At some point, the devrootsh tool turned from a sudo implementation
to some stupid magic crap thing, so we can't use it anymore.

Change-Id: Ice175eb8a1e64e210a26c2cbfb463414e4a91982
Reviewed-on: http://codereview.qt.nokia.com/1213
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-06 13:09:21 +02:00
Christian Kandeler
ee635dcf9e SSH: Don't allow connectToHost() while already connecting/connected. 
Also fix callers potentially violating this policy.

Change-Id: I630f1c544885df93a81e217e792363c0c2314108
Reviewed-on: http://codereview.qt.nokia.com/1186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-06 13:09:05 +02:00
Christian Kandeler
7ecf1e75d4 QML debugging: Make sure the engine detects a remote process quitting. 
Change-Id: Ie41d327432b539264035f104081d4d4b02b56217
Reviewed-on: http://codereview.qt.nokia.com/1171
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-06 13:08:49 +02:00
Christian Kamm
1f9be179f0 C++ indenter: Make continuations after ( consistent. 
Change-Id: Iae780127065e3fce274db10e173f5c0bde15bd92
Reviewed-on: http://codereview.qt.nokia.com/1229
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-07-06 13:06:42 +02:00
hjk
8d8d9d4645 analyzer: directly start tools from menu 
Change-Id: I385abbd906e975b75b1c01e597b6e366c5c57126
Reviewed-on: http://codereview.qt.nokia.com/1180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 12:41:44 +02:00
Daniel Molkentin
15732d1bd2 RemoteLinux: Move generic Dir/File functions into Utils. 
- Make error parameter an optional pointer
  for consistency with DirUtils::copyRecursively()
- Add documentation

Change-Id: I6671142341dbdcf2c8ca1118c35ea05548920609
Reviewed-on: http://codereview.qt.nokia.com/1090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-07-06 12:38:11 +02:00
Tobias Hunger
1ea75f0cbf Add copyright header template 
Change-Id: I17e183cab923e50a1db1632d3701b0673a91ce08
Reviewed-on: http://codereview.qt.nokia.com/1225
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 12:35:06 +02:00
Jarek Kobus
e3858988a4 Fix copyright headers 
Change-Id: Ia2853cb1230b490dcc06b19f0b4436a9d27a079c
Reviewed-on: http://codereview.qt.nokia.com/1227
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-07-06 12:01:28 +02:00
hjk
7a50c47f51 display: simplify AnalyzerStartParameters 
Change-Id: Ibc9db3d7de96461b097d1a78e1bcfd757458fc99
Reviewed-on: http://codereview.qt.nokia.com/1205
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-06 12:01:18 +02:00
Erik Verbruggen
b3237d7d42 Fixed (C)opyright headers. 
Change-Id: I755bdd1788770b7edd34f06372219d27abd0af11
Reviewed-on: http://codereview.qt.nokia.com/1214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 11:57:21 +02:00
Christian Kandeler
00f992e277 Copyright header fixes. 
Change-Id: I1b9188a4dd6f0d0ef58c2ff4e3c5e4d07acae02f
Reviewed-on: http://codereview.qt.nokia.com/1203
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 11:57:08 +02:00
Tobias Hunger
c7c1ba32f7 Add copyright headers 
Change-Id: Ib21b9467ff6a692df56bc5cdac6ee768dae0d2a1
Reviewed-on: http://codereview.qt.nokia.com/1226
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 11:56:33 +02:00
Daniel Teske
b7e72a5cd8 GenericProject: Fix update on editing project.files 
The passed in filename is empty if the file is saved
with it current name. In that case pass the current
name to the GenericProjectManager, which then informs
the projects.

Change-Id: Id11c474930153e904702e7a0145e1f44331241fd
Reviewed-on: http://codereview.qt.nokia.com/1077
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-06 11:26:48 +02:00
Christian Kamm
7ffd2e8b9f Add missing license headers. 
Change-Id: I2dc5d18bfffc8389ad0b162b7dc3b5cc2406027f
Reviewed-on: http://codereview.qt.nokia.com/1222
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-07-06 11:17:05 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
hjk
78b1b042e3 debugger: replace artificial "{console,log}streamoutput" member in GdbMi 
Use proper QByteArray member in GdbResponse instead. Less magic, and
does not break array-style reponses where all children are assumed to
be of the same "type".

Change-Id: Ief1efdeb0412f59836e1b2d6f4cb751ddef3216e
Reviewed-on: http://codereview.qt.nokia.com/1184
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:13:49 +02:00
Eike Ziller
1070da91c5 Avoid compiler warning on Mac 
Change-Id: I10eab3a4b5fc4bf43ee80b1b4baf5767c72ab9c1
Reviewed-on: http://codereview.qt.nokia.com/1208
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-06 10:23:28 +02:00
Christian Kamm
e2cdaf7888 C++ indenter: Fix function declaration continuation indent. 
Change-Id: I0ebe1f0f531cb4830f80b80c6bb52caeaee01353
Reviewed-on: http://codereview.qt.nokia.com/1167
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-07-06 10:00:05 +02:00
Daniel Molkentin
2fba201783 QML Desktop Components: Position ToolTip properly 
Task-Number: QTCREATORBUG-5272
Change-Id: Ia0050d7d63f0ff72fcdbdd2d01c3eb4db8cb8f7a
Reviewed-on: http://codereview.qt.nokia.com/1170
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-07-05 19:46:49 +02:00
Christiaan Janssen
086e0b5789 QmlProfiler: changed Analyze Button icon 
Change-Id: I1246e9292a6d92d406971fa3b655e81df56ba9ae
Reviewed-on: http://codereview.qt.nokia.com/1183
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-05 18:19:19 +02:00
Christiaan Janssen
8658d6f1c6 QmlProfiler: Tooltips 
Change-Id: Ie83698aa10f27989b56b0032d04c416e34f1ded4
Reviewed-on: http://codereview.qt.nokia.com/1182
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-05 18:11:42 +02:00
Christiaan Janssen
7756371cea QmlProfiler: disable navigation buttons when no data 
Change-Id: Ieee8a4c45919c4598d86a817e3489bd3e519d1c8
Reviewed-on: http://codereview.qt.nokia.com/1181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-07-05 18:10:45 +02:00
Christian Kandeler
0358f70983 RemoteLinux: User string fixes. 
Change-Id: I5419a0eb0d8c644597efbf8da4090f960658b7b2
Reviewed-on: http://codereview.qt.nokia.com/1175
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-07-05 16:49:22 +02:00