feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,975 Commits 108 Branches 368 Tags
43465cbe7a1fd5b055ce7930a46265972b77f9e1
Commit Graph

20975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurindam Jana 43465cbe7a Debugger: Show QML Script Console only for QML debugging 
Change-Id: Ibb0f03c77a84ee8682d44944e8a24fac54cb60fe
Reviewed-on: http://codereview.qt-project.org/5329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-22 12:27:38 +02:00
Daniel Teske 97b4bcfa6c ProjectExplorer: On shutdown, delete runcontrols before singnaling done. 
Change-Id: I6860465e575b6751d804304377c16a513c24f20d
Reviewed-on: http://codereview.qt-project.org/5248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-22 11:51:57 +02:00
hjk 85a1841f2c debugger: add option to search debug info in well-known locations 
Change-Id: I16e32f0e44fc628c7dca5270083a9bb1050769c1
Reviewed-on: http://codereview.qt-project.org/5371
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-22 09:32:12 +02:00
Christian Kamm 3a110439e9 QmlJS: Only try qmldump on Desktop and Simulator Qt. 
In particular, don't complain about a missing qmldump binary on other
platforms.

Change-Id: Ie2e96bcb67e609aa5aed31510b06139d2d9ce77e
Reviewed-on: http://codereview.qt-project.org/5327
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-21 16:03:41 +02:00
Bill King b9772e5c81 Update versions to be more inline with latest SDK install. 
Change-Id: I646d68208b0706664a3ffeb9c4f51547af9cc782
Reviewed-on: http://codereview.qt-project.org/5300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-21 15:36:29 +02:00
Eike Ziller a70c767b92 Fixes: Pressing return in search panel didn't run the search. 
It did so only if the focus was on the search term line edit.

Task-number: QTCREATORBUG-6114
Change-Id: I0cf051ed0f5f4e7403d7c36eb2173a71de370276
Reviewed-on: http://codereview.qt-project.org/5252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-21 15:12:41 +02:00
Bill King 106473c4b5 Cleanup to use new waitForSignal function. 
Change-Id: Id47c81fc3c2d4448f26dd2432b73286501be1e26
Reviewed-on: http://codereview.qt-project.org/5297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-21 14:01:41 +02:00
Bill King 226a11db6f More sensible options (with fallback) 
Change-Id: I32afb2ed7e690d3dfc9b2ba47d2007d03d29d2cb
Reviewed-on: http://codereview.qt-project.org/5299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-21 13:45:09 +02:00
Bill King c42351beda Shift temp dir into more findable location. 
Change-Id: Idbf29e79d4a3dc7c4083a5b7cba78489db46366b
Reviewed-on: http://codereview.qt-project.org/5298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-21 13:44:41 +02:00
Christian Kamm 8792fcfdc4 C++ indenter: Fix preserving indent in comments with tabs. 
Task-number: QTCREATORBUG-6151
Change-Id: I584666441dce05af9a91cd28812b230c36bdd830
Reviewed-on: http://codereview.qt-project.org/5318
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-21 13:40:48 +02:00
hjk 7bfde77d7c s/error_message/errorMessage/g 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 13:06:52 +02:00
hjk 56a05bf287 replace 'QMake Console' with 'Plain C++' 
Change-Id: I26b29ce0e62e6470629117ff21412a4cfbe74488
Reviewed-on: http://codereview.qt-project.org/5306
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 12:05:18 +02:00
hjk 13418a2086 fix string in 'qmake console' wizard 
Change-Id: I0cf1b405b9df2af681c87f1636d3457afba0d86e
Reviewed-on: http://codereview.qt-project.org/5305
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 11:57:05 +02:00
Yuchen Deng cc4e2a445c Creates a pure console project using QMake, not using Qt library. 
Merge-request: 386
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I1292faa757d7974eb35c1d463d75bc53f8044c41
Reviewed-on: http://codereview.qt-project.org/5304
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 11:56:56 +02:00
cerf 425261d69a Bazaar: fix whitespaces 
Merge-request: 2208
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I4f803ebe6bfc4eda5635c1ee60d7c049d8c70250
Reviewed-on: http://codereview.qt-project.org/5302
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 11:45:15 +02:00
hjk 93d77eef10 debugger: manual test, add QT += core-private for Qt 5 
Change-Id: I938f926ed78c33c1feb74bcd2f6c850b31241e46
Reviewed-on: http://codereview.qt-project.org/5301
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 11:43:15 +02:00
Christian Kamm 98f44af8a2 QmlJS: Lexer apply fix from Qt5. 
Change-Id: Ic11e6bad2868f56b5d7c2c063b72fb3d25c5417f
Reviewed-on: http://codereview.qt-project.org/5294
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-09-21 10:30:58 +02:00
Eike Ziller 859d80961d Reduce size of general project settings 
Part of a series of commits reducing the (vertical) size of the
preferences dialog.

