feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,477 Commits 108 Branches 368 Tags
fe068869b946660f57ff01b19fa733c2c36a899a
Commit Graph

22477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alessandro Portale
fe068869b9 Workaround QtDeclarative crash QTBUG-23445 
Just hardcode the initial WelcomeTab to 1

Task-Number: QTCREATORBUG-6803

Change-Id: I735d18dd3abb55468b1afdae9785f74a4b522345
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-01-17 11:18:35 +01:00
Kai Koehne
fc2d8deae3 QmlEngine: Move setup logic from setupInferior to setupEngine 
This is more in line with e.g. the gdb engine, which also emits
requestRemoteSetup in setupEngine().

Change-Id: I1c2a4c56d6f190a3043ea8a18d2bb28c9d340826
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-01-17 10:53:16 +01:00
Kai Koehne
2cf6cd6cba QmlProject: Print a warning if the mainFile given is not readable 
Change-Id: If5951bb3121b13287a3ccf9d684bf23e0673231c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2012-01-17 10:52:07 +01:00
Leandro Melo
1dc7e0d3ed C++: Don't show inspected type in type hierarcy bases/derived 
Instead, show it on a label above.

Task-number: QTCREATORBUG-6775
Change-Id: I7bf8e72c8a0ba1c07444230915d72b0cd9b66672
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-17 10:22:51 +01:00
Daniel Molkentin
ccb0a1bf9e Add make dmg target 
Change-Id: I643d571afbb7b16f860092c885e3574268f91ddf
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-17 09:53:10 +01:00
hjk
3d39451b15 debugger: show address of the target object when auto-dereferencing 
Task-number: QTCREATORBUG-6813
Change-Id: Iaf1436a41cd22f46e8a8c369f942a3dba127cc6e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-16 18:53:40 +01:00
hjk
e8598fa3dd debugger: compile fix 
Un-breaks cdb engine after 24177e67dea.

Change-Id: Ibf99e1de4178a3d92a213266ecae490db437ca7a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-16 17:37:18 +01:00
hjk
496e9fafd0 debugger: replace static capability check by something potentially dynamic 
This does not yet use the potential.

Change-Id: I087311fb7d59b46e49f65a84c4420c72a1227ebb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2012-01-16 16:33:43 +01:00
Leandro Melo
1c1b3840c5 Editors: Fix refactoring changes indent ranges selections 
This also fix an error by 1 when reindenting for the extract function quickfix.

Change-Id: Icd666edf4c4473322a4d4d9ed5f3ca7fbbfb7d83
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-16 16:01:51 +01:00
hjk
761bef0adc autotools: style, more 'using', less typing. 
Change-Id: I27e8843d5278d1b1a33bd7bdce2f0e721adbd725
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-16 15:34:32 +01:00
Daniel Teske
21dcecee28 Extend note about validity of default 
Task-number: QTCREATORBUG-6711

Change-Id: I56b53b7d2259c55f209330c708df6b2b551cd3d9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-16 15:13:08 +01:00
Aurindam Jana
de151fc1db ScriptConsole: Refactor 
Clean up QmlEngine specific code from debbuger plugin.
The logic to check if the current debug engine is qmlengine
is done by scriptconsole. It also listens to debug engine
state transitions to enable/disable itself accordingly.

Change-Id: If21b1167e870e87166b2f7fd6f3283063e47ded0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-16 12:41:24 +01:00
Alessandro Portale
6318749020 Get native dir separators from "Find in Files" path chooser. 
Alien dir separatoris look so... alien. (At least on Windows).

Change-Id: Ia755e821c81bbdf8d5a6162903983dfbcc9720f8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-16 12:34:22 +01:00
Yuchen Deng
32d139f801 WelcomePage: Fix function parameters 
Change-Id: I2dc2891380e1dbe0326abd3965c74cc94baf948f
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-01-16 12:12:01 +01:00
Leandro Melo
a23606ff44 C++: Expand base types in hierarchy view 
Change-Id: I2389238e4fa40491b023d496c71fc83e991f3e3a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-16 10:48:49 +01:00
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII. 
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-14 21:13:41 +01:00
Tobias Hunger
2776346db4 Have ToolChainManager::defaultDebugger() return a FileName 
Fix fallout of that change.

