OSDN Git Service
Robert Loehning [Tue, 13 Sep 2011 10:40:10 +0000 (12:40 +0200)]
Removed unused function
Usage of mapDeviceToDriveLetter(QString *) was being removed in
c5a40e9e63
Change-Id: I4b0ba6f0b26df4997a9ed24cc06d9cc6da3eedc9
Reviewed-on: http://codereview.qt-project.org/4761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Thu, 22 Sep 2011 13:30:57 +0000 (15:30 +0200)]
Make MaemoInstallToSysRootStep thread safe
Change-Id: Id83e93c94af1499476868603ba654a278da6ff38
Reviewed-on: http://codereview.qt-project.org/5453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kamm [Wed, 21 Sep 2011 10:45:19 +0000 (12:45 +0200)]
QmlJS: Update Qt 5 builtin type information.
Change-Id: I5eab75a46c2c0ab167e14841992a7187eb37bdfd
Reviewed-on: http://codereview.qt-project.org/5310
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Wed, 21 Sep 2011 10:42:27 +0000 (12:42 +0200)]
QmlJS: Separate metaObjectRevision from minor version number.
They need not to be identical. Additionally:
* Rename ImportInfo::name to path, because that's what it does.
* Add ImportInfo::name, for getting the uri with the names
separated by dots.
* Allow for exportMetaObjectRevisions in qmltypes files.
* Allow for exports with an empty type name, as generated by
qmlRegisterRevision. They are used for associating meta object
revisions with non-exported types.
* Rewrite the Qt 4.7 import to QtQuick 1.0 at an early stage. In
preparation for the Qt 5 type information update, where Qt 4.7
is gone.
Change-Id: Ia287193623d9530a56b9eb8d2481d50aabd94c3e
Reviewed-on: http://codereview.qt-project.org/5309
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kandeler [Mon, 26 Sep 2011 09:16:03 +0000 (11:16 +0200)]
RemoteLinux: Make GenericDirectUploadService extensible.
Change-Id: I461358e87a5d895e904d01c837f27befca85560c
Reviewed-on: http://codereview.qt-project.org/5530
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Nicolas Arnaud-Cormos [Mon, 26 Sep 2011 08:51:13 +0000 (10:51 +0200)]
Create definition is available on the whole declaration line.
Merge-request: 390
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Change-Id: I046b3046d3d0148b0fad694181f17737e12a85b6
Reviewed-on: http://codereview.qt-project.org/5529
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kandeler [Fri, 23 Sep 2011 15:39:33 +0000 (17:39 +0200)]
RemoteLinux: Add "custom command" deployment step.
It might be useful for developers to run a command before or after
uploading or even have a remote command *be* the "deployment" step.
Also: Stop trying to display the "deployment possible" state in the
widget. It's generally hard to do that correctly and it also interferes
with thread safety.
Change-Id: I28aaf368a645ee14156a165c606dbc17c3063e82
Reviewed-on: http://codereview.qt-project.org/5469
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Kai Koehne [Fri, 23 Sep 2011 15:04:51 +0000 (17:04 +0200)]
Analyzer: Make sure right tool is shown when triggered via menu
Selecting a tool via menu while the Analyze mode is active resulted
in the wrong 'default' tool being selected when the tool finally
forces a switch to Analyze mode. This fixes it by switching to
Analyze mode first -> default tool is shown -> selected tool is shown.
Change-Id: I36e770c932b9c13552dc3604db58837a89d637b6
Reviewed-on: http://codereview.qt-project.org/5466
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 22 Sep 2011 14:04:07 +0000 (16:04 +0200)]
debugger: more robust port number parsing
Change-Id: I78edf9faa977af8a52e3e712b06ab14785af838a
Reviewed-on: http://codereview.qt-project.org/5465
Reviewed-by: hjk <qthjk@ovi.com>
con [Fri, 23 Sep 2011 12:37:55 +0000 (14:37 +0200)]
Fix extensionsystem auto test on windows.
Task-number: QTCREATORBUG-6006
Change-Id: I9e7caa83feba56561760b627b44de880bad6cab1
Reviewed-on: http://codereview.qt-project.org/5459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Tobias Hunger [Thu, 15 Sep 2011 11:30:54 +0000 (13:30 +0200)]
Toolchain: Allow all tool chains
Allow all tool chains if either the Qt version is invalid or
no Qt modules are not selected.
Change-Id: I9842c30aca0a8752915548dc258f257c3fd39e4d
Reviewed-on: http://codereview.qt-project.org/4990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Tobias Hunger [Fri, 23 Sep 2011 11:57:11 +0000 (11:57 +0000)]
Fix typo
Change-Id: I96e403cde9c8d3a59e6a5008550df2d9fe697b5d
Reviewed-on: http://codereview.qt-project.org/5457
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Daniel Teske [Thu, 22 Sep 2011 11:36:46 +0000 (13:36 +0200)]
Make Qt4ProjectManager::QMakeStep mulithreading safe
Change-Id: I41abb5e7138351e61c6c9dfc87121837edb21fbe
Reviewed-on: http://codereview.qt-project.org/5452
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Daniel Teske [Thu, 22 Sep 2011 10:59:31 +0000 (12:59 +0200)]
Make Qt4ProejctManager::MakeStep::run multithreading safe
Change-Id: I416360d35681d2721878cb9fefd861d6e1f209b4
Reviewed-on: http://codereview.qt-project.org/5451
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Daniel Teske [Thu, 22 Sep 2011 10:51:10 +0000 (12:51 +0200)]
Remove unused member
Change-Id: Icb404090885619f76a0a34861da8474c0f16571d
Reviewed-on: http://codereview.qt-project.org/5450
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Daniel Teske [Thu, 22 Sep 2011 10:50:42 +0000 (12:50 +0200)]
Remove unused member
Change-Id: I0e937203eaf95db76fb1f432b7706c7bb560a789
Reviewed-on: http://codereview.qt-project.org/5449
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Jarek Kobus [Tue, 16 Aug 2011 08:45:23 +0000 (10:45 +0200)]
Implement Code Style schemes
Task-number: QTCREATORBUG-5092
Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Eike Ziller [Thu, 22 Sep 2011 16:02:43 +0000 (18:02 +0200)]
Move wizards' cancel button to the left on Mac.
It is too far to the left now, but that can't be helped
(it's a Qt limitation).
Task-number: QTCREATORBUG-6156
Change-Id: I0201356234abb618dc3b573673d512c0a97c4839
Reviewed-on: http://codereview.qt-project.org/5406
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Eike Ziller [Wed, 21 Sep 2011 13:17:24 +0000 (15:17 +0200)]
Reduce vertical minimum size of Qt versions settings.
The main point of the change is to hide the version info while the
details for the helpers are shown.
Change-Id: I02166674d2339a585fda0eebe643289471ca139c
Reviewed-on: http://codereview.qt-project.org/5325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Thu, 22 Sep 2011 15:37:05 +0000 (17:37 +0200)]
RemoteLinux: Deployment improvements.
- Don't depend on the order of signal connections when updating the
deploy step label.
- Give a meaningful error message when the init() function fails.
- Don't try to upload files that don't have a target path set.
Change-Id: If302cf8407b69faf8507579267afde7428edf704
Reviewed-on: http://codereview.qt-project.org/5404
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Stenger [Wed, 21 Sep 2011 15:29:18 +0000 (17:29 +0200)]
Added new qml test and continue refactoring
Refactoring of all helper functions to make it easier to
recognize them as such. All helper functions in global
shared scripts now follow the scheme __NAME__
Helper functions normally should not get called from outside.
Change-Id: I0d02028d3f9de1ad251af9226c0460655bd9c9bd
Reviewed-on: http://codereview.qt-project.org/5331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Tobias Hunger [Thu, 22 Sep 2011 14:26:10 +0000 (14:26 +0000)]
ABI: Add sh architecture
* incl. unit test
Change-Id: Id56f713104cf05cb25fc788fa8b06a9df90b417b
Reviewed-on: http://codereview.qt-project.org/5398
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Kandeler [Thu, 22 Sep 2011 14:16:10 +0000 (16:16 +0200)]
RemoteLinux: Fix remote processes listing.
There were nul character conversion problems, resulting in display
artifacts.
Change-Id: Ia012d18c942e6b31029054a1574c04e0c3d182b7
Reviewed-on: http://codereview.qt-project.org/5397
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Thu, 22 Sep 2011 12:19:08 +0000 (14:19 +0200)]
Madde: Remove unneeded image.
Change-Id: Id0273bd7d8458292f0e8df6a9a65325b1350bdda
Reviewed-on: http://codereview.qt-project.org/5396
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Leandro Melo [Thu, 22 Sep 2011 13:17:08 +0000 (15:17 +0200)]
Editor: Unindent backpace mode should not apply for parag. separators
QChar:isSpace also includes paragraph separator, for which the backspace
behavior should be the normal one.
Change-Id: I80c362a4e11b436259f85fea4c73de874fc64249
Reviewed-on: http://codereview.qt-project.org/5389
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 22 Sep 2011 13:42:02 +0000 (15:42 +0200)]
remotelinux: compile fix
Qt 4.7's uic does not seem to understand everything that 4.8's uic accepts.
Change-Id: I550d63655584f974000bdab7dc34bec42792366c
Reviewed-on: http://codereview.qt-project.org/5391
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
hjk [Thu, 22 Sep 2011 09:18:14 +0000 (11:18 +0200)]
debugger/remote linux: add dialog to start gdbserver on the device
Change-Id: I57ddfa17a7c51a9347b0d81205c1679c6398d126
Reviewed-on: http://codereview.qt-project.org/5383
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kandeler [Wed, 21 Sep 2011 12:46:10 +0000 (14:46 +0200)]
RemoteLinux: Fix plugin deployment.
No symbolic links are being created for those.
Change-Id: Icecd7441626cc3862bad6c2d4ab000c2f060ec52
Reviewed-on: http://codereview.qt-project.org/5320
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Christian Kandeler [Tue, 20 Sep 2011 10:16:36 +0000 (12:16 +0200)]
Introduce new "Madde" plugin.
The new plugin contains everything specific to Maemo and MeeGo
as supported by the MADDE framework.
This leaves the RemoteLinux plugin with abstract base classes and
generic implementations.
Change-Id: I6068caa758214cf26a27fe9893e0817b7834b580
Reviewed-on: http://codereview.qt-project.org/5230
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Aurindam Jana [Wed, 21 Sep 2011 14:39:45 +0000 (16:39 +0200)]
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>
Daniel Teske [Tue, 20 Sep 2011 14:49:02 +0000 (16:49 +0200)]
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>
hjk [Thu, 22 Sep 2011 07:30:50 +0000 (09:30 +0200)]
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>
Christian Kamm [Wed, 21 Sep 2011 13:54:07 +0000 (15:54 +0200)]
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>
Bill King [Wed, 21 Sep 2011 09:32:33 +0000 (11:32 +0200)]
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>
Eike Ziller [Tue, 20 Sep 2011 15:23:05 +0000 (17:23 +0200)]
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>
Bill King [Wed, 21 Sep 2011 11:55:23 +0000 (13:55 +0200)]
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>
Bill King [Wed, 21 Sep 2011 09:30:22 +0000 (11:30 +0200)]
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>
Bill King [Wed, 21 Sep 2011 09:29:21 +0000 (11:29 +0200)]
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>
Christian Kamm [Wed, 21 Sep 2011 11:39:48 +0000 (13:39 +0200)]
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>
hjk [Wed, 21 Sep 2011 11:05:15 +0000 (13:05 +0200)]
s/error_message/errorMessage/g
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 21 Sep 2011 10:02:56 +0000 (12:02 +0200)]
replace 'QMake Console' with 'Plain C++'
Change-Id: I26b29ce0e62e6470629117ff21412a4cfbe74488
Reviewed-on: http://codereview.qt-project.org/5306
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 21 Sep 2011 09:55:59 +0000 (11:55 +0200)]
fix string in 'qmake console' wizard
Change-Id: I0cf1b405b9df2af681c87f1636d3457afba0d86e
Reviewed-on: http://codereview.qt-project.org/5305
Reviewed-by: hjk <qthjk@ovi.com>
Yuchen Deng [Wed, 21 Sep 2011 09:48:20 +0000 (11:48 +0200)]
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>
cerf [Wed, 21 Sep 2011 09:43:58 +0000 (11:43 +0200)]
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>
hjk [Wed, 21 Sep 2011 09:41:20 +0000 (11:41 +0200)]
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>
Christian Kamm [Wed, 21 Sep 2011 08:29:21 +0000 (10:29 +0200)]
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>
Eike Ziller [Tue, 20 Sep 2011 10:44:11 +0000 (12:44 +0200)]
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>
Alessandro Portale [Tue, 13 Sep 2011 17:21:52 +0000 (19:21 +0200)]
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>
Joerg Bornemann [Fri, 8 Jul 2011 06:12:39 +0000 (08:12 +0200)]
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>
hjk [Tue, 20 Sep 2011 15:50:45 +0000 (17:50 +0200)]
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>
Eike Ziller [Tue, 20 Sep 2011 14:06:03 +0000 (16:06 +0200)]
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>
Marco Bubke [Tue, 20 Sep 2011 13:24:58 +0000 (15:24 +0200)]
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>
Kai Koehne [Tue, 20 Sep 2011 10:29:03 +0000 (12:29 +0200)]
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>
Kai Koehne [Tue, 20 Sep 2011 10:05:43 +0000 (12:05 +0200)]
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>
Kai Koehne [Wed, 14 Sep 2011 11:26:19 +0000 (13:26 +0200)]
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>
Thomas Hartmann [Tue, 20 Sep 2011 09:46:37 +0000 (11:46 +0200)]
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>
Thomas Hartmann [Tue, 20 Sep 2011 11:29:43 +0000 (13:29 +0200)]
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>
hjk [Tue, 20 Sep 2011 11:54:07 +0000 (13:54 +0200)]
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>
hjk [Tue, 20 Sep 2011 08:39:05 +0000 (10:39 +0200)]
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>
Eike Ziller [Tue, 20 Sep 2011 10:18:55 +0000 (12:18 +0200)]
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>
Marco Bubke [Tue, 20 Sep 2011 10:54:18 +0000 (12:54 +0200)]
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>
Christian Kamm [Tue, 20 Sep 2011 11:10:17 +0000 (13:10 +0200)]
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>
Eike Ziller [Tue, 20 Sep 2011 10:44:11 +0000 (12:44 +0200)]
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>
Christian Kamm [Mon, 19 Sep 2011 13:28:05 +0000 (15:28 +0200)]
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>
Eike Ziller [Fri, 16 Sep 2011 07:28:20 +0000 (09:28 +0200)]
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>
Eike Ziller [Mon, 19 Sep 2011 08:29:54 +0000 (10:29 +0200)]
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>
Christian Kandeler [Tue, 20 Sep 2011 08:45:40 +0000 (10:45 +0200)]
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>
Thomas Hartmann [Tue, 20 Sep 2011 08:57:04 +0000 (10:57 +0200)]
compile fix
Change-Id: I95ed9831d016bc967e99e934a09e0cb43054fdba
Reviewed-on: http://codereview.qt-project.org/5223
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Xiao Hongying [Fri, 2 Sep 2011 11:10:41 +0000 (19:10 +0800)]
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>
Kai Koehne [Tue, 20 Sep 2011 07:53:49 +0000 (09:53 +0200)]
QmlJS: Remove qmlutils_p.h also from .pri file
File got removed in
25f37732b01e
Change-Id: Ia0acd2ddab76768ce960278bedf395b13f3d2512
Reviewed-on: http://codereview.qt-project.org/5207
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Thomas Hartmann [Thu, 15 Sep 2011 12:31:30 +0000 (14:31 +0200)]
QmlDesigner: adding crumblePath
Change-Id: Ic0d68b145398a161194d2a469e9a2f15fe0901d5
Reviewed-on: http://codereview.qt-project.org/4996
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Mon, 19 Sep 2011 15:57:37 +0000 (17:57 +0200)]
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>
Thomas Hartmann [Thu, 15 Sep 2011 12:16:18 +0000 (14:16 +0200)]
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>
Thomas Hartmann [Thu, 15 Sep 2011 11:33:47 +0000 (13:33 +0200)]
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>
Thomas Hartmann [Thu, 15 Sep 2011 12:11:30 +0000 (14:11 +0200)]
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>
Thomas Hartmann [Mon, 19 Sep 2011 15:13:59 +0000 (17:13 +0200)]
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>
Christian Kandeler [Tue, 20 Sep 2011 06:40:28 +0000 (08:40 +0200)]
RemoteLinux: Export two more classes.
Change-Id: I8af5fe9dce3e65f549e48cdc6485545def8b33f2
Reviewed-on: http://codereview.qt-project.org/5194
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kamm [Mon, 19 Sep 2011 11:48:28 +0000 (13:48 +0200)]
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>
Kai Koehne [Thu, 15 Sep 2011 11:05:36 +0000 (13:05 +0200)]
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>
Thomas Hartmann [Mon, 19 Sep 2011 10:17:02 +0000 (12:17 +0200)]
QmlDesigner: remove dead code
Change-Id: I2f88af9ef449ee21e646dab7ca23b97836249764
Reviewed-on: http://codereview.qt-project.org/5128
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Thomas Hartmann [Thu, 15 Sep 2011 11:30:56 +0000 (13:30 +0200)]
QmlDesigner.formEditor: usablity fix
Displaying the bounding Rectangle makes no sense for small/thin items.
Change-Id: Ia30692e0cfa2641cfe3b4962a2f54f9eafe50201
Reviewed-on: http://codereview.qt-project.org/4984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Thomas Hartmann [Thu, 15 Sep 2011 11:28:55 +0000 (13:28 +0200)]
QmlDesigner.model: bugfix for Qt Quick 2.0
The item itself can have any version. we have to check for the version
of QtQuick.Item.
Change-Id: I57a992dd09491b7990318e208d98a9c4e0011e56
Reviewed-on: http://codereview.qt-project.org/4983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Orgad Shaneh [Mon, 19 Sep 2011 14:13:37 +0000 (16:13 +0200)]
Git: Added decoration to log and show
Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Mon, 19 Sep 2011 14:03:35 +0000 (16:03 +0200)]
Git: Fix diff/show/blame editors coming to the foreground
Make sure all the proper arguments are applied when bringing a git
diff/show/blame editor to the foreground.
Task-number: QTCREATORBUG-5176
Change-Id: I4ca603311335ac4e591ba38a690f1f3a27725e8f
Reviewed-on: http://codereview.qt-project.org/5157
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Leandro Melo [Mon, 19 Sep 2011 12:39:30 +0000 (14:39 +0200)]
Find: Change a few accelerators
Since the find widget is no longer a dialog, a few accelerators
"conflict" with others from the main menu and global Creator's.
This doesn't really stop them from working, but it would be better
to have different ones. The new values are not the most obvious
ones, but there's not too many options.
Task-number: QTCREATORBUG-6114
Change-Id: Idbc885abad9b78dad7685568a9524066dc075694
Reviewed-on: http://codereview.qt-project.org/5147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Mon, 19 Sep 2011 12:19:23 +0000 (14:19 +0200)]
Merge remote-tracking branch 'origin/2.3'
Christian Kamm [Mon, 19 Sep 2011 12:16:25 +0000 (14:16 +0200)]
QmlJS: Use new Lexer::scanDirectives.
Change-Id: Id9f4cd6a53dc0d3f4cf0a0b3c846eca0e48372fc
Reviewed-on: http://codereview.qt-project.org/5144
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Mon, 19 Sep 2011 12:09:26 +0000 (14:09 +0200)]
QmlJS: Update parser from Qt5.
Change-Id: I26a5fb6a1eb99a777e4f1e01fb7b19e559c9bce7
Reviewed-on: http://codereview.qt-project.org/5143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aurindam Jana [Wed, 14 Sep 2011 14:58:10 +0000 (16:58 +0200)]
QmlDebugger: Attach to QML Port: Fix errors
Connect to user defined host and port. Increased maximum connection tries.
Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kamm [Mon, 19 Sep 2011 11:16:05 +0000 (13:16 +0200)]
QmlJS: Fix highlighting of property types.
Task-number: QTCREATORBUG-6127
Change-Id: Iae5cd6256b2f1e792c3c91eb5915e3f082753e6e
Reviewed-on: http://codereview.qt-project.org/5136
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Mon, 19 Sep 2011 11:04:59 +0000 (13:04 +0200)]
QmlJS: Fix enum completion with 'as' imports.
Change-Id: Ifc229c23c14a6395c9d3e5f7ec76b9b04678787d
Reviewed-on: http://codereview.qt-project.org/5134
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Mon, 19 Sep 2011 10:08:15 +0000 (12:08 +0200)]
QmlDesigner: Add null checks.
Change-Id: I8f12a5391ec20829422d8c6eab3d4d191527e70e
Reviewed-on: http://codereview.qt-project.org/5130
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Fri, 16 Sep 2011 11:55:10 +0000 (13:55 +0200)]
QmlJS: Rework exported C++ type registry.
The problem was that if you exported
A 1.0, A 1.1 and B 1.0 where A is the prototype of B
the code model had not enough information to know that, depending
on the import, B 1.0's prototype should be A 1.1 or A 1.0.
To solve this problem QmlObjectValues now store the import's version
as well as the local component version. In the example above B 1.0
would have import version 1.1 if the 1.1 module was imported and thus
be able to choose the right prototype.
Change-Id: I7ef33f12ca5a528c62b2a8240f4b5720b0ebd4c3
Reviewed-on: http://codereview.qt-project.org/5129
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Molkentin [Thu, 8 Sep 2011 14:04:27 +0000 (16:04 +0200)]
Make Qt Installer Framework Update Notifier part of QtCreator.
Always compile but never run it unless UPDATEINFO_DISABLE
is being set to 'false' via qmake or environment.
Change-Id: Ie53fb2ea99bfebac1b6f416939554f25a5e481a7
Reviewed-on: http://codereview.qt-project.org/4483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Christian Kandeler [Mon, 19 Sep 2011 10:40:27 +0000 (12:40 +0200)]
RemoteLinux: Take adavantage of new proParsingDone() signal.
Change-Id: I81aada97401a1f100f5e6c8376c297c8f2f86688
Reviewed-on: http://codereview.qt-project.org/5141
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Daniel Teske [Mon, 12 Sep 2011 11:25:12 +0000 (13:25 +0200)]
Add Qt4Project::proParsingDone(), which is emitted after parsing
Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9
Task-Nr: QTCREATORBUG-6056
Reviewed-on: http://codereview.qt-project.org/4665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
hjk [Mon, 19 Sep 2011 09:38:19 +0000 (11:38 +0200)]
debugger: fix a wrong sanity check in the dumpers
Change-Id: Ie2dce425cf1204f22bb752bd400bc98211b45a63
Reviewed-on: http://codereview.qt-project.org/5126
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Mon, 19 Sep 2011 09:21:22 +0000 (11:21 +0200)]
debugger: show at least "elide" markers for thread ids
Task-number: QTCREATORBUG-6110
Change-Id: I439fc6463c42fce134646c620ac19a5c533217fe
Reviewed-on: http://codereview.qt-project.org/5123
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Mon, 19 Sep 2011 08:02:45 +0000 (10:02 +0200)]
minor style
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Mon, 19 Sep 2011 07:15:52 +0000 (09:15 +0200)]
qt4project: disable debug output
Change-Id: I33ae40566677d9b80b27facddab25c1ee7905761
Reviewed-on: http://codereview.qt-project.org/5118
Reviewed-by: hjk <qthjk@ovi.com>