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

23398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Stenger
c4e5dcb770 Squish: Change temporarily(?) to Console 
Change-Id: Ib31780a5cc4a159afb4f3eeef4165d30f09e2ba7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 20:13:00 +02:00
Christian Stenger
fb85d0a0f2 Squish: Handle Update Generated Files on Mac 
Change-Id: I390ba57266ab983335a5d76d38a025b4306c5b74
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 20:05:54 +02:00
Christian Stenger
158dfffe7d Squish: Add try/except to continue anyway 
Change-Id: I24a51142988841da3aa156f6a5e6e239a6bd1914
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 19:51:59 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates 
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-05 17:22:06 +02:00
Eike Ziller
2aa4b803a6 Work around uiLanguages crash on Windows with 4.8.0 
Task-number: QTCREATORBUG-721
Change-Id: I159c4ef85eba1eda9f3b7e3a001dd6991d578ffe
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-05 16:59:26 +02:00
Daniel Teske
10438d2e9d BaseTextMark: Support renaming files 
Change-Id: I8d712f76fca5d8f5ecad70f1485228e21c00648d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-05 16:47:15 +02:00
Orgad Shaneh
f1c299a85e Qbs: Allow provider specification for plugins 
Change-Id: I2016da500a9e81d8b2065c4c1c26a15d59c15abf
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-05 15:08:57 +02:00
Daniel Teske
20efc0a6f6 Fix reloading removing all BaseTextMarks 
It was already broken in 2.4.

Task-number: QTCREATORBUG-7110

Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-05 11:59:09 +02:00
Leandro Melo
eb74931dd7 Editor: Fix crash in generic highlighter 
Add a method for basic structural checks of a definition.
Currently it simply tests for a initial context.

Task-number: QTCREATORBUG-7053
Change-Id: I56415034b50908d6da5f66ffab7def8fdd5fa1fb
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-05 08:06:30 +02:00
Orgad Shaneh
7c618087e2 GitIgnore: Added build and renamed gdbdebugger -> debugger 
Change-Id: I5991a8066316f0596b65664bcd0a6302c634a472
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-05 07:33:40 +02:00
Orgad Shaneh
06aa0363b0 Qbs: Libraries capitalized and relocated in bin on Windows 
Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-04 14:16:12 +02:00
Robert Loehning
791a196f1d Squish: Always using menu to close Creator 
Change-Id: I9f8019a23ad96baa865c74721fb8712d612adb81
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-04 13:14:43 +02:00
Jan Kerekes
2ece74469c Added new test cases/suite for complex project compilation 
initial commit

Change-Id: Iefa2e05b4dcd70d599bbf4c7de1ae230cd8f0450
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-04 10:28:23 +02:00
Joerg Bornemann
9fb3afa58b qbs: plugin names changed according to plugin loader 
Task-number: QTCREATORBUG-7231
Change-Id: Iab9d4b729494c69262986b5b8071af7a028b5a4e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-04-03 18:15:25 +02:00
hjk
6830905e96 debugger: don't queue -exec-interrupt 
Change-Id: I65da52375872552064ffa4fa9db8292d27f64f67
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-03 14:16:56 +02:00
Daniel Teske
6334684824 New File Dialog: Choose right default project for adding 
So far we used a heuristic that prefers .pro files in the same directory
as the new files. That fails if there are multiple .pro files in the
same directory. So instead introduce a mechanism to pass extra data
through the wizard.

Task-number: QTCREATORBUG-7157
Change-Id: I615f7292e16a0a6cb1e84f090016879f1038409f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-03 14:11:47 +02:00
Orgad Shaneh
8d5d1f2f66 Dumper test: Add member to Derived 
Change-Id: I324d31f9bfe98689136bb9e9ed40dfe46fa9ca81
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-03 09:25:14 +02:00
Christian Stenger
a96cbcf335 Squish: Small fixes for utils.py 
* invokeMenuItem(): changed order and additional
  waitFor to be more error-proof on Mac
* logApplicationOutput(): added try/except block
  for cases where no former run/debug could be found

