feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,817 Commits 108 Branches 368 Tags
12a1ba08fa0c84644f4aa836f93af126c807daee
Commit Graph

21817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm
12a1ba08fa QmlJS indenter: Fix indent after do-while without semicolon. 
Change-Id: I4909f4640e7cd115b6c5c54c7aca7fca511653c9
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-15 08:58:21 +01:00
Christian Kamm
af8b381f98 C++ editor: Unify rehighlight() and semanticRehighlight(). 
They did the same thing.

Change-Id: Ic4d1a269417575110ea32ba5d583a01397c9d806
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-15 08:57:32 +01:00
Christian Kandeler
232724cc11 SSH: Make API of SshRemoteProcess more similar to the one of QProcess. 
In the end, we want to derive it from QIODevice as well.

Change-Id: I30e7cb23ec8e5753c363d1f4457b650556860ac2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:42:27 +01:00
Christian Kandeler
75a7bf2919 SSH: Add convencience script for tests. 
rpath experiments failed, so let's just do it like that.

Change-Id: I029580f54145592bc858d564fb198bc25949e330
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:29:44 +01:00
Christian Kandeler
25e716ed77 SSH: Adapt tests to API changes. 
Change-Id: If4d2c7cc088f4dee13186a0e98b8d8e6385e500f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-11-14 17:27:58 +01:00
Christian Kamm
8ce573f53f QmlJS: Update builtins.qmltypes for Qt 5. 
Most important reason is the QSG -> QQuick prefix change.

Change-Id: Ib3b3a70d679807b876648accd0cf17df0eaf80aa
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-14 12:01:55 +01:00
Yuchen Deng
263d98b8fa Fix crash of 'Build All' 
Change-Id: I70d415783da28aa91bdd4f97207aade5aa3e0a1c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-14 12:00:48 +01:00
Hugues Delorme
b7c24130f7 Bazaar: remove needless "virtual" in BazaarPlugin 
Change-Id: I18cd7139b0406339d33ac05d2db7b3b956ebb0ed
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:30:04 +01:00
Hugues Delorme
d4a4ca5054 Bazaar: whitespace and indentation fixes 
Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:29:35 +01:00
Yuchen Deng
73138f633f Git: Figure out codec for amend commit 
Change-Id: Ib8fddbb8343f92cf74b99117999ec033b1785404
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:25:43 +01:00
Yuchen Deng
8382dd7a03 Git: Fix error text codec of 'Show Commit...' 
Change-Id: I4c7e2b2aad44b4f4b53fa936e80ab0d70c75c3c5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:24:43 +01:00
Hugues Delorme
bbfde648d2 Bazaar: rename mistyped local variable 
In function BazaarPlugin::showCommitWidget() variable m_changeLogPattern
is now renamed to changeLogPattern (this is not a class attribute !)

Change-Id: I432bcbc34f922460bf30ea5ed5e8802e12b32e8b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:23:07 +01:00
hjk
cd0673f787 codingstyle: add namespace rules 
Change-Id: Ib6b3e37376084e2305143e42c85d13ce66ec9f2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-14 10:02:43 +01:00
Harald Fernengel
213e20052a Trivial compile fix 
Change-Id: Ie5c722635b6cc5ba38a86ebc30a2c465b76cf392
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-14 08:35:29 +01:00
hjk
772c2b3cc5 fakevim: refactor register handling 
Change-Id: If3551627a8457853c0dedee7a61b388ff3232980
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-12 02:33:15 +01:00
hjk
0e0b356bd7 debugger: show vtable ptr in hex, also with gdb 
Task-number: QTCREATORBUG-6109
Change-Id: I9df2ddcd47e3551b23af20d2199b45fbee34bf9f
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-11 17:54:13 +01:00
hjk
5d810a65b3 debugger: decode addrstep properly when it appears in hex 
Change-Id: I52f85cbd3fa8eb4a1454e3b5265cc7400306eb7a
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-11 17:12:38 +01:00
hjk
989ff4ff73 genericproject: cosmetics 
Change-Id: I3183a76a3e74364d481ff17dc44a400255fdeb62
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-11 17:12:20 +01:00
hjk
f05004c73d valgrind: use native dialog for suppression files. 
This loses the "history list" feature.

Task-number: QTCREATORBUG-6466
Change-Id: If3551627a8457853c0dedee7a61b388ff323298d
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-11 14:14:24 +01:00
Aurindam Jana
f5f51b62df InspectorPlugin: Handle disconnect 
Disonnect inspector when qml adapter emits disconnected
signal.

Change-Id: I2f9acbe2cc19c44edf500e7329d1590b73f97113
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-11 13:04:14 +01:00
Leandro Melo
9e56781b5b Proj. explorer: Adjust order of load/unload signals 
This tries to fix inconsistencies concerning the order of some signals
and the corresponding state of the sessions. In particular, it now emittes
aboutToLoadSession *after* aboutToUnloadSession. Also, retrieving the
active session name gives the correct result when updating project files.
In addition, there's a new parameter to aboutToLoadSession which describes
the session being loaded.

Change-Id: Iab5fb21080a7ee9bbf9f4d8958499cbc5549e81e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-11 12:59:54 +01:00
Aurindam Jana
21efc23373 QmlJSDebugClient: Remove warning during qmake 
Change-Id: Ib5b55701b4d0bd64211b8bdad0e0442e948e9cc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-11-11 12:57:58 +01:00
Kai Koehne
e249265a96 QmlProfiler: Don't let timer run if we cannot connect to port 
Previously the timer was started as soon as we connect, but we
should actually make sure the service is there.