Task-number: QTCREATORBUG-3172
Change-Id: I1f55607f8ee2e56e86098ba1700fb01671d8965b
Reviewed-on: http://codereview.qt-project.org/5234
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-21 08:32:39 +02:00
Alessandro Portale 768c4ef082 Consistent names for AbstractGeneratedFileInfo::FileType keys 
Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0
Reviewed-on: http://codereview.qt-project.org/4828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-20 17:56:30 +02:00
Joerg Bornemann 5a76c4434e remove superfluous semicolon from test wizard's output 
Change-Id: Id7d5a448c520f3000f686389e50b781bed98b205
Reviewed-on: http://codereview.qt-project.org/1345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-09-20 17:51:56 +02:00
hjk 27438f60e4 add some example with statistics on the impact of using small classes 
Change-Id: I29c68ce88fef599091a84f8bdec54778e4d62b03
Reviewed-on: http://codereview.qt-project.org/5257
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 17:51:50 +02:00
Eike Ziller 0cea87f55b Move some settings pages. 
Reducing vertical size of preferences dialog, and moving languages
settings adjacent.

Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e
Reviewed-on: http://codereview.qt-project.org/5251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-20 17:36:49 +02:00
Marco Bubke 80c1e74abd QmlDesigner.NodeInstances: Change Assert in exit 
Change-Id: I9a19ab772db406b0b1e6f9b76b997dcee17bccbf
Reviewed-on: http://codereview.qt-project.org/5244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 17:06:49 +02:00
Kai Koehne 06a2a46f43 QmlDebugger: Also show status of QDeclarativeEngine client in log 
Fix QDeclarativeEngineDebug to use the same enum as the other clients.
Also, use objectName() to name the clients.

Change-Id: I826970bf248ce2f50c4bf66c1f58c0b9b56698b1
Reviewed-on: http://codereview.qt-project.org/5231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-20 16:13:54 +02:00
Kai Koehne c412abf29f QMLDebugger: Unify status messages 
Use "QML Debugger" as in qmlengine.cpp . Also don't print a warning
if the status is 'unavailable' as this is the default first state
in ',block' mode.

Change-Id: I21d8285eabdb6a2ced87ddc865eae1704e843cd0
Reviewed-on: http://codereview.qt-project.org/5228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-20 16:13:48 +02:00
Kai Koehne d23a1adc3c QmlProfiler: Show 'retry' message box when connect fails 
Show the same message box as in the debugger if connecting to
the port fails.

Change-Id: I5f101fa6e7fc6166ad37c88d046aafca24a4276f
Reviewed-on: http://codereview.qt-project.org/4891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-20 16:13:42 +02:00
Thomas Hartmann 94f95b4bcd QmlDesigner: code cleanup 
Change-Id: Id2ce92b7b1f6bc190c0ac4899c951b8f3cff9535
Reviewed-on: http://codereview.qt-project.org/5225
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-20 14:02:25 +02:00
Thomas Hartmann a83aac5104 fix gcc warning 
Change-Id: I7bd2b2d8256efb5782c2c87920cd2ab9da60a227
Reviewed-on: http://codereview.qt-project.org/5235
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-20 14:02:13 +02:00
hjk 483dfb0898 debugger: handle Qt version 5.0.0 in manual tests 
Change-Id: I4027fb9723e7f3c33edc1b90b0e68c0e96ed92c3
Reviewed-on: http://codereview.qt-project.org/5237
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 13:56:06 +02:00
hjk fcaa288036 debugger: fix compiler warning for not-yet-used enumeration value 
Change-Id: I6ad55fc24c957442ee0ec8735b754f86e32d2dfe
Reviewed-on: http://codereview.qt-project.org/5236
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 13:55:52 +02:00
Eike Ziller 28144129d0 New searches should use the expand all button setting. 
Change-Id: I7aea08c553a18f78b16e40a2685ffb5625e65617
Reviewed-on: http://codereview.qt-project.org/5229
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-09-20 13:55:12 +02:00
Marco Bubke dfbdf28703 Add extension property to FileNameValidatingLineEdit 
Does nothing if extension is empty. The extension check is case
sensitive.

Change-Id: I58f89eb57d53146dae95e58d77cd8b47826b8f42
Reviewed-on: http://codereview.qt-project.org/5163
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-09-20 13:29:31 +02:00
Christian Kamm 71cbd765b2 RefactoringChanges: Fix problems with encodings. 
Task-number: QTCREATORBUG-6140
Change-Id: Iedbfca6987bffa2670df39f5f461690218f6da14
Reviewed-on: http://codereview.qt-project.org/5233
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-20 13:25:36 +02:00
Eike Ziller 7c7562f2a1 Reduce size of general debugger settings. 
Part of a series of commits reducing the (vertical) size of the
preferences dialog.