Change-Id: I0d434fbb964e3d85e5ccb2a4c336e14e956f44ce
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 18:10:46 +02:00
Jan Kerekes
5254e3e547 Added new test cases/suite for simple project compilation 
initial commit

Change-Id: I06d211ba9878852839cd4774b930efd8cde244ae
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:38:21 +02:00
Christian Stenger
7e4e06796e Squish: Small fixes for runAndCloseApp() 
Change-Id: I74136202c2d5e482a18a56ea2c0ba11d9d958574
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-04-02 15:30:03 +02:00
Orgad Shaneh
d6a2667dac Dumper: Fix dynamic type dumper for generic struct 
Change-Id: Idb5ff44061afa8170afed3737f1be378165732f2
Reviewed-by: hjk <qthjk@ovi.com>
 2012-04-02 13:50:45 +02:00
Joerg Bornemann
26d0311b70 qbs files: share.qbs updated 
Now the Welcome screen is visible again.

Change-Id: I41aeae823c6f81dfec93111f9b4a957f812cb496
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-02 13:46:46 +02:00
Joerg Bornemann
fab7b2970d qbs files: build QmlDesigner plugin 
Change-Id: I850b2be8431803aac9d41fcaf40c89e6a1dd5a2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-04-02 10:56:47 +02:00
Orgad Shaneh
34ec82987f Doc: Some QString->Id corrections 
Change-Id: I43c707cb3d27ac706052f8e46f0f1ef8c86e644e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-02 09:30:46 +02:00
Christian Stenger
f3fd47f601 Squish: Introduce new helper function 
Change-Id: I6ef3022e7053c1e4993cc4276ccd2502de196754
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-30 18:20:04 +02:00
Joerg Bornemann
f3bbbaeef6 qbs files: fix install location of qtcreator.sh 
Change-Id: I6cb039c41d62f1b7b48613b22d4faa9d24d98278
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-03-30 16:01:54 +02:00
Robert Loehning
042dae0e5e Squish: Waiting for enabled button 
Change-Id: If06bb6360c7837e773e2eb0b6be8143e588b771e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-30 14:55:03 +02:00
Daniel Teske
a6b5aaf9e7 Popup TaskWindow on clicking on the task mark 
Reported by erik

Change-Id: Ie78915c61ed27c1b593adce6f321c80898e5649d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-30 14:13:45 +02:00
Daniel Teske
c9bd695a90 Fix projects mode en/disabled state 
The projects mode should be enabled whenever there are projects in the
session.

Task-number: QTCREATORBUG-7208
Task-number: QTCREATORBUG-7207
Change-Id: I924a82283a4e69ebd342a01df9004818e898809b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-29 15:34:07 +02:00
Daniel Teske
8e401b7300 MiniTargetSelector: Reset current item after display name changes 
Taking a item out of the list and reinserting it changes the current
item, so we need to set it again.

Change-Id: Iefcf5adc7a22d9d8b799963a584d496067f233f3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-29 15:07:15 +02:00
Daniel Teske
931cd8a8ec Fix displayname of cloned buildstep lists 
Task-number: QTCREATORBUG-7023

Change-Id: I1e45c5658f90b4643bfa1216a50e105df482f091
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-29 14:44:55 +02:00
Daniel Teske
acb4ebeafa Qt4Project: Fix ordering of buildconfigurations for new/open 
Task-number: QTCREATORBUG-7152

Change-Id: I4c7c0d2f89cdde2ed8dc13adc4187adf91b10f29
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-29 14:44:34 +02:00
Joerg Bornemann
fbf6bc5530 qbs files: Version bump. 
Change-Id: I6675e8dc58a80e37b3c0cfffab0c9d70d83ea91a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-03-29 14:29:57 +02:00
Francois Ferrand
ff652f0a59 Generic Project: Better filtering of supported files. 
In the edit files dialog and project wizard, initial filtering of files
was done by checking the file suffix in mime database. This does not
work for all files (e.g. makefiles), and is not needed: filtering is
done afterwards using a user-editable filter string.