Change-Id: I2ba7187b232d17d03fecbea63fa68920bdafc5f2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-13 16:53:47 +01:00
Kai Koehne
35e5f66dec Debugger: Fix method names in comment 
Change-Id: I269fdecce845f3cc0e8b70fbf5f7278a0eb00910
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-13 15:54:11 +01:00
Daniel Teske
bcbf17a3b0 Fix crash on adding MakeStep 
This time for real.

Task-number: QTCREATORBUG-6688
Change-Id: I5256e8ca2b50830d8b8b2dd0202031c27bdc6923
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-13 15:41:05 +01:00
Erik Verbruggen
6939ed0c7b Handle method rename in Qt5. 
Change-Id: I2c6dc06ad3b9c8b8261075a4dafecc099d4b64cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-13 15:32:35 +01:00
Daniel Teske
f05c27537e CMake Settings: Make cmake executable field grow. 
Task-number: QTCREATORBUG-6791

Change-Id: I1e3df08a2217c105b3c905e3ea4cd9b960353396
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-13 15:25:06 +01:00
Daniel Teske
26946ec288 Generic Project: Show symlinked files (but not directories) 
Task-number: QTCREATORBUG-6807
Change-Id: I3d99976444c8fa2882e4218377763ae34a681c18
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Thorbjørn Lindeijer
 2012-01-13 15:23:40 +01:00
hjk
66170003e9 debugger: compile fix with namespaces 
Change-Id: Ibab39837fce51d2606343fdcef138fe0e6a7d69a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 15:21:32 +01:00
Robert Loehning
ed51dde28b Squish: Fixed and simplified function 
Change-Id: I5177202b366f8373dda05cbe8f4b1ae2e529cc5c
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-13 15:20:34 +01:00
Daniel Teske
2c95b13098 Generic Project: Remove dead code 
Change-Id: I6557506f84d53f5e856c63eaafbbd86e1913e08b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-13 15:11:26 +01:00
Aurindam Jana
f8624e2ae0 ScriptConsole: Filter debug output 
Use check boxes to filter debug output for Log,
Warning and Error.

Change-Id: I312d51ef692c1136843afce5dc67ec99ab0f77f8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-13 15:04:20 +01:00
Christiaan Janssen
3c0ae08e0c QmlProfiler: unicode for mu 
Change-Id: I33e2cb6557aeebbd8931ab6a22074da3008c07f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-13 14:54:56 +01:00
Christian Stenger
7524fff3c5 Squish: Fix timing issue on Linux 
Change-Id: Ie9ca285bf2ca364db6e56b4aff244b9253d11e67
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-01-13 14:50:02 +01:00
Eike Ziller
4219e41a70 Fix showing the default shortcuts in keyboard preferences 
Change-Id: I49df1f586ac7ed67c61f6bdf646e45bd1e7dbb4a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 14:47:18 +01:00
Eike Ziller
2fe0522339 Better error message. 
Change-Id: I3bf5074e49312b4d8c003500ab2f3b78e325bde8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-13 14:45:23 +01:00
Tobias Hunger
fab53ac364 Replace Q_ASSERTs with QTC_ASSERTs 
or even with QTC_CHECKs.

Change-Id: I6df67f088bb2f944f0a1abd751fdb192db2be298
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 14:34:22 +01:00
Tobias Hunger
e4a0bdd8e2 vcs: better sanity checking 
Change-Id: I1d3b347d291e9f5bc6a873e5c99506371749c0ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-13 14:27:00 +01:00
Tobias Hunger
7d3ba0e9b4 VCSmanager: Fix QTC_ASSERTs 
These tests are needed to make sure no broken data ends up in the cache,
causing inconsistencies in the cache. The asserts did a good job there,
catching a couple of issue, so I would like to keep them the way they are.

QDir is not needed at all as the data _should_ be perfectly fine already
anyway and should not be used if the asserts are not evaluated.

