aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix possible crash in git branch dialogTobias Hunger2011-08-151-2/+5
| | | | | | | | | | | Do not crash when checking out a branch while not currently on any branch. Task-number: QTCREATORBUG-5784 Change-Id: I5d007e91c1778e6f09a5d543990d948bc1427599 Reviewed-on: http://codereview.qt.nokia.com/2958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* DebuggingHelpers: Pass mkspec on command lineKai Koehne2011-08-151-2/+2
| | | | | | | | | | | | We didn't pass actually the targetMode and mkspec to qmake. E.g. on Mac, debugging helpers therefore couldn't compile if the default qmake mkspec is xcode. Task-number: QTCREATORBUG-5806 Change-Id: I575012386983e1e285a500f99a34b7f21dcba29d Reviewed-on: http://codereview.qt.nokia.com/2947 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fakevim: fix action used in Edit->Advancedhjk2011-08-151-4/+4
| | | | | | | | | Variable was uses in wrong scope. Change-Id: I0c9343742cf75b118c14cbf8bf4cec9f983c32d5 Reviewed-on: http://codereview.qt.nokia.com/2941 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Editors: Make sure folded blocks remain consistentLeandro Melo2011-08-154-0/+96
| | | | | | | | | | | | | | When folding indents change and a block becomes no longer folded we need to update the user data. This patch tries to handle general inconsistencies that might arise in such situations. Notice however that there are stil other problems to be addressed (including issues in Qt). Task-number: QTCREATORBUG-5771 Change-Id: I38b869832159598d46cde00058308c218ca31f1a Reviewed-on: http://codereview.qt.nokia.com/2908 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Matthias Ettrich
* Updated Russian translationSergey Belyashov2011-08-121-8/+8
| | | | | | | Merge-request: 359 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Iea721437f2615acb8fec5dabca34b0922bf551ee
* Update chinese translation for 2.3Beaver Xu2011-08-121-1025/+8248
| | | | | | | Merge-request: 360 Reviewed-by: ossi Change-Id: Ia6e6303dabcda2bf3b7abc44fdfde2d359bb61a7
* Update japanese translations for 2.3.axasia2011-08-121-1563/+8955
| | | | | | | Merge-request: 361 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I384b845fd586a90a7209fc22c8a1f7d2170feac5
* QmlDebugging: Fix on-device debugging for people with a default proxyKai Koehne2011-08-111-0/+2
| | | | | | | | | | | Qt Creator by default honors the proxy settings of the environment. This is the wrong choice when connecting to your device, leading to 'Cannot connect to in-process debugger' errors. Change-Id: Ie0b822dec601463ba3a620efe1a1e35bb24b6c5a Reviewed-on: http://codereview.qt.nokia.com/2846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDebugger: Fix QML Script Console for mixed debuggingKai Koehne2011-08-111-1/+5
| | | | | | | | | | | | Both the Debugger View and the QML Script Console use executeDebuggerCommand(...). Forward this to QmlEngine if the QmlEngine is stopped (because only then teh QML Script Console is enabled), to C++ otherwise. Change-Id: I4ba72b56a6205db5346e167b85e9353d05adae41 Reviewed-on: http://codereview.qt.nokia.com/2829 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Revert "fakevim: also set foreground color for search matches"hjk2011-08-111-1/+0
| | | | | | | | | | | | This reverts commit c1f225fd8f3020957c3326782b02ae41e4ad2aed. This does not cover the case where the cursor is in the marked text, which then blinks black-on-black. Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad1 Reviewed-on: http://codereview.qt.nokia.com/2698 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix running applications in Windows SDK 7.1.v2.3.0-rcFriedemann Kleint2011-08-101-1/+5
| | | | | | | | | | | Fix start of applications with varying Qt-versions when Qt Creator is launched from an Windows SDK command prompt (prevent PATH from being reset by setenv.cmd). Change-Id: I74f75f3663be4836c368a4b9d8c7f8fc5ec351d7 Reviewed-on: http://codereview.qt.nokia.com/2818 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* C++: Fix crash when typing illegal class namesLeandro Melo2011-08-091-0/+15
| | | | | | | | | | | Such as class ~A {} or class operator+ {}. Done by Roberto Raggi Change-Id: I4fdad6d27aaa997e651f2d08de36fe675fc78814 Reviewed-on: http://codereview.qt.nokia.com/2778 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove unnecessary import, removes a warningEike Ziller2011-08-091-1/+0
| | | | | | Change-Id: If89bec794fe3fe5315b69ad283d35c2ba0abced3 Reviewed-on: http://codereview.qt.nokia.com/2779 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDebugger: Hit breakpoints for simple bindings also for .qmlprojectKai Koehne2011-08-091-0/+7
| | | | | | | | | | Make sure QML_DISABLE_OPTIMIZER is set also when debugging with qmlobserver Change-Id: I33aa4cd50ae184e339e3783488ba236eecdf7b33 Reviewed-on: http://codereview.qt.nokia.com/2753 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* MeeGo: Adapt package name to changed OVI store requirements.Christian Kandeler2011-08-082-4/+8
| | | | | | | | | | | | Fremantle needed the application version as x_y_z, for Harmattan it must be x.y.z, otherwise the package will not be accepted by the store. Obviously. Task-Number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=276021 Change-Id: I93b8fd7f1c95b9ef26df97f817e3b8b610c4e932 Reviewed-on: http://codereview.qt.nokia.com/2697 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* debugger: change default value for 'break on qFatal' to 'false'hjk2011-08-051-2/+2
| | | | | | | Change-Id: Ief1879c1e8009d1a60575180d4132d8f03a88b08 Reviewed-on: http://codereview.qt.nokia.com/2690 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Polish Polish translationJarek Kobus2011-08-051-27/+1
| | | | | | | Change-Id: I5c48cd5cc5fcb8298dabb4a612a3fbb35ae6f491 Reviewed-on: http://codereview.qt.nokia.com/2679 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* QmlDesigner.navigator: fixes crash for context menuThomas Hartmann2011-08-041-37/+74
| | | | | | | | | | | | | | We have to add a check if the item we want to set visibility on is really an item. See: isItem() For general safety I added try catch blocks for RewritingExceptions Task-Number: QTCREATORBUG-5731 Change-Id: I72f4f5ae69067a04b09880ae071265c83f880b4c Reviewed-on: http://codereview.qt.nokia.com/2637 Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QtQuickApp wizard: Deactivate .qml file selector by defaultKai Koehne2011-08-041-1/+5
| | | | | | | Change-Id: If7b94a0c5ddad7c06ffb41df1b0678181b0702fa Reviewed-on: http://codereview.qt.nokia.com/2635 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* QmlProfiler: fixed sorting of "event type" fieldChristiaan Janssen2011-08-041-1/+1
| | | | | | | Change-Id: Ibaa321c65f44c4ca9c87bb312659173bb2f26d64 Reviewed-on: http://codereview.qt.nokia.com/2634 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Enable some cursor keys for binary editor again.Eike Ziller2011-08-041-0/+1
| | | | | | | | Change-Id: I0e0136a205fa6ca6ed9c8d0d745803488337dd37 Reviewed-on: http://codereview.qt.nokia.com/2626 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.propertyEditor: fix for alpha == 0Thomas Hartmann2011-08-041-1/+1
| | | | | | | | | "transparent" is an extra case. Task-Number: QTCREATORBUG-5727 Change-Id: If28e8735aacb3dd464b61fb7ed65918d8ea465b2 Reviewed-on: http://codereview.qt.nokia.com/2627 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* QmlDesigner.statesEditor: crashfix for focus handlingThomas Hartmann2011-08-041-1/+0
| | | | | | | | | | | | Ignore changes to the TextEdit if focus gets lost. Reason: an error message (illegal state name) would lead to a crash. For details see the task. Task-Number: QTCREATORBUG-5729 Change-Id: I0f0ad7a416ba59d958b3ae5d8809ccb51f42fe5e Reviewed-on: http://codereview.qt.nokia.com/2624 Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlCpp Debugging: Only set C++ breakpoints after QML is connectedKai Koehne2011-08-044-38/+25
| | | | | | | | | | | | | | If one hits a C++ breakpoint before the QmlEngine is properly set up the debugging actions are all disabled. Patch 58faedc4e tried to fix this by automatically executing continue in these cases, but this let to errors on Mac OS X. Instead just delay the setting of C++ breakpoints. Task-number: QTCREATORBUG-5681 Change-Id: I149dea9b453ed7abd33a1a93b5b546d7c6cda8fd Reviewed-on: http://codereview.qt.nokia.com/2568 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlProject: Don't crash if no qt version is availableKai Koehne2011-08-041-2/+3
| | | | | | | Change-Id: I1737ca26b29d366f4f326c534af1528776f2bfdd Reviewed-on: http://codereview.qt.nokia.com/2607 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Export qmakestep and makestepDaniel Teske2011-08-042-2/+5
| | | | | | | | | | | | Needed by plugins implementing their own qt4 targets. Backport was asked for on IRC. Change-Id: Idad09914f95259443c06ecdf458e9ce63c802cc3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> (cherry picked from commit a838d4ac0191de63e3a3a17290ffa6d14457c4d2) Reviewed-on: http://codereview.qt.nokia.com/2587 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fakevim: v in visual mode actually leave visual modehjk2011-08-041-15/+19
| | | | | | | | | Task-number: QTCREATORBUG-5603 Change-Id: I239837b1d8ad30fdc157a6eaec05a026c294a750 (cherry picked from commit 764f902cf39da75260a1771d6d55a2f41be8dcca) Reviewed-on: http://codereview.qt.nokia.com/2578 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fakevim: handle cursor keys in Replace modehjk2011-08-041-0/+15
| | | | | | | | | Task-number: QTCREATORBUG-5647 Change-Id: I06bf6b859ac5111b5692c003aab2d003a0c7b110 (cherry picked from commit 18b74f087bc9d898f30b21478c09b8897dc1d444) Reviewed-on: http://codereview.qt.nokia.com/2577 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fakevim: also set foreground color for search matcheshjk2011-08-041-0/+1
| | | | | | | | | Task-number: QTCREATORBUG-5604 Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad0 (cherry picked from commit 00be04e1ea3b91849f963c9bca4d633fbdc352bc) Reviewed-on: http://codereview.qt.nokia.com/2576 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fakevim: fix endless loop in certain search&replace operationshjk2011-08-041-1/+1
| | | | | | | | | Task-number: QTCREATORBUG-5697 Change-Id: I25e9ef4ef042efa2b4dd670f5177e5e170fbaaf0 (cherry picked from commit d8fdd0acdc59a02788c23b18680b47da51cf1c56) Reviewed-on: http://codereview.qt.nokia.com/2574 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* debugger: allow insertion of evaluated expressions for core fileshjk2011-08-041-0/+1
| | | | | | | | | Task-number: QTCREATORBUG-5693 Change-Id: I8b6a5e0cd7956dab92270cae8994da3303fcf8e0 (cherry picked from commit 9f82bc25a4d0a8e33cb9f984b7786f617a3f66f2) Reviewed-on: http://codereview.qt.nokia.com/2575 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* compile fixThomas Hartmann2011-08-031-0/+1
| | | | | | Change-Id: I6bea04e8e4a6bf74fcfe7c70459924ff2443176d Reviewed-on: http://codereview.qt.nokia.com/2584 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Version bumpEike Ziller2011-08-031-1/+1
| | | | Change-Id: Ie922c0ccada7b20f452812ca0cf53f9085774c54
* Make Components installable. Fix Shadow Build.Daniel Molkentin2011-08-0386-125/+117
| | | | | | | | | | Task-Number: QTCREATORBUG-5672 Done-with: Oswald Buddenhagen Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004 Reviewed-on: http://codereview.qt.nokia.com/2451 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner.rewriter: bugfix for componentsThomas Hartmann2011-08-031-15/+11
| | | | | | | | | Simplifying synchronisation of m_componentEndOffset. Fixes several rewriting issues. Change-Id: I53a7f4ae8af1acb05e4daff6afdeec9522d35a79 Reviewed-on: http://codereview.qt.nokia.com/2572 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.rewriter: allow more debuging infoThomas Hartmann2011-08-031-0/+11
| | | | | | Change-Id: I8e4571ac5a8a0ee57823e2e54a2c63f5bbe4538f Reviewed-on: http://codereview.qt.nokia.com/2571 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Make session rows half as big in height as pojects rows.Daniel Molkentin2011-08-031-1/+1
| | | | | | | Change-Id: I8c24d4e939d2701c10444bb2c37921a095fe636b Reviewed-on: http://codereview.qt.nokia.com/2523 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QmlDesigner.propertyEditor: preserve alpha valueThomas Hartmann2011-08-021-1/+5
| | | | | | | Task-number: QTCREATORBUG-5683 Change-Id: I5101eb4bdb73938628c0f0acc3ebf16868b53cb2 Reviewed-on: http://codereview.qt.nokia.com/2522 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QtQuickApp template: Don't enable qml debugging for every debug buildKai Koehne2011-08-022-2/+1
| | | | | | | | | | | | This can be confusing, since there is also the switch in the qmake step, which is on by default for debug builds too. However, if one disables it you expect that debugging has in fact been disabled. Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2 Reviewed-on: http://codereview.qt.nokia.com/2511 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Clear minimum Qt version and required features when neededJarek Kobus2011-08-021-0/+4
| | | | | | | | | | | | When the user chooses back button and select something different than Symbian or Meego the above fields should be cleared. Task-number: QTCREATORBUG-5708 Change-Id: I2a8557cd1ab60dfc309c585399cd5b2210b44cc9 Reviewed-on: http://codereview.qt.nokia.com/2513 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlProfiler: Fix documentation link for setting up debuggingKai Koehne2011-08-021-1/+2
| | | | | | | | | | Link directly to the page where the setup is described (qml profiler page just links to it). Change-Id: Ibe88f1b2269c90e868aab5272b01e337956d8e46 Reviewed-on: http://codereview.qt.nokia.com/2510 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Fix crash when spliting GLSL editorLeandro Melo2011-08-026-10/+20
| | | | | | | | | | | | | | | | Not a good idea to keep the editor stored since when removing a split, for example, the editor will go away and the highlighter is not aware of it anyhow since it actually belongs to the document. Although it's not necessary for the fix this patch add another constructor to SyntaxHighlighter which takes the BaseTextDocument. This is convenient. Task-number: QTCREATORBUG-5695 Change-Id: Ic91837b7d91ebd3a44c16e2fd589d7f6c5c0c002 Reviewed-on: http://codereview.qt.nokia.com/2508 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Git: Fix ignore whitespaces/patienceTobias Hunger2011-08-021-2/+2
| | | | | | | | | | | Fix initital evaluation of ignore-whitespace and patience flags in git diff. Task-number: QTCREATORBUG-5176 Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae Reviewed-on: http://codereview.qt.nokia.com/2509 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: fix for Image (2)Thomas Hartmann2011-08-021-15/+0
| | | | | | | Task-Number: QTCREATORBUG-5699 Change-Id: I819e50a6dd3f1a78112bc29b7c4c44284d25f21a Reviewed-on: http://codereview.qt.nokia.com/2505 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: fix for ImageThomas Hartmann2011-08-021-35/+0
| | | | | | | Task-Number: QTCREATORBUG-5700 Change-Id: I8f3c5db7740aa4a18e09b9b7445362a5cfb33941 Reviewed-on: http://codereview.qt.nokia.com/2504 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: fix for border imageThomas Hartmann2011-08-021-35/+0
| | | | | | | | SourceSize is read only. Change-Id: If5fe2e25026098efde942bbc63948fd3e27f6545 Reviewed-on: http://codereview.qt.nokia.com/2506 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: crash fixThomas Hartmann2011-08-022-1/+8
| | | | | | | | We did not handle the case that a gradient is a binding. Change-Id: Ib6892420c6d5de7522cb2b051ff2b046ab781c14 Reviewed-on: http://codereview.qt.nokia.com/2503 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Update Polish translationsJarek Kobus2011-08-021-817/+817
| | | | | | | Change-Id: I949a1c40fe9555857a77066b966be2928c26f1ad Reviewed-on: http://codereview.qt.nokia.com/2502 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* QmlDesigner.NodeInstances: Show binding in text if invalidMarco Bubke2011-08-021-1/+5
| | | | | | | | | | If a binding on a text property cannot be evaluated it will now will be show as #binding.text# Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971 Reviewed-on: http://codereview.qt.nokia.com/2452 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlProfiler: Fix warning about unused variableKai Koehne2011-08-021-5/+0
| | | | | | | Change-Id: I274b844215eeebb33e81bd7df6b07862286fcefe Reviewed-on: http://codereview.qt.nokia.com/2446 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 19:17:02 +0000