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

21185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Koehne 785bcdbee8 Gdb: Fix label in AttachCoreDialog 
Change-Id: I32c7c2ce1e4c887638ca2b5c716c3b812b057913
Reviewed-on: http://codereview.qt-project.org/6437
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-11 15:29:51 +02:00
Leena Miettinen a1ebdb9daf Doc: new and updated refactoring actions 
Change-Id: Iffa160a7482f8528f04a94082fcf8e9cda7f86ab
Reviewed-on: http://codereview.qt-project.org/6422
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-11 12:47:04 +02:00
Daniel Molkentin fd6e4a6eb5 Add include guards for generated file app_version.h. 
Change-Id: I3ad01e47d2a76159b1369330246b23ed03120597
Reviewed-on: http://codereview.qt-project.org/6361
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-11 12:01:41 +02:00
Thomas Hartmann ec8607696a WelcomePage: avoid deadlock on shutdown 
invokeMethod Qt::BlockingQueuedConnection will deadlock if the event
loop has already stopped.

I use Qt::AutoConnection instead and manually sync using a timeout.
I also react to coreAboutToClose() to avoid unnecessary timeouts.

Change-Id: I941bfd6bb66eeb9040a9ae0900492003ca34e094
Reviewed-on: http://codereview.qt-project.org/6421
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-11 12:00:15 +02:00
Aurindam Jana 32ef6c563d V8DebuggerClient: Enable breakpoints on Exceptions 
Previously break on exceptions was always enabled. Now, the user
can add a breakpoint on Javascript Exceptions from the breakpoint
window in the debugger.

Change-Id: Ia9ee813d2fccf89b607fe1dcbad47b4084155a48
Reviewed-on: http://codereview.qt-project.org/6348
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-10-11 11:25:34 +02:00
Friedemann Kleint f1db83be8b Debugger/Python dumper: Fix checkRef() for Qt 5. 
See http://codereview.qt-project.org/4533
(1173d0420e341dc6d38c89e5bc4295a57da7ea74 in qtbase)

Change-Id: I13d249c592b2607ee96c2feacbaefb73dd926867
Reviewed-on: http://codereview.qt-project.org/6324
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-11 10:10:39 +02:00
Leena Miettinen b0a041c81e Doc: code style settings sets 
Change-Id: Icbbed41de686071fa20ca4e19aca77d3bba049c7
Reviewed-on: http://codereview.qt-project.org/6358
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-11 09:14:29 +02:00
Kai Koehne 9ca6cf4eb7 QDeclarativeDebugClient: Expose internal error string 
Forward error string from real device to QDeclarativeDebugClient.

Change-Id: I7ae63a6e8799b42fed387562b91ebfb594956f44
Reviewed-on: http://codereview.qt-project.org/6245
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-11 09:01:29 +02:00
Robert Loehning a7f17f8bdb Compile fix 
Change-Id: I1999e7ccc7e7fe45d656a6aa1ed7d51d827194d7
Reviewed-on: http://codereview.qt-project.org/6367
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 20:00:00 +02:00
Friedemann Kleint dd078ede85 Debugger: Compile manual debugger tests and dumber lib with Qt5. 
Introduce conditionals in the profiles and source code to
be able to test Qt 4 and Qt 5.

Change-Id: I73df5558f2945742d3e56f94baca0ee4d5f9dab8
Reviewed-on: http://codereview.qt-project.org/6330
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 18:32:05 +02:00
Christian Kamm c9668b27f0 Welcome: Fix using desktop qml components in qml editor. 
Change-Id: I2faefb06d1eba3b81be6f366479f3149fedcf885
Reviewed-on: http://codereview.qt-project.org/6319
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-10 18:22:49 +02:00
Kai Koehne 43aa3afb85 WelcomeScreen: Use ListView instead of Repeater for news 
This reduces number of objects created on startup, and also
allows us to simplify the logic a bit.

Change-Id: I6c7c2c5e537ff9a1882e133551f89c056cbe4fe5
Reviewed-on: http://codereview.qt-project.org/6359
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-10-10 17:38:30 +02:00
Kai Koehne 58f987cd07 Debugger: Always show "Start Debugging" methods 
Don't rely on the 'current' project settings for actions like
Attach to QML port. Also, group the actions in a General,
Cpp and QML part, and add separators in between.

Change-Id: I3103a6fc777180a69eee128d39d19de17f312ff3
Reviewed-on: http://codereview.qt-project.org/6323
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-10 16:46:47 +02:00
Daniel Teske 0b4484c5b4 Check all Makefile* for importing builds 
Correctly import both MAKEFILE=Makefile.something in the .pro file, and
makefiles created via qmake MAKEFILE=Makefile.other.
Also correctly handles multiple Makefiles in one directory.