Change-Id: Icf113f8b02b6c7c7ba7498386b8465b2644daae8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-13 14:16:45 +01:00
Eike Ziller
61082af6af Doc: Location where "local" data is saved (e.g. compiled helpers). 
Change-Id: I21ccfd58cbcaae6231b88d3a9039eb413f4be1c2
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-13 13:07:53 +01:00
Kai Koehne
f0a82fe63e QmlProfiler: Coding style fixes 
Change-Id: I302ea39510043b53464af47c45210c19dd232690
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2012-01-13 12:33:23 +01:00
hjk
7ef450af6d debugger: better guess at engine capabilities in dummy engine 
Change-Id: Ia37086a126df7f7d84b9509c54472c5d9be6b4ef
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 12:19:44 +01:00
Yuchen Deng
8e1f24a638 Git: Fix error encoding of output text in some case 
Change-Id: I0bf4269266e725d567b3ff69e4a3ea202911b3ab
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-13 11:28:48 +01:00
Christiaan Janssen
5fede0d497 QmlProfiler: tooltips for the labels column 
Due to space restrictions, the descriptive text of events
in the labels column of the timeline view are elided.  This
patch adds tooltips on mouseover with location and details.

Change-Id: I229988e114f21e4d9575dff137aa91918ad1afa3
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-13 11:28:43 +01:00
Fawzi Mohamed
b43dade44d qmljs: fix racing condition with importPaths 
fixes QTCREATORBUG-6768

Change-Id: I53646df69aa9d0ce97006c68826b02a1452fe4d9
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2012-01-13 11:26:00 +01:00
Leandro Melo
c287d90604 C++: Rename source/setSource to utf8Source/setUtf8Source 
Continuinng a previous commit... This is in order to make
the interface clearer.

Change-Id: Ic1b05217f878578bc84a064927507b75981c47d6
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-13 11:22:28 +01:00
Erik Verbruggen
40810e7596 Changed Q_TYPENAME to typename for Qt5. 
Change-Id: Id831fe1268cbd7fcf3c25378876d969752fa2ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 11:21:39 +01:00
Friedemann Kleint
274d830148 Compile WelcomeMode with QT_NO_CAST_FROM_ASCII. 
- Add missing QLatin1String
- Replace QString::left() by QString::truncate()
- Sanitize eed model code

Change-Id: I3c3b71d8395b7019db662b8aaecf7d1647881a80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-13 11:16:11 +01:00
Kai Koehne
f588438316 Mercurial: Remove unused method 
Change-Id: Ida9e5997f0a0c41162d7a237f4065a2d1dd567c3
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 10:57:11 +01:00
Kai Koehne
2ce9863ad7 ProjectExplorer: Fix "cannot run" tooltip 
Since change a6ff74c0d8
runMode is an enum.

Change-Id: I696c71f2acb54097eb72cbaa39a72f5056b65bf7
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 10:52:04 +01:00
Leandro Melo
fd179ed951 C++: Accept UTF-8 byte arrays in type of expression 
The model uses UTF-8 internally and it makes more sense to only
convert when necessary.

A following commit will rename the source/setSource methods in
document for more clarity too.

Change-Id: I960ea0754efabd1436ad4b4299a57faeb65a8bee
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-13 10:17:03 +01:00
Eike Ziller
edcb065edb Windows build fix. 
Change-Id: I4b7223e16eb727e9d98cc973eb64cb4f9feccdcc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-13 10:10:26 +01:00
Daniel Molkentin
b49a817bfb Fixes for checkInstalledFiles script 
- work on windows
- show unified instead of context diff

Change-Id: Id3ce927f9fdc9783ccb927bcac7d921941865023
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-01-13 10:09:40 +01:00
Daniel Molkentin
6340f5cf37 Fix rpath call (not calling chrpath through shell anymore). 
Change-Id: Ia966c154e0827ce7dc0c4d0a3a45d234f82d0e90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-13 10:09:22 +01:00
Eike Ziller
f7ca05e4b9 Let Command construct its description (former defaultText) itself. 
Instead of doing it duplicated in the general and the fakevim shortcut
settings.

Change-Id: Id4b0e5b0630f1e94c825528f1c038776dc205aa3
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-12 19:50:58 +01:00
Daniel Molkentin
de26dad959 Add bindist and deployqt targets 
Change-Id: Ide9a41d34e73e99959fca18053e06978f724b5aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-12 19:24:30 +01:00