feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,192 Commits 108 Branches 368 Tags
3487b538c00bccfb67a5819a6dd321aa3a97b2cb
Commit Graph

23192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hjk
3487b538c0 analyzer: Fix message for "incompatible" builds. 
Task-number: QTCREATORBUG-7011
Change-Id: I49e8c26f0d4affef0a7c4372915ea1608751960c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-08 09:21:53 +01:00
Leena Miettinen
c956f643be Doc: function tooltips 
Change-Id: Ieca6fec27f81c5738c837963ff21a6cb3f707204
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-08 09:18:22 +01:00
Leena Miettinen
b5e127bea1 UI text: use book style caps for options in selection lists 
MeeGo Harmattan is written without a slash.

Change-Id: I439a518d686835b173030282463c55d48a66a562
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-03-08 09:17:35 +01:00
David Schulz
62fd2713d0 Editor: Fix NULL-Pointer dereference in cppinsertdecldef 
Task-number: QTCREATORBUG-7030

Change-Id: Id2467f24dff289b6d23407ea15b181f76c8fd2e7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-03-07 21:39:08 +01:00
Thomas Hartmann
deeb8fe351 WelcomePlugin: java script fix 
missing var

Change-Id: I3bce04272285c07c545fee3d5f1a8f0c898abdb7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-03-07 18:04:10 +01:00
Thomas Hartmann
e2aebba8ed WelcomePage: proper line wrapping for paths in sessions 
Since qml can only wrap at spaces we have to wrap at file separators
manually.

Change-Id: Id853ab140a46e06fff3abf777ab3b234e749e17c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-07 17:51:30 +01:00
hjk
646ae570d7 debugger: better status messages on startup and interrupt 
Change-Id: Id78f189bb55db618e5cbff233e4edebc2d6e886c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-07 17:33:01 +01:00
Daniel Teske
5585426efc Ui: No spaces before "..." 
Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-03-07 16:14:55 +01:00
hjk
272e203b36 wizard: move plain C/C++ app to "Non-Qt project" category 
Change-Id: I89f4c37d7b88cbe5d9fdeff7536d00f68c8035ec
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-07 15:36:58 +01:00
Eike Ziller
1bf5056847 Editor help tool tip options cleanup. 
Change-Id: I3afa91d95bc92f5bd2879f32ca7ab7ff86b97714
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-07 14:36:46 +01:00
Aurindam Jana
5e0e93d20a Mkspec: Update key for Qt 5 
Use QT.qml.bins for Qt 5.

Change-Id: Ia14bfee2d7ebcd976c20f4b50e5e10a94dcbf0de
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-07 12:14:16 +01:00
Leena Miettinen
93eaff52ed UI text: Use sentence style capitalization for labels 
Change-Id: Iac8823e64ebc07a08958c2635e1058aebd11ffcf
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-03-07 11:52:17 +01:00
Robert Loehning
9988c471fe Replaced one-char-strings 
Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-03-07 09:18:15 +01:00
Christian Kamm
ab64c1aef3 QmlJS indenter: Improve indentation of function expressions. 
As discussed with Tor Arne and Fawzi in
http://codereview.qt-project.org/#change,18080

Change-Id: Ia0482d2ed3ddd61fa002e2c76b948301af52a795
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-03-06 17:26:46 +01:00
Daniel Teske
9705001414 LocalApplicationRunControl: Track state of stub for isRunning 
Task-number: QTCREATORBUG-6885
Task-number: QTCREATORBUG-6926

Change-Id: I1cf29656a1de96817681bc2002d6cbc27ae07d20
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-06 17:12:37 +01:00
Leena Miettinen
07d1430918 UI text: write 'run configuration' as two words 
Change-Id: I5b6e0f03fbc729f635d66fb5569c777a72b731f4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-06 16:52:22 +01:00
Thomas Hartmann
363e6a2a1e Wizards: fixing requirements for QtQuick Application Wizard 
We also want to still support Qt Quick 1.0

Change-Id: I2f0923034e30f94ac84f50618a0819895318a6ba
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-03-06 16:44:27 +01:00
Kai Koehne
aa114a2358 Gdb: Notice when the gdb server process is exited 
When terminating from within Qt Creator, we sometimes get a 'Quit'
message instead of 'Remote connection closed'.