Task-number: QTCREATORBUG-6120
Change-Id: I9c04399aaea7c38f2a4ed2877195f2e36c8f20c7
Reviewed-on: http://codereview.qt-project.org/6347
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-10 15:45:33 +02:00
Robert Loehning 23436285bc Squish: Renamed "destination" to "target" 
Change-Id: I8f8a1cc4b58642fc64adfa76eea84c2b4e9f0423
Reviewed-on: http://codereview.qt-project.org/6255
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-10 15:42:17 +02:00
Tobias Hunger bdf486fca1 VCS: Get current file from the editor 
Get the current file from the editor, not the filemanager. The later
does not get updated for temporary files like those created by git
blame, leaving the file-based actions in the VCSes enabled when viewing
those temporary files, triggering actions on the last real file that
was visible.

Task-number: QTCREATORBUG-6250
Change-Id: I5c2d3c62805f69bc8e103f0776cd6796332f606c
Reviewed-on: http://codereview.qt-project.org/6175
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-10 15:39:50 +02:00
Eike Ziller d6fcc1d6c4 Merge branch '2.4' of ssh://codereview.qt-project.org/qt-creator/qt-creator into 2.4 2011-10-10 15:26:51 +02:00
Eike Ziller 22ddf7083e Remove qttest plugin. 
Change-Id: I593517c64b43d327a1fc6f9c9ca0c5c8f2aed588
 2011-10-10 15:25:32 +02:00
Fawzi Mohamed df4b934086 gdb: workaround to lookup anonymous namespaces 
work around for http://sourceware.org/bugzilla/show_bug.cgi?id=13269

Change-Id: Ibfaf409d48146bbed09c0e563c140a1b7a712d4f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-on: http://codereview.qt-project.org/6179
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-10 14:36:05 +02:00
Christian Kamm 918f5a0e2d QmlJS: Fix bug in context property extraction. 
Skip forward declarations instead of giving up.

Change-Id: Id3a30296a7cefc4ef255d03727557dee6a37c362
Reviewed-on: http://codereview.qt-project.org/6321
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-10 13:40:32 +02:00
Daniel Teske 42b56788ea Fix a crash with cmake and no toolchains configured 
Task-number: QTCREATORBUG-6252
Change-Id: I8b7237c23cd70fe8dd20724ffb3ebdef18f5bf13
Reviewed-on: http://codereview.qt-project.org/6320
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-10 13:35:22 +02:00
Robert Loehning dbf48009cc Squish: Don't add temporary files to git 
Change-Id: Ia076166a867c1c1a9031ea6515143876f4a73d34
Reviewed-on: http://codereview.qt-project.org/6263
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-10 13:17:39 +02:00
Leena Miettinen 1f82042a80 Doc: NetSieben is no longer used 
Change-Id: I9a8eccf5193198effe1b1957d79a10dee036eb11
Reviewed-on: http://codereview.qt-project.org/6224
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-10-07 15:45:26 +02:00
Robert Loehning cc1a2d15d1 Squish: Merged variations of createNewQtQuickApplication() 
Change-Id: I5c2f88e18630922a34dbb52894ce6ef26697c28b
Reviewed-on: http://codereview.qt-project.org/6180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-07 15:17:38 +02:00
Daniel Teske b5ce5e9086 VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer 
Change-Id: I797488c6ace58a6f927fe3d528131682f1832de1
Reviewed-on: http://codereview.qt-project.org/6235
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-07 14:09:16 +02:00
Daniel Teske d8ac419ef5 VcsBaseClientSetting, check the type before returning from the union 
Change-Id: Ic40b88e1cf9b731509edc6636c1e0bdb5f053529
Reviewed-on: http://codereview.qt-project.org/6234
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-07 13:56:06 +02:00
Robert Loehning 368726d6f2 Squish: Moved contents of mainwin.py to other files 
Change-Id: I998b1304dc9ad8832990da5e90ab426c38eb329e
Reviewed-on: http://codereview.qt-project.org/6182
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-07 13:24:45 +02:00
Eike Ziller b44d3ad1ea Remove unused parameter. 
Change-Id: I0aaedd0b7e880d9ace97bf357cd9924247558f0f
Reviewed-on: http://codereview.qt-project.org/6227
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-07 10:42:59 +02:00
Eike Ziller 37b05178c3 Merge remote-tracking branch 'origin/2.3' into 2.4 2011-10-07 08:42:00 +02:00
Christian Stenger 457bc75a85 Squish: Changed bad naming and property issue 
Change-Id: I797820642f9f7041801930155dad2fc708e90ea0
Reviewed-on: http://codereview.qt-project.org/6177
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-10-06 19:55:40 +02:00
Robert Loehning 97207cf28c Squish: Improved function checkCompile() 
Change-Id: Ib1b0dada442dc58f1e56343cf4ae602650291fcf
Reviewed-on: http://codereview.qt-project.org/6167
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-06 17:43:20 +02:00
Tobias Hunger 433534adb2 Git: Fix string 
Make Blame look like the other file-based options.

