summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ukrainian translation updated for branch 2.42.4Victor Ostashevsky2012-04-121-653/+621
| | | | | | | Hope someone will pickup this, switching to 2.5 branch for now. Change-Id: I498e1fdbfad27ee7824ed2d8bee9c23d4d1c087e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix typo in zh_CN translationBai Jing2012-03-151-2/+2
| | | | | | Task-number: QTCREATORBUG-7111 Change-Id: I59fe5af962c08c158166e39ec02f411166455672 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* fix some Chinese translation problemBai Jing2012-02-101-3/+3
| | | | | | | Task-number: QTCREATORBUG-6921 Change-Id: I95466d44a2ec6a65940666b221ca885cfb5dda7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* fix chinese translation of some new stringsBai Jing2012-02-071-11/+35
| | | | | Change-Id: Iddabe91f2c1c3959f5852b427609e3c49bfca49f Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Debugger: Fix JS debugging on Harmattan PR1.2v2.4.1Kai Koehne2012-01-241-2/+8
| | | | | | | | | | | | | | So far we assumend that the JSDebugAgent service switches to the Enabled state after the constructor has run. That's apparently not true for Harmattan PR1.2 (maybe the app / Qt calls process events by hand, maybe it was a race condition from the start). Fix this by checking the status already in the constructor, and register ourselves as debugger agent if status == Enabled. Change-Id: Icae189102116c8b572e05ce6c64f14b8f428ed2f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Update changes file.Eike Ziller2012-01-242-3/+9
| | | | | Change-Id: I83d9313f56b8ef161d73ba263abf2711d6397486 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Version bumpEike Ziller2012-01-231-1/+1
| | | | Change-Id: I8792f30e951ad3932a5966ce99c78c1408894fbf
* DebuggingHelper: Build with right architecture even for Mac universalKai Koehne2012-01-172-1/+12
| | | | | | | | Task-number: QTCREATORBUG-6737 Change-Id: Ic4f814aa031902570310aad156e4b2ca9b2d3c26 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Add resolution of QTCREATORBUG-5975 to changes-2.4.1Kai Koehne2012-01-121-0/+1
| | | | | Change-Id: Id8c9cc05520bb4865b695de66325f732f700ea0e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix some chinese translations.Jing Bai2012-01-051-5/+5
| | | | | | | Task-number: QTCREATORBUG-6751 Task-number: QTCREATORBUG-6727 Change-Id: Ic18b6d89fd71989e3bab6d964940518a6bf9c1fe Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Complete czech translationPavel Fric2012-01-031-648/+4631
| | | | | Change-Id: Ibe56048f437456ab7620f52a3f54d2e1fbe343dc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Debugger[CDB]: selectThread(): Remove call to resetLocation().Friedemann Kleint2011-12-211-1/+0
| | | | | | | It is unneeded and causes the thread window to become disabled. Change-Id: I9a3621bc574cf6774b401de7eb925741db3b9f35 Reviewed-by: hjk <qthjk@ovi.com>
* GCC: Better mkspec suggestion on macTobias Hunger2011-12-201-2/+2
| | | | | | | | Change-Id: Ie613fc0b2ba6a06b5726bf40aa50958c84b9b772 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Mirko Boehm <mirko@kde.org> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* QtQuickApp template: Use === where possibleKai Koehne2011-12-191-1/+1
| | | | | | | | Prevent QtCreator from underlining this template code. Change-Id: Ic499db77a0fbbc8344d98ecca25e6c9f4277ee0f Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Find QMLViewer on Mac OS XKai Koehne2011-12-191-21/+21
| | | | | | | | | | Let Qt Creator search for 'QMLViewer.app' instead of 'Qmlviewer.app' on Mac OS X. Task-number: QTCREATORBUG-5975 Change-Id: I584af98a1476b994b19b587b934ffc234760a948 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Don't call killTimer() on dead timers.Daniel Molkentin2011-12-191-0/+1
| | | | | | Change-Id: I3d8b44534d748c820ae63c6909b4eb28ff566283 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Install the debugging support (cdbext, qtcdebugger, qmlprofiler).Daniel Molkentin2011-12-193-4/+13
| | | | | | | | Required to deploy the lib upon 'make install'. Change-Id: I1d6f02e5083dc0b1b34ece840509cb1094f9863c Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update czech translationOswald Buddenhagen2011-12-151-1645/+17864
| | | | | Change-Id: I9100325d1b0a86f483c579ae0f9ee14085442d81 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add QTCREATORBUG-6698 to 2.4.1 changelogKai Koehne2011-12-151-0/+1
| | | | | | Change-Id: I9a2e2106db7abfa7b208216af924943c937db565 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Add changes file for a potential 2.4.1Kai Koehne2011-12-151-0/+46
| | | | | Change-Id: Ifb985083902f2210768f6538c908d1512e7f53d6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlPluginDump: Search in $QT_INSTALL_BINSKai Koehne2011-12-143-8/+15
| | | | | | | | | | | We used to search only in $QT_INSTALL_DATA/bin,which might not be the correct location if Qt is configured with "-bindir" Task-number: QTCREATORBUG-6698 Change-Id: Ica54247e7ccd9a94d1a9c5923d258771287b56ac Reviewed-by: Tommi Asp <tommi@mowhi.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix loading files from within documentation.Eike Ziller2011-12-091-0/+1
| | | | | | | Task-number: QTSDK-1129 Change-Id: Ief29c41ad4074d74c97b4e8aa9c69a6e4a0d9d67 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix windows proxy setting again.Eike Ziller2011-12-081-2/+4
| | | | | | | | Broke with 4edec9f9. Change-Id: I1dfad5964f7d36566de0874d19e7ca94e3b92054 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> (cherry picked from commit b2c73f6e18a18d143445a163b358d1700eef5d32)
* Fix a crash on closing a project while a parse is in progressDaniel Teske2011-12-081-1/+5
| | | | | | | Task-Number: QTCREATORBUG-6677 Change-Id: I01dd37fabafd8cd056cd4051b8377c6167453cb6 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix the height of the new search result pane.v2.4.0Eike Ziller2011-12-063-83/+107
| | | | | | | | | For the bigger search filters like C++ Symbols & Files on File System it was unusable e.g. on Mac. Change-Id: I1839238660cc7508ada4e580388ee08d8eca8a6a Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix possible crash in environmentsmodelTobias Hunger2011-12-061-2/+2
| | | | | Change-Id: Ib6a3450a7974dc568ba07633a38a29d598a9099f Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Added German translations for late patchesRobert Loehning2011-12-061-0/+12
| | | | | | Change-Id: I87ce2a9c0cb8452c9e5850ae75cc0dc057f5e016 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Russian translation updateSergey Belyashov2011-12-061-4/+12
| | | | | Change-Id: Ib31f661cc50a5126cb67b628708965142da74bfb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't try finalizing files that were never created.Eike Ziller2011-12-051-1/+2
| | | | | | | Task-number: QTCREATORBUG-6643 Change-Id: I04945ebb39caace476a12f293666cfcec0f8a9e5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix search next/prev in search results.Eike Ziller2011-12-053-15/+27
| | | | | | | Broke with ebb9e252779aff1ff874565c2b056f1c8319c2c8 Change-Id: Ifb5821d4712e780df70bc1ec798123dd7b63b108 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Harmattan: Introduce new condition for auto-generation of manifest file.Christian Kandeler2011-12-052-10/+7
| | | | | | | | | | In addition to using an empty file as in 2.3, the user can now also put a magic string at the start of the manifest file. This way, we can use this as the default while also documenting it in-place. Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797 Change-Id: I375a73a5d2e9d3e0973d97d81e0110e788d0159a Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix crash in submit editorDaniel Teske2011-12-021-1/+1
| | | | | | | | | Task-number: QTCREATORBUG-6657 Change-Id: I1b7b9f6e84b4e81ed1c81c70c9a0b4e3dce360e3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* SSH: Ask for private key password right on connection start.Christian Kandeler2011-12-022-7/+29
| | | | | | | | This prevents event loop issues (e.g. connection timeout). Task-number: QTCREATORBUG-6641 Change-Id: Ibeecaac2621e171a0590621fd9fdde8f7e3ab9c5 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* QmlJS: Fix potential crash in find usages.Christian Kamm2011-12-021-4/+5
| | | | | | | | | | When invalid documents or documents without idEnvironment or rootScope get added to a QmlComponentChain. Change-Id: I64b7062881f19777ba20efda6efa2e7bab02571e Reviewed-by: Leandro Melo <leandro.melo@nokia.com> (cherry picked from commit 9b411ed5588db9dcbea955e4e45f99b5d06c1cbe) Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlJS: Add protection against attached types attaching to themselves.Christian Kamm2011-12-021-1/+1
| | | | | | | | Change-Id: Ib81d5e6baabf5ac8d18411e8936098908de2c2bb Task-number: QTCREATORBUG-6635 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> (cherry picked from commit 25842cb13a18ec946fe80b6d869f2b00dbd2ce9c) Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* translations: update link to wiki pagehjk2011-11-281-1/+1
| | | | | Change-Id: I4e7a4636e2af4f1cb4af1039473038e906693b2d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix tab settings for non-code files.Eike Ziller2011-11-281-0/+2
| | | | | | | | In the case when they are part of the project. The project's EditorConfiguration had an wrongly initialized default editor setting. Change-Id: If6e39ed3efca39d726c28b8278a059c8bbe7c3fc Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* QMakeStep: Fix compilation warningKai Koehne2011-11-281-2/+0
| | | | | | | Remove unused variable. Change-Id: I8e060a8569edfa34483497188d480e624fc2c5fe Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Squish: Improve hook-into sub-processesChristian Stenger2011-11-253-8/+64
| | | | | | | | | | | | | With this patch it's possible to not only hook into the QmlApplicationViewer (although nothing else is currently done) and additionally to not only send the closing event to the sub-process. You can now define a function that will be executed on the sub-process. Both modified tests show an example how to use it. Change-Id: I39b9959f2cf1d519b8afeb0c479ac2d68ea20ca6 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Squish: Update for label renamed in masterRobert Loehning2011-11-251-1/+1
| | | | | Change-Id: I8ad167cca8c878efd67eca9ac48b4df237d31726 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Unbreak focus behavior for search panel.Eike Ziller2011-11-251-0/+1
| | | | | | | | With cc11186bad9229c231f2fbba176645f3a3c20327 starting a new search would not move focus to the search term. Change-Id: Ibf84e632e99902d4a06d998271b49ebe614b79d8 Reviewed-by: hjk <qthjk@ovi.com>
* Copy dependencies specified in manifest file.Daniel Molkentin2011-11-255-11/+33
| | | | | Change-Id: I7e97af90cb7cd4c93abe2330cfbd92581b2be22e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Doc: Fix qdoc command formattingLeena Miettinen2011-11-251-1/+1
| | | | | Change-Id: Ib1659da5f41c51675274bdd0780d060eb3a737be Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Transform always old code style settingsJarek Kobus2011-11-252-54/+87
| | | | | | | | | | | | | | | | | | | | | | | Before, we didn't transform the code style settings if they were defaults (so no entries were written for them in the settings). In case someone changed global tab settings and didn't touch code style settings in 2.3, the code style settings were not transformed. Now, we transform them too so that legacy code style settings in 2.4 (named: "Old Creator") contains old global tab settings. We also take care of not creating legacy settings in case neither textTabPreferences nor CppTabPreferences nor CppCodeStyleSettings were saved (when creator 2.3 used only defaults or when it's a first run of creator 2.4 without old settings). Handle legacy transformation for qml too. Make a code bit more readable. Task-number: QTCREATORBUG-6614 Change-Id: I37b8dd4d1170f397b7d304c59575d9ae37884564 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Version bumpEike Ziller2011-11-251-1/+1
| | | | Change-Id: Ic65e1500c3727c26919050cdd5834dc904ad80d0
* Squish: Made functions verifyEnabled and selectFromCombo more genericRobert Loehning2011-11-242-9/+23
| | | | | Change-Id: I1f0d48712f5ec081fa323e929dabaeee1dbf9b63 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Fix crash on closing a tab of a asynchronously closing runcontrolDaniel Teske2011-11-241-4/+20
| | | | | | Task-number: QTCREATORBUG-6579 Change-Id: Ia1d629df24e1a4c7f4f830f575d1be4adc552409 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Avoid setting large minimum size for output panes.Eike Ziller2011-11-246-8/+38
| | | | | | | | | | | | | The search result pane set a minimum size for the "New Search" panel which forced this relative big minimum size on all panels and made it impossible to make the output pane area small. Now, the new search is wrapped into a scroll area, doesn't enforce a minimum size anymore, and, instead, when initiating a new search (via shortcut or menu action) resizes the pane so the panel fits nicely. Change-Id: I9afe67e66f324111a10a97f33c203846231e6a93 Reviewed-by: hjk <qthjk@ovi.com>
* debugger: don't try to escape translated stringshjk2011-11-241-11/+11
| | | | | | Task-number: QTCREATORBUG-5838 Change-Id: I897af2919d3762c23c788d276e755d8d598483ed Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Validate french translations for 2.4.Pierre Rossi2011-11-231-786/+802
| | | | | Change-Id: I8522f5a30f73e3d45cd93e4d87c9f24ad66b7c63 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
View Lorry Controller Status