feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
23,295 Commits 108 Branches 368 Tags
3a6aad8571e8ccdecb5514897e11c714d51f652f
Commit Graph

23295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kandeler
7c88978ef6 SSH: UI fixes. 
Change-Id: I7f65be81991130240e0ec74ebd43a8e0aa136a14
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-03-08 10:51:34 +01:00
Thomas Hartmann
2e2e165f3e WelcomePage: add icons to session inplace editor 
Change-Id: I4f2b9f55f6738b379610685f58526ee21b0701f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-03-08 10:36:08 +01:00
Thomas Hartmann
47e4caa386 WelcomePage: crash fix for windows 
Change-Id: I77d69bdd11487388163723dffa56a6690ac14240
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-03-08 10:15:34 +01:00
Kai Koehne
30c21397a6 QmlDebugger: Close connection already in shutdownInferior 
Doing it in shutdownEngine was too late for the mixed debugger
case: The client has already exited in this case, leading to
error messages on the (system) console.

Change-Id: Id31214cb7a1bc9530c1da78b872531bc79894f3b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-03-08 10:11:17 +01:00
Kai Koehne
32cb245883 QmlCppDebugger: Quit the qml debugger before the connection already closed 
Change-Id: If8eddda3f99b6aef501f43f05b6667c250ab7659
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-03-08 10:11:13 +01:00
Kai Koehne
cdb78c534a QmlTooling: Parse messages from latest Qt5 
Change-Id: I5b2574d5dd2fecbf483a2e33feb8674846b84a59
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-03-08 09:59:36 +01:00
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
Christian Stenger
933592e6a7 Squish: Add debug output on fail 
Change-Id: I6ccf33aca23a819ef19ac148b27e36d40854b4cb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-08 09:01:53 +01:00
hjk
e0070e57e6 debugger: make tooltips non-editable 
Task-number: QTCREATORBUG-7028
Change-Id: I8b70435df8b958961204f8498f63b0752a6ad0bf
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-08 08:58:15 +01:00
hjk
3f369366a0 debugger: fix manual test 
Change-Id: I7e3517d69957e7d2c7d3b14f76f260762ff980e9
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-08 08:57:37 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5' 
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
 2012-03-08 07:48:55 +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
Christian Stenger
3a808b0fd8 Squish: Proxy handling to avoid Jenkins fatals 
Change-Id: I89f13b9cf8887168291a29a30288affb1b46dd11
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-07 16:43:42 +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
Joerg Bornemann
aa28539731 qbs files updated 
Platform defines are separated from user defines now.
The standard way to set defines is now
   cpp.defines: ['DEF1', 'DEF2']
again.

Change-Id: Ibe79c40e9430e08f9bd2f1fe94e93109032118c0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-03-07 13:51:25 +01:00
Christian Kandeler
effe56ef12 RemoteLinux: More preparations for introducing an abstract device class. 
- Introduce clone() method.
- Rename "osType" to "type" and "deviceType" to "machineType".
- Move machine type display out of generic settings widget.
- Put only immutable attributes into the device constructor and set the
others via setters. As part of this, also give the
SshConnectionParameters a default proxy type. The necessity to give one
to the constructor explicitly was for historical reasons.

Change-Id: I84757b1b2d6371544b9ab1f3290973e5498176ce
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-03-07 12:18:44 +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
Daniel Teske
be1afbd6bb QtVersion: Pass on all qmake properties to the ProFileParser 
Task-number: QTCREATORBUG-6896

Change-Id: I30a9f9013d91f0cc4937ec376f63d408133ba40c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-03-07 11:06:27 +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
6e4aa3f8b9 WelcomePage: add ids to IWelcomePage and allow replacing 
This patch allows replacing specific pages by id() and priority().

Change-Id: Ief0b01e6a43bdc187625c0b7aa97745588322e5e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-06 12:50:02 +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