Change-Id: I821d436813f1feacfe94ce85bc2175e3646dba27
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-06 16:17:08 +01:00
Tobias Hunger
8cb78687bb VCS: Fix indention 
Change-Id: Ie1d042325f2b1423f9b01ccc1df3c83ba92e0734
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 15:10:56 +01:00
Tobias Hunger
f32c418a88 VCS: Disable revision bar on annotate/log output 
Task-number: QTCREATORBUG-5313

Change-Id: I3dee69028e782c6f87ea1ef8b251d944bcf9be6d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 15:10:42 +01:00
Tobias Hunger
4b366303e6 VCS: Make dark color schemes work with annotation highlighter 
Task-number: QTCREATORBUG-6257

Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 14:34:01 +01:00
Thomas Hartmann
5e36568628 WelcomePage: fix scrollbars of grid view 
Task-number: QTCREATORBUG-7012


Change-Id: I015db6f3ccff4a8b28b59f7eab530a07464e771d
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-03-06 12:48:43 +01:00
Robert Loehning
b41171c847 Normalized connect()s 
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-06 12:46:52 +01:00
Alessandro Portale
9f05e6495d Crisper info icon 
Change-Id: I4e0923034e40f94ac84f50617a0719895318a6ba
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-03-06 12:42:13 +01:00
Thomas Hartmann
92b6fdf48e Wizards: creating a project from existing qml file requires 1.1 
Wizards: Creating a project from existing qml file also
requires Qt Quick 1.1

Change-Id: I2aae04276685c05ce45fff3d5f1a8f0c898abdb6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-03-06 12:39:32 +01:00
Daniel Teske
f435219600 Target setup: If the import path has focus, hitting enter should import 
Task-Number: QTCREATORBUG-7021

Change-Id: I869fc96f5f8d38093ccd090d3f93eef3f53316d5
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-06 12:22:55 +01:00
cnavarro
2fa4e8e26d fix non-stop mode for executeNext and executeStep 
Following the  Change-Id: I18e8b77b615cfceec402b140337709074ad96dc5, I have
found the same behaviour in handleExecuteNext and HandleExecuteStep than in
hanleExecuteContinue. The fix is the same, If you click one of the two
buttons while having a different thread selected, notify the GUI of the gdb
error message but do not kill the debugger neither the inferior as the situation
can be addressed by clicking again step or next after switching to the
stopped thread.

Change-Id: I9f2951ea9846621156ceb3998514d7667d59e7af
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-06 12:03:05 +01:00
Orgad Shaneh
8b6a2b0a85 Git: Do not fail on amend if no files were modified 
Task-number: QTCREATORBUG-6916
Change-Id: I44d69bdd11487388163723dffa56a6690ac14239
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 11:28:04 +01:00
Daniel Teske
4406000cdc TargetSetupPage: "Use shadow building" -> "Shadow build" 
Change-Id: I2c2db9ec54108eab273925bdbf4a4473e567e5ad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-03-06 11:24:47 +01:00
Leena Miettinen
7941b5fd9c UI text: use capitalization correctly 
Use book style caps for titles and sentence style for labels

Change-Id: Ib1ee1825d23537789b260df0d67eda90688e1da3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-06 11:23:50 +01:00
Daniel Teske
587dcdd170 Cloned BuildSteps should have no "Clone of" in display name 
Task-number: QTCREATORBUG-7023
Change-Id: I2bae04272285c05c545fee3d5f1a8f0c898abdb3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 11:11:45 +01:00
Daniel Teske
71e27450b6 React to qt versions changes on the project setup page. 
Since the project setup now hapens in the projects mode, we need to
consider the user using the qt options dialog.

The TargetSetupPage owns the temporary qt versions created for
importing. The individual Qt4TargetSetupWidgets hold pointers
to those temporary qt version. Thus the TargetSetupPage needs
to inform the widgets when a pointer becomes invalid or a
already existing id needs to be replaced by a temporary qt
version. The interface of Qt4TargetSetupWidget is now
pretty bad and doesn't really work.

Task-Number: QTCREATORBUG-7020