Change-Id: I0664aa5b3c52b663d6d94020df4e1986dd7c69a5
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-29 12:02:19 +02:00
Orgad Shaneh
46a6e9e9e8 Qbs: Fixes for Windows compilation 
Change-Id: Ia392b8dc566e1d4ffadd67c09a30ace7f64b9f3f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-03-29 11:22:48 +02:00
hjk
0d807d597d debugger: fix path to declarative sources 
Change-Id: I896a361ba01e675872eaedbfb73c6c2117ef14a4
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 327b991cf0)
 2012-03-29 09:50:05 +02:00
hjk
f7636890e0 debugger: fix capitalization in stack context menu 
Change-Id: I7a5442428cba0b316ad5e420b37bf3e180c0c9f7
Reviewed-by: hjk <qthjk@ovi.com>
 2012-03-29 09:41:22 +02:00
Orgad Shaneh
4c03096fb1 Avoid native filenames in QML references 
Task-number: QTCREATORBUG-7191

Change-Id: I0198eb6909e5e250831f2031b1245e8e955d49ff
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-29 07:47:28 +02:00
Tobias Hunger
d429dda774 Help: Do not get stuck with spinning cursor 
Do not get stuck with the busy cursor spinning on windows whenever
a page is not found.

Change-Id: I4596b6ec0d3de4005bc60422e4fe19142600e336
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
 2012-03-28 16:46:35 +02:00
Christian Stenger
857261f99d Squish: Improve openQmakeProject() 
Change-Id: I847604f81d1bdb10a56360af3d0969e451b3344c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-28 15:27:38 +02:00
Daniel Teske
07460d167d ProjectExplorerPlugin:addProject() remove code to set startup project 
addProject() is called from 2 places: openProject and restoreSession
openProject() takes care of setting a startup project itself and
restoreSession sets it explicitly after opening the projects. So the
code in addProject() is not needed.

Change-Id: Iaa5de3e36fd4b60c8ceb79b8ea3ca68dbc9b491c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-28 15:00:28 +02:00
Daniel Teske
68790aa20a On Session restore, set the correct startup project 
Task-number: QTCREATORBUG-7161
Change-Id: Ie83961b35f2d7d4419a519a2fe6e4df601a67d1c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-28 15:00:21 +02:00
Daniel Teske
2bd4758fe4 CMakeProjectManager: Fix crash for makesteps in deployconfigurations 
Task-number: QTCREATORBUG-7143
Change-Id: I0bf4e0e45367c361bd3efa5e2db9349d438184ab
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-28 14:00:40 +02:00
Daniel Teske
2543919b32 GenericProjectManager: Fix crash for make deploy steps 
Task-number: QTCREATORBUG-7183

Change-Id: Ib917c8990c698b7315ebb79083bf71623b3ae6e7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-28 14:00:32 +02:00
Erik Verbruggen
275e207d26 Fix invalid decltype error recovery which resulted in crashes. 
Task-number: QTCREATORBUG-7174

Change-Id: I653db71adc45586cd8518ffd96118425fd3763be
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-03-28 13:41:48 +02:00
Erik Verbruggen
0f21515277 Fix: do not put in duplicate definitions. 
Change-Id: Ia3f248d013a1b4f98ad3e85d13cfcf214d3c97c7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-03-28 13:34:16 +02:00
Aurindam Jana
c1596926ea FileUtils: Remove symbolic links when removing a directory 
Task-number: QTCREATORBUG-6898

Change-Id: Idef8eee191d6d5b8f66046a4e6c6891a54262d2e
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2012-03-27 20:53:17 +02:00
Robert Loehning
f3bb330ea0 Squish: Further improvement of switchViewTo() 
Change-Id: I25f857f05120882427a8ba7569a4c1b66c474f5e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-27 16:28:19 +02:00
Christian Stenger
5ce804b53b Squish: Add Qt4.8 to qtversions.xml 
This is just a preparation for the next patch.

Change-Id: Icac8584029b4119ebbc70f2cb5766768a61e21a8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-27 14:04:34 +02:00
Tobias Hunger
83457326d1 MSVC: Fix env retrieval 
Fix revtrieval of environment settings for MSVC compilers.

Task-number: QTCREATORBUG-7180
Task-number: QTCREATORBUG-7181
Change-Id: I30804446c629b81130e4d746d47f824c8d4693e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-03-27 12:52:41 +02:00