Task-number: QTCREATORBUG-3172
Change-Id: I649ef392a8fc0fb068cc2f683d58ef324981a1b5
Reviewed-on: http://codereview.qt-project.org/5232
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-20 13:22:18 +02:00
Christian Kamm a225f7a0af QmlJS checks: Add tests and fix small bugs for 'unreachable'. 
Change-Id: Iaf9febc841130fa913fcc071ed0bf28ff9e0b63b
Reviewed-on: http://codereview.qt-project.org/5149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-20 13:21:03 +02:00
Eike Ziller a4570dec9f Fix displayed file name when searching directory ending with '/'. 
Task-number: QTCREATORBUG-6119

Change-Id: I894da0f77e484fe0785ece8039f46233e05c5c91
Reviewed-on: http://codereview.qt-project.org/5063
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-09-20 12:01:51 +02:00
Eike Ziller d52d4ccd93 Delete the watcher to free the qfuture and its resources. 
Change-Id: I4847c23e99aeabb99d3bb557b70a4985b3675b97
Reviewed-on: http://codereview.qt-project.org/5145
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-20 12:01:33 +02:00
Christian Kandeler 9b8b1ad3db Compile fix. 
Change-Id: I562441bee0deec56132cea2e6091e1c822442e02
Reviewed-on: http://codereview.qt-project.org/5220
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-20 11:13:32 +02:00
Thomas Hartmann d72df1c9f0 compile fix 
Change-Id: I95ed9831d016bc967e99e934a09e0cb43054fdba
Reviewed-on: http://codereview.qt-project.org/5223
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 11:00:44 +02:00
Xiao Hongying e67d0d1964 qttest: Cleanup includes and use forward declarations. 
Task-number: QTCREATORBUG-5932

Change-Id: Ia8ce39d4e5261331b929721f8875ec0e2fdfab29
Reviewed-on: http://codereview.qt-project.org/5054
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-20 10:26:33 +02:00
Kai Koehne 084f116e7c QmlJS: Remove qmlutils_p.h also from .pri file 
File got removed in 25f37732b0

Change-Id: Ia0acd2ddab76768ce960278bedf395b13f3d2512
Reviewed-on: http://codereview.qt-project.org/5207
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-20 10:03:55 +02:00
Thomas Hartmann 5adf7992e8 QmlDesigner: adding crumblePath 
Change-Id: Ic0d68b145398a161194d2a469e9a2f15fe0901d5
Reviewed-on: http://codereview.qt-project.org/4996
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:55:28 +02:00
Thomas Hartmann b14bd3a589 QmlDesigner.designModeWidget: exposing DesignModeWidget 
This allows calling cut copy and paste and component managment
from the outside.

Change-Id: Ie784b243f522409e9e778ef0700ac9c2f64e43cd
Reviewed-on: http://codereview.qt-project.org/4994
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:55:18 +02:00
Thomas Hartmann d39fb3d8ce QmlDesigner.designDocumentController: removing instance 
We use DesignModeWidget::curentDocumentController instead.

Change-Id: I9129a0611cfbc9997e5adb46597b8846463ef7ca
Reviewed-on: http://codereview.qt-project.org/4995
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:46:49 +02:00
Thomas Hartmann 5754c78b6d QmlDesigner.contextMenu: allowing layout and anchoring 
Change-Id: Ifbaff782826b413c508f96929222886da37325c5
Reviewed-on: http://codereview.qt-project.org/4986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:45:03 +02:00
Thomas Hartmann bbcaae36ad QmlDesigner.formEditor: extending toolbox with crumblePath 
Change-Id: Ifcb1b53274f05f7c935c54a2fb4975319459ba9d
Reviewed-on: http://codereview.qt-project.org/4993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:44:29 +02:00
Thomas Hartmann 8e9da5f797 QmlDesigner.instances: support for auxiliaryData @NodeInstance 
This allows overwriting values in node instances only.

Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867
Reviewed-on: http://codereview.qt-project.org/4924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:42:42 +02:00
Christian Kandeler 6268665d71 RemoteLinux: Export two more classes. 
Change-Id: I8af5fe9dce3e65f549e48cdc6485545def8b33f2
Reviewed-on: http://codereview.qt-project.org/5194
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-20 08:41:35 +02:00
Christian Kamm 9898a5e094 C++: Fix bug in findMatchingDefinition. 
In strict mode, don't give up after the first Document with candidates.

Change-Id: I62ba59708a3501b31f79d979b1a85bede875eccb
Reviewed-on: http://codereview.qt-project.org/5142
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-20 07:24:37 +02:00
Kai Koehne cccad7432d QmlProjectManager: Make sure project tree updates after in project file change 
Use FileManager instead of our own FileSystemWatcher, since this one only signals
the first file change (cause Qt Creator apparently removes the file and creates
a new one on each change).

Change-Id: Idacd545e41cd3ee29bfbc122526b9097039c65d0
Reviewed-on: http://codereview.qt-project.org/4975
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-19 17:01:53 +02:00