summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doc: add Nokia N9 and update Harmattan info2.2Leena Miettinen2011-06-232-28/+33
| | | | | | | Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea Reviewed-by: Christian Kandeler Reviewed-on: http://codereview.qt.nokia.com/641 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Doc: add version numbers to the doc titlesLeena Miettinen2011-06-232-2/+2
| | | | | | | Change-Id: I2b71cba2ab19a15a834976e3ce953e992ca4b124 Reviewed-by: David Boddie Reviewed-on: http://codereview.qt.nokia.com/640 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Doc: Harmattan targetv2.2.1Leena Miettinen2011-06-226-130/+254
| | | | | | | | | Reviewed-by: Christian Kandeler Change-Id: Ica62fc3f04bbc4b0fea84ff44399ac12ea44c0da Reviewed-on: http://codereview.qt.nokia.com/587 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Update QtMobility QML type descriptions to 1.2.0.Christian Kamm2011-06-159-210/+1793
| | | | | | Change-Id: I31b0f9cc55763d22dbf6ff75252c6e10e5a1b0f2 Reviewed-on: http://codereview.qt.nokia.com/481 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Updated Russian translationSergey Belyashov2011-06-141-0/+4
| | | | | | | Merge-request: 346 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Ied278c283575809b54f4bfb4e8fcda9fe38eb56b
* QmlDesigner.nodeInstances: fix for incompatible Qt VersionThomas Hartmann2011-06-141-1/+23
| | | | | | | | | | | | If the Qt Version is incomaptible (e. g. mingw) we have to use the qml file for a component shipped with Creator. Otherwise a import "." statement will break the component. Change-Id: I7e354a15205567407533579f92e65f2be73a614ex Reviewed-on: http://codereview.qt.nokia.com/474 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* version bump to 2.2.1hjk2011-06-141-1/+1
| | | | | | | Change-Id: Ie9db48ce3524491d4dd8b17fb79e26a1ecd8bd77 Reviewed-on: http://codereview.qt.nokia.com/471 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* rename ChoiceList into SelectionListItemhjk2011-06-141-6/+6
| | | | | | | | Reviewed-by: Thomas Hartmann Change-Id: I4116e63da6633bebb21ba08084e2d8edde4aaaaax Reviewed-on: http://codereview.qt.nokia.com/468 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlDesigner.itemLibrary: adding plugin for extra componentsThomas Hartmann2011-06-1434-1/+232
| | | | | | | | | | A new extra component plugin. (cherry picked from commit fbcbac5a65b26da281404f63885dff884afaba78) (cherry picked from commit 0e3f13e921f3812f8944a22375131b4e2fd87f87) Change-Id: Ifbcbac5a65b26da281404f63885dff884afaba78q Reviewed-on: http://codereview.qt.nokia.com/467 Reviewed-by: hjk <qthjk@ovi.com>
* Updated Russian translationSergey Belyashov2011-06-091-28/+12
| | | | | | | Merge-request: 343 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Ie49d1abad19c69278767bf32f2a7fa908234293d
* BuildstepConfigWidgets can be set expanded by defaultTommi Asp2011-06-082-0/+3
| | | | | | | | | (cherry picked from commit 517aef8b8bc705b055b10ef0b7b0b234fd80b920) Change-Id: I517aef8b8bc705b055b10ef0b7b0b234fd80b920x Merge-request: 2193 Reviewed-on: http://codereview.qt.nokia.com/398 Reviewed-by: hjk <qthjk@ovi.com>
* Qt4ProjectManager exports for RemoteCompilerTommi Asp2011-06-083-4/+6
| | | | | | | | | | (cherry picked from commit 3112c23c702ee36ba1c25ccb526240ab7dda5b2e) Change-Id: I3112c23c702ee36ba1c25ccb526240ab7dda5b2ex Merge-request: 2193 Reviewed-on: http://codereview.qt.nokia.com/397 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* Custom targets can set QtVersion to support id and set abisTommi Asp2011-06-082-0/+23
| | | | | | | | | | | | QtVersion targetIds and abis set are forced updateAbiAndMkspec() wont reset them (cherry picked from commit 1c86ab05a73838e8127984f1cc0220d4de90eea5) Change-Id: I1c86ab05a73838e8127984f1cc0220d4de90eea5x Merge-request: 2193 Reviewed-on: http://codereview.qt.nokia.com/396 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* AbstractMobileAppWizard: Allow subclasses to control the flow of pagesKai Koehne2011-06-081-2/+1
| | | | | | | | | | The Symbian components wizard would like to hide e.g. the Orientation page. Re-implementing nextId() will allow to do so. Change-Id: Id748d88bbc28b93aba4ffe8fccebf540d0946686x Reviewed-on: http://codereview.qt.nokia.com/395 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* Add TARGET.EPOCALLOWDLLDATA=1 to Qml Plugin WizardKai Koehne2011-06-081-1/+1
| | | | | | | | | | | | Needed for Symbian. Task-number: QTCREATORBUG-3507 Reviewed-by: Tim Jenssen Reviewed-by: Alessandro Portale Change-Id: I35799cd388e44353d6890fe79a411fbed2fb2ef3x Reviewed-on: http://codereview.qt.nokia.com/394 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* Editors: Change Link color from inkpot schemeLeandro Melo2011-06-081-1/+1
| | | | | | | | | | | | | | | In addition for the report below, the cmake highlighter now uses the keyword color for functions. This was done in the previous commit: 5ecd885af3d25acfd8f688428268da2d9198a1bd Task-number: QTCREATORBUG-5037 Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2x Reviewed-on: http://codereview.qt.nokia.com/274 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> (cherry picked from commit c09c870248e9df5aadf40ae88f6cbd240e57473f) Reviewed-on: http://codereview.qt.nokia.com/393 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* CMake editor: Use keywords scheme for functionsLeandro Melo2011-06-081-1/+1
| | | | | | | | | | | | | | The Link color from inkpot still needs to be changed. This will be done in a following commit. Task-number: QTCREATORBUG-5037 Change-Id: Ia8a5203067761ff6622258fd16f2027667637583x Reviewed-on: http://codereview.qt.nokia.com/273 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> (cherry picked from commit a3daedc7b70a9e4f4db1db38add119741179dbed) Reviewed-on: http://codereview.qt.nokia.com/392 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* cppeditor: fix crash on uninitialized pointerhjk2011-06-081-1/+1
| | | | | | | | | Reviewed-by: Erik Verbruggen (cherry picked from commit 769b21b49d4072e426ac82271ba7797461ef86d3) Change-Id: I769b21b49d4072e426ac82271ba7797461ef86d3x Reviewed-on: http://codereview.qt.nokia.com/391 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* add some mimetype for geometry shadershjk2011-06-081-0/+6
| | | | | | | | | | This gives at least some syntax highlighting. (cherry picked from commit 04c5425de2292c9da66c7c1dd2ae0c646528ca07) Change-Id: I04c5425de2292c9da66c7c1dd2ae0c646528ca07x Reviewed-on: http://codereview.qt.nokia.com/390 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* debugger: show something when editinghjk2011-06-081-1/+1
| | | | | | | | (cherry picked from commit 752066d0431566447220958945bebd9ba81bed66) Change-Id: If24dfee05b8039b1f091e8f88e8d59155f2bd7dx Reviewed-on: http://codereview.qt.nokia.com/389 Reviewed-by: hjk <qthjk@ovi.com>
* debugger: allow "Attach to Core" on Windowshjk2011-06-081-4/+0
| | | | | | | | | | Patch by Orgad Shaneh Task-number: QTCREATORBUG-3813 Change-Id: I7ff88946981ef210bb53e20d7e462055199a30e2x Reviewed-on: http://codereview.qt.nokia.com/388 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlJS: Fix missing rehighlight if other file changes.Christian Kamm2011-06-081-1/+4
| | | | | | | | | | | | | | | When QML modules with many source files were loaded, the rehighlight from the found library was done before the files contained in the library were done parsing. This way any updated document will eventually lead to the current editor rehighlighting. Reviewed-by: Erik Verbruggen Change-Id: I0f4d18390d3e0ee17cd255c68496f61479f82f05x Reviewed-on: http://codereview.qt.nokia.com/382 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlJS: Fix library-by-path imports.Christian Kamm2011-06-084-39/+87
| | | | | | | | | | | | Fixes the problem 5426c3ac2cdf898ca1190a7746ba506ff24abc50 and 7b25f438c67c7cf395ccd2cd846e5d413f6d9222 worked around. Reviewed-by: Erik Verbruggen (cherry picked from commit e21311132ba3fa8cf0d8ade81117f988da8363e9) Change-Id: I5426c3ac2cdf898ca1190a7746ba506ff24abc50xx Reviewed-on: http://codereview.qt.nokia.com/381 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlJS: Allow for QML modules with version subdirectories.Christian Kamm2011-06-086-34/+105
| | | | | | | | | | | | | | | | | | That means import Foo 2.1 can resolve to /path/Foo.2.1 or /path/Foo.2 or /path/Foo Task-number: QTCREATORBUG-4607 Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1ax Reviewed-on: http://codereview.qt.nokia.com/194 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> (cherry picked from commit 8742026380faeb39c7084872d5c146f301253a78) Reviewed-on: http://codereview.qt.nokia.com/380 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* fix read beyond eol on missing expansion terminatorOswald Buddenhagen2011-05-301-4/+3
| | | | | | | | | | | now we uniformly increment the read pointer only if we encountered a terminator (which also implies that we were not at non-eol yet). Task-number: QTCREATORBUG-5022 Change-Id: If4a4e7aec7423684297393fa10e50a69773b2048 Reviewed-on: http://codereview.qt.nokia.com/222 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: selecting Qt version when building apps for Symbian for the Ovi StoreLeena Miettinen2011-05-261-0/+69
| | | | | | Change-Id: I54aadfbafd18601a3b0d6420b8ebb00cb082d803s Reviewed-on: http://codereview.qt.nokia.com/150 Reviewed-by: hjk <qthjk@ovi.com>
* Fix context help for examplesDaniel Molkentin2011-05-262-3/+7
| | | | | | | | | | | | | - createRightPaneContextViewer() needs to be called up-front. In the old order, it would fail the first time. - Queue opening of help, because we need the editor window to be drawn before it can be assessed wether to show the help in split mode Change-Id: Ib2054285efb07ccbfaf3faf089085c16ba432be8z (cherry picked from commit c86e81c362411d1f766d36f0f0946a5039fb65fd) Reviewed-on: http://codereview.qt.nokia.com/149 Reviewed-by: hjk <qthjk@ovi.com>
* Don't open files and help if someone chooses to cancel loading an example.Daniel Molkentin2011-05-261-4/+6
| | | | | | | | Task-Number: QTCREATORBUG-4414 Change-Id: I0272091d185fe6a9ac23022eb4efb723eb541494x (cherry picked from commit 15ac4f0e21c63826a70650e68c433898306307d1) Reviewed-on: http://codereview.qt.nokia.com/148 Reviewed-by: hjk <qthjk@ovi.com>
* Fixed invalid parsing of boolean expression "x < y && z > this".Erik Verbruggen2011-05-171-0/+1
| | | | | | Task-number: QTCREATORBUG-4362 Reviewed-by: Roberto Raggi (cherry picked from commit b83932708cb4d5e0f54cd01ecf9a5c50c7ecb2b0)
* Debugger[CDB]: Output std::[w]string correctly.Friedemann Kleint2011-05-161-11/+19
| | | | | | _Ptr is used for large values instead of _Buf. Reviewed-by: hjk
* Debugger[CDB]: Fix console on Windows XP.Friedemann Kleint2011-05-161-4/+5
| | | | | | | | Attach to suspended application and doing resume manually does not work. Use special options for console. Reviewed-by: hjk Tested-by: Alessandro Portale <alessandro.portale@nokia.com>
* Debugger: Move corrected breakpoints back after termination.Friedemann Kleint2011-05-161-3/+0
|
* french translation fixesThibaut Cuvelier2011-05-131-12/+12
| | | | | Merge-request: 2197 Reviewed-by: ossi
* Update french translation for 2.2Oswald Buddenhagen2011-05-102-1121/+9163
| | | | | | | | | | | | | This is a team work by: Jonathan Courtois <jonathan.courtois@gmail.com> Thibaut Cuvelier <tcuvelier@redaction-developpez.com> Verdvaine Yan <yan.verdavaine@redaction-developpez.com> Pierre Rossi <pierre.rossi@nokia.com> Merge-request: 2194 Merge-request: 2196 Merge-request: 321 Reviewed-by: ossi
* Debugger: Fix remote CDB debugging.Friedemann Kleint2011-05-101-1/+1
| | | | | | | | Determine ABI correctly. Reviewed-by: hjk Task-number: QTCREATORBUG-4832
* L10n: Fix German translation of the 'Add Library Wizard'.Friedemann Kleint2011-05-091-5/+5
| | | | (cherry picked from commit ac18e2016c2bc5ba9ee2b123a880249b7deff5e6)
* don't validate working directory of custom process stepsOswald Buddenhagen2011-05-091-0/+1
| | | | | | | amends 64cfa46 Task-number: QTCREATORBUG-4806 Reviewed-by: dt
* Fix ABI detection of static mingw libraries on windowsTobias Hunger2011-05-061-8/+8
| | | | | Task-number: QTCREATORBUG-4771 (cherry picked from commit fcf82b74b650238e4bdcda19fe45833e7a2b0e74)
* Uploading the doc is now handled differently.v2.2.0con2011-04-291-8/+8
|
* QmlDesigner.statesEditor: crash fixThomas Hartmann2011-04-291-0/+2
| | | | | | | | If the current state is deleted we have to go to the base state to stay in a valid state. Task-Nr: QTCREATORBUG-4339 Reviewed-by: Kai Koehne
* Version bump.con2011-04-291-1/+1
|
* QmlDesigner.rewriter: crash fixThomas Hartmann2011-04-283-2/+9
| | | | | | | | | | | When pasting or reading in a Component that has no object definition inside we crashed. I added an explicit check in the FirstDefinitionFinder. In the TextToModelMerger we then handle this case. Task-Nr: QTCREATORBUG-4730 Reviewed-by: Erik Verbruggen
* Fix disassembler view on Xcode4.con2011-04-281-2/+2
| | | | | | | | | The gdb shipped with Xcode4 simply never returns if the command is "disassemble /m someaddress", Xcode3 returned an error, which resulted in a call for non-mixed disassembly. So we set the disassembler agent to not try mixed in case of Mac tool chain abi. Reviewed-by: Friedemann Kleint
* QmlDump: fix path import dumps on WindowsThomas Hartmann2011-04-281-5/+7
| | | | | | | | | | Absolute file pathes containing drive identifiers do not work in qml. (C:\) workaround: use "." imports and setting the component url. Reviewed-by: Christian Kamm (cherry picked from commit 0c8b4e38fab1862e3427aac7e7db68623bc7f174)
* QmlDebug: Fix 'Interrupt' functionality for mixed debuggingKai Koehne2011-04-281-0/+1
| | | | | | | | | | Make sure that m_inferiorPid is initialized even when the CppEngine is not the main one, and therefore startDebugger() not called on it. Otherwise the engine tries to send a SIGINT signal to an arbirary process ID, resulting in the debugging being stopped. Reviewed-by: Friedemann Kleint Task-number: QTCREATORBUG-4716
* Fixed typos in German error messageRobert Loehning2011-04-271-2/+2
| | | | Reviewed-by: ossi
* Debug views menu would show after using the text marker menu.con2011-04-271-0/+1
| | | | | | | | The right-click event that is handled by the extra text area for the marker menu needs to be accepted, so it's not propagated further as a context menu event. Reviewed-by: Friedemann Kleint
* Stop QTC_ASSERT from being triggeredTobias Hunger2011-04-271-3/+3
| | | | | | Set up UI elements before they are used. No crash since the elements are guarded by QTC_ASSERTs, but annoying output. (cherry picked from commit 1df460426b2e409cccdb38254261f75fa686e924)
* QmlJS: Disable unhelpful warning.Christian Kamm2011-04-261-1/+2
| | | | (cherry picked from commit a03de5f717a033f35c5f701e865b2ac5a3c53898)
* QmlDesigner.qmlPuppet: fixes a bug when dragging in a WebView on KDEThomas Hartmann2011-04-261-2/+7
| | | | | | | | | | | | | | | | | WebView object contains a QIcon property ("reload.icon"), which fails to be streamed from the puppet (client) to Qt Creator (server). The QIcon is created by a 'KIconEngine' in the KDE case. which isn't found on the QtCreator side. This leads operator>> in qicon.cpp to not read anything from the buffer at all ... leading to all following properties being invalid, since read from the wrong bytes in the stream. Solution: Since QIcon leads to problems and we have no current use case for a QIcon property in Bauhaus we just ignore properties of type QIcon. Reviewed-by: Marco Bubke Task-number: QTCREATORBUG-4596
View Lorry Controller Status