feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,244 Commits 108 Branches 368 Tags
be48a3faffd39689ecd019b94c69ac4042bbdbdc
Commit Graph

27244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hjk
be48a3faff Use Core::Id for IOptionsPage::m_id 
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-17 11:43:04 +01:00
Daniel Teske
5e7cf3f062 MsvcToolChain: Simplify logic 
Remove special code dealing with msvc < 10, those did also ship a
vcvarsall.bat. Add code checking for host bitness to only show
those compilers that make sense. Also check if the batch file that
vcvarsall.bat will call actually exists, so that only installed cross
compilers are shown.

Task-number: QTCREATORBUG-8292
Change-Id: I420a0004632f02cd8a6388f2e12ba59f719909e3
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-17 11:35:04 +01:00
hjk
028fc3dd8c Use Id::fromString instead of the constructor. 
Change-Id: Ie18714ac2872a085e8c20d445472901cc9f6b6c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-17 11:26:49 +01:00
Petar Perisin
b7faf4d674 Git: added custom message to EnsureStash popup 
Better overview in stash dialog.

Change-Id: Icb6d3f8e2e068882e661e017ce8a0bb00ec6dba5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-17 11:18:28 +01:00
Christian Kandeler
8b419be12f Qnx: Fix qbs build. 
Change-Id: I1099477a6f84f27a9f2b08ca2b3aabaef909ffef
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-17 11:07:46 +01:00
Lukas Holecek
2622eb2415 FakeVim: Remember that cursor is at the end of line 
Change-Id: I62098a409028593664b813931d5974de5e787993
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-17 11:03:33 +01:00
Lukas Holecek
402affa9c2 FakeVim: First <Delete> is part of dot command in insert mode 
Change-Id: I9324c65333c0f893541043e953456e83a9986bf7
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-17 11:02:45 +01:00
Fawzi Mohamed
af559bf837 tests/valgrind: fixing compilation 
- convert directly to QString to add to a QTest row and to qMakePair
 - add missing ssh.pri dependency

Change-Id: I819ccfa901f993507d5e449fc68d4317ffa1cebb
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-17 11:02:11 +01:00
hjk
42c16ff7d3 Core: Use the new Id methods in a few places 
There are a lot more left.

Change-Id: I97d32629aa6deef0f4819f70cc0b8437f2814257
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-17 10:57:22 +01:00
hjk
0017a27581 GeneralSettings: save some concatenation of literals 
Change-Id: I1f30d1d99fed4d8fef33523f428395b8c2b6a20d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-17 10:57:10 +01:00
Orgad Shaneh
c58482eca4 Tests: Exclude QT_NO_CAST_FROM_ASCII 
Change-Id: I5bba2a3bf164e5069938b7835176787beb646817
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-17 10:02:22 +01:00
hjk
26275fb175 FakeVim: initialize variables 
Compiler complains about potential use of uninitialized value.

Change-Id: I120329351983ab795f0dae0ebcc87cd53762f0bd
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-16 19:22:34 +01:00
hjk
aa0440474c Fix crash on startup 
Even in Magic Land it's a good idea to have an upper bound of one on
the number of instances of a singleton types.

Task-number: QTCREATORBUG-8578
Change-Id: I5c426493b85e0df9e2460ac2ef8f530be2847236
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-16 19:19:45 +01:00
Christian Kandeler
dd195c9dac Debugger: Fix compilation of name demangler test. 
No more automatic QString <-> char* conversion.

Change-Id: I236c119932f11e5c2515a68499451ada0fc4f6f3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-01-16 18:36:27 +01:00
Oswald Buddenhagen
65c169c80e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
 2013-01-16 16:46:03 +01:00
Daniel Teske
72e3605a01 Add architecture information to Utils::HostOsInfo 
Change-Id: I2e8ec214ba4ea4567e1eeb5d2f3bd1a59000bc48
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-16 16:22:14 +01:00
Orgad Shaneh
c212e081a5 Git: Use configured binary for merge tool 
Change-Id: I27fc6f5137db81214a9f0f4cab9a6f8812d275a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-16 16:15:45 +01:00
Friedemann Kleint
6ec9dd10a5 Fix warning about running processes with empty environment. 
When detecting MSVC installations.

Change-Id: I1d136c6815fe928541620f3e004be4afc0aef39b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-16 15:48:44 +01:00
Fawzi Mohamed
285bffd99b tests/qmlproject: adding utils lib 
Change-Id: I80c952ef8571229893adc6002b39812d6b738b9e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-01-16 15:46:35 +01:00
Fawzi Mohamed
7ae32b1331 qmldesigner: fixing tests 
Change-Id: I2d98ea04860dfab083234904aa83f96cf6790472
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-01-16 15:46:10 +01:00
Fawzi Mohamed
2f26e24b86 tests/preprocessor: adapt to api change 
Change-Id: I79f79cf548933856cec3cdc59963c63d8f7062c8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-16 15:45:29 +01:00
Fawzi Mohamed
b9ddb34862 tests/cpp-frontent: avoid implicit ascii conversions 
Change-Id: Iadd84891958f12d1f87ebe4c87e58f9ebd989697
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-16 15:44:52 +01:00
hjk
56e43ffb55 Compile fix on Mac 
Change-Id: I99adf29b234d820c15889e617d2d4a7ba11c8f91
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-16 15:44:46 +01:00
Tobias Hunger
1dbc5e9829 SDKtool: Create group/world readable files 
Task-number: QTCREATORBUG-8458

Change-Id: I69234f0056ff4a3b00d217f7aad57b78db2096fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-16 15:29:10 +01:00
Aurindam Jana
02871cb805 ToolChainOptionsPage: Check for null pointer 
Change-Id: I33ec41f3f1bd58bd236bceac71d4c709957c8332
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-16 15:21:51 +01:00
Aurindam Jana
b437b988e5 KitManager: Scope KitGuard 
Scope KitGuard correctly to avoid emitting kitUpdated signal
when adding a kit.

