Commit Graph

21107 Commits

Author SHA1 Message Date
Christian Kamm
9cc4751857 C++ function signature: Abort on unexpected function name.
Change-Id: Iaaa3907f709ea9ed567f59725399efd9024f3bc0
Reviewed-on: http://codereview.qt-project.org/5319
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-09-26 12:45:47 +02:00
hjk
95590db0b8 baseqtversion: less inverted logic
Change-Id: I3a11dbe604a5624a29164308fd69bf00b223995d
Reviewed-on: http://codereview.qt-project.org/5471
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-26 12:28:04 +02:00
Robert Loehning
08dfd0d08a Squish: Improved path constants
Renamed the old constant SDKPath to srcPath because this is where sources are.
Added new constant sdkPath for the root directory of the Qt SDK installation.

Change-Id: I1b1f346554f58629a9d1882f90250f21708e4d22
Reviewed-on: http://codereview.qt-project.org/5474
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-26 12:22:07 +02:00
Robert Loehning
3281716d5e 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>
2011-09-26 12:16:42 +02:00
Daniel Teske
597c40b49e 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>
2011-09-26 12:09:05 +02:00
Christian Kamm
2b205f6907 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>
2011-09-26 12:04:25 +02:00
Christian Kamm
fdd0a15ef4 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>
2011-09-26 12:04:16 +02:00
Christian Kandeler
22e2c0ad2c 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>
2011-09-26 11:20:12 +02:00
Nicolas Arnaud-Cormos
9ceabbacfb 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>
2011-09-26 11:10:20 +02:00
Christian Kandeler
9357b054ae 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>
2011-09-23 17:49:11 +02:00
Kai Koehne
ad9dd78aaa 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>
2011-09-23 17:10:48 +02:00
hjk
1da7d0476e debugger: more robust port number parsing
Change-Id: I78edf9faa977af8a52e3e712b06ab14785af838a
Reviewed-on: http://codereview.qt-project.org/5465
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-23 16:52:08 +02:00
con
9d8eb1f972 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>
2011-09-23 16:27:25 +02:00
Tobias Hunger
ffa88df344 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>
2011-09-23 14:02:59 +02:00
Tobias Hunger
971512b39c Fix typo
Change-Id: I96e403cde9c8d3a59e6a5008550df2d9fe697b5d
Reviewed-on: http://codereview.qt-project.org/5457
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-09-23 14:02:41 +02:00
Daniel Teske
3a449bdab6 Make Qt4ProjectManager::QMakeStep mulithreading safe
Change-Id: I41abb5e7138351e61c6c9dfc87121837edb21fbe
Reviewed-on: http://codereview.qt-project.org/5452
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-23 12:36:06 +02:00
Daniel Teske
b96d7b9bd8 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>
2011-09-23 12:30:34 +02:00
Daniel Teske
e1b275c079 Remove unused member
Change-Id: Icb404090885619f76a0a34861da8474c0f16571d
Reviewed-on: http://codereview.qt-project.org/5450
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-23 12:29:48 +02:00
Daniel Teske
ffecbf55b7 Remove unused member
Change-Id: I0e937203eaf95db76fb1f432b7706c7bb560a789
Reviewed-on: http://codereview.qt-project.org/5449
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-23 12:29:33 +02:00
Jarek Kobus
2244911826 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>
2011-09-23 10:23:15 +02:00
Eike Ziller
3955df7855 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>
2011-09-22 19:01:21 +02:00
Eike Ziller
57c3ab2249 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>
2011-09-22 18:04:12 +02:00
Christian Kandeler
76176a8336 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>
2011-09-22 17:39:06 +02:00
Christian Stenger
11f7dbda77 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>
2011-09-22 16:31:34 +02:00
Tobias Hunger
ddacec3eb5 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>
2011-09-22 16:27:47 +02:00
Christian Kandeler
12fda1a098 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>
2011-09-22 16:17:39 +02:00
Christian Kandeler
e97c828eb2 Madde: Remove unneeded image.
Change-Id: Id0273bd7d8458292f0e8df6a9a65325b1350bdda
Reviewed-on: http://codereview.qt-project.org/5396
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-22 16:16:47 +02:00
Leandro Melo
a298a0c306 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>
2011-09-22 15:57:23 +02:00
hjk
b724ec84d1 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>
2011-09-22 15:49:46 +02:00
hjk
ee24278121 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>
2011-09-22 14:22:11 +02:00
Christian Kandeler
92c23296e8 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>
2011-09-22 14:11:22 +02:00
Christian Kandeler
4e7d0d9c9a 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>
2011-09-22 14:11:06 +02:00
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