Change-Id: Ic59ccb4a402a54dc1fc1f0c92ca2f80dad436581
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-11-11 12:51:44 +01:00
Daniel Teske
3ba511c6ad Add watching of .files/.config/.creator to generic project 
Strangely absent.

Task-Number: QTCREATORBUG-6478

Change-Id: I35dd03a7d5b34c01dc668e5ed222d10088f77f15
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-11 11:45:42 +01:00
Tobias Hunger
0ce5017de0 RemoteLinux: Consistently use remoteEnvironment 
Consistently use remoteEnvironment when speaking about the environment
on the remote linux machine.

Change-Id: Ifa1ce7c538c899923030250682017f53361775b9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-11 11:41:59 +01:00
Tobias Hunger
e5a0c9454b Embedded Linux: Make embeddded linux target show up in project setup wizard 
Change-Id: I3328479dcdf8790a4b1b8e0a73005c5487cf7f23
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-11 11:40:21 +01:00
Eike Ziller
d1d85ba912 more s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-11 10:53:34 +01:00
Eike Ziller
792c1a57f2 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2011-11-11 09:47:59 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Hugues Delorme
a63fa620b8 VcsBase: show icons for the files in the submit editor 
Change-Id: I0c7704a20a4b9a2ceef814f78d5d52297b8cc4f6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-11 09:35:55 +01:00
Tommi Asp
920ed1140e Better deploy configuration handling for S60 target 
Allows creating custom DeployConfigurationFactories for S60 target
Related to QTCREATORBUG-5535

Change-Id: I2a38ad11e0102eaae3e0a67af2a0750b4b3512a5
Reviewed-by: Tommi Asp <tommi@mowhi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-11 01:03:13 +01:00
Tobias Hunger
c3a62f9c87 Fix WS 
Change-Id: If2fe5eb595ea0fbc7a6c652a16a9893f7c3f0be6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-11 00:58:02 +01:00
Sergey Belyashov
d099d6856e Russian translation update 
Change-Id: I9d3c9f79ccceee8e1627b6d79f1852a21373a483
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-10 19:46:48 +01:00
Victor Ostashevsky
7474e545a9 Ukrainian translation updated for 2.4 
Change-Id: I40f2f94dd07e7b7b10950a0bc4e78227f35046ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-10 19:46:30 +01:00
Beaver Xu
19db15f120 Update Chinese translaton for Qt Creator 2.4. 
Change-Id: Iddc8e574ccc6a727816e8fd4e070c9280b5be73a
Reviewed-by: Viktor Ostashevskiy <ostash@ostash.kiev.ua>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-10 19:45:48 +01:00
Daniel Teske
093162793c Overhaul mini project selector 
This makes the mini project selector keyboard friendly.
Also adds the deployconfiguration. Arguable it looks less neat now.

Change-Id: I761502df0bca72afdc2e56ef9b5abe4f9521a2f7
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-11-10 18:56:21 +01:00
Christiaan Janssen
3053e57227 QmlProfiler: fix crash when no qml events available 
Change-Id: I821ddfca6053eb0af819ba9e21b12d55856a0a3a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-11-10 17:39:09 +01:00
Joerg Bornemann
db9cfc06ac add keyboard accelerators to the "file deleted" prompt message box 
Change-Id: Ifaa790abd795ab3922ad354cd676770ab18c2805
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 17:23:26 +01:00
Joerg Bornemann
bcc224b8c4 fix qmljsdebugclient-lib.pri 
Change-Id: I7d6794ef34568e5be3c75b4b8e2763a2c2798c27
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-11-10 17:15:07 +01:00
Jarek Kobus
da14d86104 Implement context help for pro file editor 
Task-number: QTCREATORBUG-6325
Change-Id: Ie8b2eb582eb527eac6af56d0c69a8ae1dafdc1df
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-10 16:55:11 +01:00
Jarek Kobus
8fcb4d8084 Update qmake keyword list 
Change-Id: Ic53e0246ec3c4b83a1a30fbf896c41407a1ce7fd
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-10 16:52:25 +01:00
hjk
ddc85fe192 fakevim: improve reading of mappings from .vimrc 
Change-Id: I3a575ae71c3c84dea98e2d35d1eda429a3c1ea66
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 16:14:48 +01:00
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +01:00
hjk
cfc9b71ecb coreplugin: replace QByteArray by int for ids 
Change-Id: I3135cb745b4e8adc6d7a7145bac51317544f9844
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:56:31 +01:00
hjk
3a8c0f28b5 fakevim: properly split commands in source'd files 
Change-Id: Iebe4a1e4150374b9d35fe22910f38d7ca9b3ff4e
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:56:03 +01:00
Leandro Melo
4528b19b40 Proj. explorer: Remove dead code 
Change-Id: I5375eeac89b92d2d3938feadd7e9017aae3749e5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-11-10 15:47:57 +01:00
hjk
f80db703bb use Core::Id for ids in INavigationWidgetFactory 
Change-Id: Ic793e01edf6a4d2fe61baadb3aa5bef817436d35
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-10 15:46:13 +01:00
Daniel Teske
e6a2f70244 Slightly simplfy code in welcomescreen/exampleslistmodel 
Change-Id: I49301390b6d16e8c6812e277dda7531c28b59259
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-11-10 15:20:07 +01:00
Daniel Teske
f96b0c614d Disambiguate include guard define 
Change-Id: Ie0eeb3fa2de93370f79cede93a3360224ce10ba9
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-10 15:06:59 +01:00
hjk
7a1b22c890 debugger: fix extractCharArray for e.g. empty strings 
Change-Id: I00b0dab800c2587b5f947f52f96595eefc6ca218
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 13:45:18 +01:00