Change-Id: I09b8ee9fff2ad3f564daa3922dccce3c5136e4a0
Reviewed-on: http://codereview.qt-project.org/6174
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-06 17:39:36 +02:00
Christian Stenger 72419360ed Squish: Fixed a bug with paths containing '.' 
Change-Id: I97c9331dc1caa525b527a8d11992c39cdaa07296
Reviewed-on: http://codereview.qt-project.org/6168
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-10-06 17:08:00 +02:00
Friedemann Kleint d0ef489710 tr()-fixes for 2.4. 
Change-Id: Iaf94e8b634cd68bc8a5eaacc65df47fc40f2b3c7
Reviewed-on: http://codereview.qt-project.org/6173
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-10-06 17:07:51 +02:00
Tobias Hunger b0d7394e1b VCS: Handle empty arguments in EditorParameterWidgets 
Task-number: QTCREATORBUG-6251
Change-Id: I833bcecf295b7191df1916a658b16f008f69f902
Reviewed-on: http://codereview.qt-project.org/6164
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-06 16:23:05 +02:00
Tobias Hunger f654d664ef Git: Use indexes to address pretty printing combobox 
This fixes a incompatibility with the config settings.

Change-Id: I518291af2309acfaba7eea78b22519c283114009
Reviewed-on: http://codereview.qt-project.org/6161
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-06 15:48:04 +02:00
Tobias Hunger e919bb969f VCS: Make editorparameterwidget comboboxes work with indexes 
Change-Id: Id3d81e59f85d9b7d2dbadef337b97be13a37a598
Reviewed-on: http://codereview.qt-project.org/6160
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-06 15:47:51 +02:00
Christian Stenger 8a857ecc29 Squish: Updated existing tests to run on Mac 
Change-Id: Id4c3bd97f806e502fe64ca9bd4864938d918dc73
Reviewed-on: http://codereview.qt-project.org/6156
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-10-06 15:07:17 +02:00
Robert Loehning dc5e5765d9 Squish: Button was renamed to "Issues" 
(cherry picked from commit 2e968aa998)

Change-Id: Ib0ce148edc46a663622d9437da3b7b977baad716
Reviewed-on: http://codereview.qt-project.org/6153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-06 14:13:50 +02:00
Leandro Melo 1ee5418aee ProjectExplorer: Change how .shared settings work 
After discussing the subject we have opted to not automatically track
and synchronize shared settings. The current use case is that one
needs to manually created/edit a .shared file and place it under the
project's directory. We then identify such settings and merge then
into the user ones. Whenever the user changes such a setting in a way
it differs from the .shared value we mark it as a sticky setting.

Change-Id: I1a7196acea5fb76c3ba21ce950a7bfd1aa774da3
Reviewed-on: http://codereview.qt-project.org/5985
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit 97e9399130)
 2011-10-06 12:56:31 +02:00
Leena Miettinen a3dc0755f0 Doc: new settings files 
Task-number: QTCREATORBUG-6204
Change-Id: I6a8206b1675d99b29aa2b96565a4bd1e1dabbf26
Reviewed-on: http://codereview.qt-project.org/6142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-06 12:55:11 +02:00
Tobias Hunger f30e1092f3 Git: Fix git.cmd not found on windows 
Change-Id: I89c7743331bb28bbabe946df3da8fede44652414
Reviewed-on: http://codereview.qt-project.org/6138
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-06 12:05:24 +02:00
Leena Miettinen c98e72a92a Doc: plain C or C++ project wizards 
Add more info about other project wizards

Change-Id: I5b143fb1d8203b0a068e07952952f812b2a601df
Reviewed-on: http://codereview.qt-project.org/6136
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-06 12:04:58 +02:00
Leena Miettinen e1b4703cd5 Doc: remove if defs 
Change-Id: I0843e1ebb07b3974e13d63f75303c31fab892683
Reviewed-on: http://codereview.qt-project.org/6135
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-06 11:47:23 +02:00
Leena Miettinen 8955ce6816 Doc: viewing tutorials while opening and creating projects. 
Target selection is not necessary if only one target is installed.

Task-number: QTCREATORBUG-6237
Change-Id: I26da73aa6d0040f3d86fd485c354b40f86471245
Reviewed-on: http://codereview.qt-project.org/6037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit 21f3a69d4c)
Reviewed-on: http://codereview.qt-project.org/6125
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-06 10:50:59 +02:00
Eike Ziller ae3a833b8c Commit things that went missing from 2a4a56b2be 
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-06 09:52:22 +02:00
Christian Kamm 3d4e508d0c QmlJS: Improve error message. 
This first line of an error needs to make sense on its own.

Change-Id: Ibf3bce7107e8b3df8fa4d0e75924945027678c63
Reviewed-on: http://codereview.qt-project.org/6114
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-06 09:11:46 +02:00
Eike Ziller 2a4a56b2be Load plugins from user config directory too. 
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.

Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-05 18:32:10 +02:00
Tobias Hunger c6a9de7252 Git: Save settings 
VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(

Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:46 +02:00
Tobias Hunger ddf01f357b Git: Remove GitCommand 
Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:30 +02:00