Change-Id: Id9b0f92c7c2be8adaf7490cfbecfaceb8717b80f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-16 15:21:39 +01:00
Mehdi Fekari
37527b559c Qnx: Add a BlackBerry setup page to setup the plugin 
Change-Id: I7a15f29d1b0d25f41c8bec7c907da7c60d59dcc1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-16 14:58:21 +01:00
Fawzi Mohamed
f3b353545a cplusplus/parser: removing spurios QT dependency 
Change-Id: Id69343ee12690f2393f3d4e03cf2b40ebbaa8613
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-16 14:24:14 +01:00
Fawzi Mohamed
5935ad14d7 tests/ioutils: fixing namespace change 
Change-Id: Ie30abed23657e6c2d221877a236468650bbbbd2e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-01-16 14:23:45 +01:00
Friedemann Kleint
96d20a2fa1 Compile fix for QT_NO_CAST_FROM_ASCII/ Qt 5. 
Fixes breakage introduced by
88267a3299.

Change-Id: I9615285eb4ea2e0c07ecc207d752da53b54da106
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-16 09:41:32 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII 
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-16 01:14:08 +01:00
hjk
a31dd26e48 Macros: Use Core::Id instead of strings in some places 
Change-Id: Ib6c23db2b6a37a2dfd831da76c15c6fba8113ff6
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-01-15 21:32:10 +01:00
Orgad Shaneh
14e4c19c2c Search: Fix false positive rename warning 
Change-Id: Ic483d2ef05112463bc80d96ac4adf858b5f158fd
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-15 21:22:25 +01:00
hjk
44e61c82de Macros: remove unneeded code 
Change-Id: Idf3cc1c87dece0431809e678d2c843a3fc6cddc9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-01-15 21:18:23 +01:00
Robert Loehning
9741e70f30 debugger: Fixed checks for file classes in self test 
Change-Id: I5bfe1047ad3b6fc6bd7080c15e6908a47e5ae5a8
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-15 19:30:54 +01:00
BogDan Vatra
f841f3743d Add QMAKE_INCDIR to headers search paths 
Change-Id: I482d16efc93d9786d4a66846f6991c168d612a63
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-15 18:47:12 +01:00
BogDan Vatra
0f026bd9d2 Fix crash when pressing stop button 
Change-Id: If1902153404c49516cf4e535655dbbb5a8135b1c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-15 18:45:03 +01:00
Orgad Shaneh
b7ba74d80c Debugger: Update command-line arguments 
Change-Id: I0d6a674766f4cb7c6e002125e91a3df940b1e1b9
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-15 18:02:56 +01:00
hjk
28f6fec97d Features: Use Core::Id as base 
Change-Id: Iab812778f8f924638224ec343cadac70e8854e4f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-01-15 17:59:53 +01:00
Orgad Shaneh
2ab6416a34 SynchronousProcess: Show "process not responding" dialog once 
Change-Id: I81834452d21f3f996103fb93b3b645f4f87d6251
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-15 17:21:25 +01:00
Tobias Hunger
724c7568cf SDKtool: Create group/world readable files 
Task-number: QTCREATORBUG-8458

Change-Id: I69234f0056ff4a3b00d217f7aad57b78db2096fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-01-15 17:19:30 +01:00
Daniel Teske
104c1f3757 Only show Visual Studio compilers if VS is installed 
Task-number: QTCREATORBUG-8487

Change-Id: Ibc812f14cd8e4de765cabf27d23451c06611d372
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-15 17:04:16 +01:00
Daniel Teske
c67da91980 Update .gitignore for windows in source build 
Change-Id: I57d06e129287955a02768130fecf24860698418b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-15 15:51:15 +01:00
Daniel Teske
66bff3f1f1 RemoteLinuxDeployService: Remove superfluous dependency on bc 
Change-Id: I214bf081192c4071d4082623792f7a12a9de61c8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-15 15:47:48 +01:00
Tobias Hunger
92481f1bbb Environment: Add method to convert to QProcessEnvironment 
Change-Id: Id5e918183f26db568745261d0a1eee64ab0c3c29
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-15 15:06:09 +01:00
Tobias Hunger
53703a3f41 Qt4: Remove some dead code 
Change-Id: Ia9596fe16af1ea428482977092b58cb5a04db873
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-15 14:56:32 +01:00
Thomas Hartmann
229105ba89 QmlDesigner: adding manual test files for Qt Quick 2.0 
Change-Id: I44d3a4165d1ff12488bcc63f19765bc7cf91bc18
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-15 13:51:34 +01:00
Sergey Shambir
2151e763e4 Utils: refactored ClassNameValidatingLineEdit 
Now this class can accept '.' namespaces delimiter, which is used in
python. Changed behavior a bit: if namespaces disabled, error message
for 'Namespace:Widget' now is 'The class name contains invalid
characters' instead of 'The class name must not contain namespace
delimiters'. Error message for 'Namespace::Widget' not changed.

Change-Id: I45283ca2002957552375419f1cf3137632dcacdb
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-15 11:29:41 +01:00
hjk
931627e86c Core: add convenience functions to Core::Id. 
These are meant to help the outphasing of the Id(QString) constructor
and generally split the interface into "persistent" and "non-persistent".

Change-Id: Id23f613c304e020044e4996448d68164725c898c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-15 11:23:46 +01:00
Orgad Shaneh
262b5b12c1 VCS: Capitalize change context-menu actions 
Change-Id: I52f109b2826a85de73de74d7395d04d82d0e55f5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-01-15 09:44:05 +01:00