Change-Id: I08799e482cb8f7f7b86c1bc14a0aabd444eee5d8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 11:11:07 +01:00
Daniel Teske
713762e108 QtVersionManager::qtVersionsChanged() split list into add/remove/change 
Makes it easier to do the right thing.

Change-Id: Id6c6754033b3310c6b8c68a4aacc22cbaef268ee
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 11:10:59 +01:00
Robert Loehning
08f9d72c51 Squish: Skipping unstable test on Mac 
Change-Id: Icf8e78487d2e734c79aa2b93401a911769a9545e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-06 11:02:16 +01:00
Thomas Hartmann
b4d79d2d25 WelcomePage: fix mouse area for sessions 
Change-Id: I805ee99e075fe4873ce98ae5683729e806010ff8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2012-03-06 09:13:01 +01:00
Robert Loehning
c283323afd Squish: Fixed searching for external tools 
Change-Id: Iad16f3e7a7a4c886bcd2b7eb9bf94ded9926d37f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-05 17:58:15 +01:00
hjk
63f3b2feb6 debugger: compile fix after d48136f312 
Change-Id: Ibd7c9cafd4b16278e1db19155b285dd0ad2436cc
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:29:06 +01:00
Tobias Hunger
52f98b1af8 CPaster: kde paster cleanup 
Change-Id: I4884918ba6564965e0fb1df50951e3fd32e2c0eb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:27:35 +01:00
Tobias Hunger
4f6a5b390b CPaster: Prefer ITextEditor over BaseTextEditor 
Change-Id: I7441ec514cebae6a6a0166463a7362d9d9b178a8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:27:20 +01:00
Tobias Hunger
f4cb1ae735 CPaster: Fix layout in submit dialog 
Change-Id: Ie8838bc809b683a4d1d96360dc0bf8f33233f56b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:27:04 +01:00
Tobias Hunger
b1683641d4 CPaster: Fix pastebin.com 
* Update to new API
* remove unnecessary settings page (pastebin no longer offers subdomains)
* Set post expiration to one month

Change-Id: Ic9947e7227858b87e5dab15c3ce15366004a10c7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:26:46 +01:00
Tobias Hunger
501346c3ae CPaster: Update mime types 
Change-Id: I98b2dd5621f230e0d7ed76eaead59b88464b6198
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:26:01 +01:00
Tobias Hunger
228b7ccee9 CPaster: Update pasting to pastebin.ca 
* New API

Change-Id: I944a0fe52396ee1b3197b4bddc1744188eb40e90
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:25:32 +01:00
Tobias Hunger
abed438cb5 CPaster: Add Cpp protocol 
Change-Id: Ic76ba31061420613683fd683125a32a3c583c84a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:24:36 +01:00
hjk
98565438c3 debugger: fix QDir gdb pretty printer for Qt 4.8 
Change-Id: Iff0f28b37abed29920379302dc540d46588fc787
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:18:42 +01:00
hjk
a913f3f68c debugger: small fixes for semi-automated tests 
Change-Id: I3e2b14aae33ef9cec43c5cea947360e75e19c2c1
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:18:16 +01:00
hjk
ce6a80f337 debugger: extend semi-automanated tests to one level of expansion 
Change-Id: I9063f4eecfe4c42926771cc46539932b4e353b8d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:17:51 +01:00
Tobias Hunger
8973ef31cc Git: Do not pull --rebase when changes are not stashed 
Git will not do a pull --rebase when there are changes. So we
now abort if the user did not stash them instead of trying to
pull.

I do not want to revert user changes implicitly.

Task-number: QTCREATORBUG-7031
Change-Id: Ic6041755938be36d8ecdbcbac373b5c38642360d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-05 17:15:26 +01:00
Kai Koehne
d48136f312 Gdb: Notice when remote gdb process shuts down 
Make sure notifyInferiorExited is called when we get a
'Remote connection closed' message.

Change-Id: I578d62e29ed30243eb7693e641ad809cccd0fcae
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-05 17:08:38 +01:00
Leena Miettinen
5f6ad79a14 UI text: use single quotes to emphasize variables 
Change-Id: I7d5ac28e27d942b7979aaf46cd464ba7989d5d02
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-03-05 16:41:49 +01:00