summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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 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 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-051-7/+4
| | | | | | | | | | 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>
* 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>
* 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>
* 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-254-10/+32
| | | | | Change-Id: I7e97af90cb7cd4c93abe2330cfbd92581b2be22e Reviewed-by: Eike Ziller <eike.ziller@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>
* 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>
* QmlJS: Require Qt >= 4.8.0 to dump builtins.Christian Kamm2011-11-231-2/+3
| | | | | | | | | The qmlplugindump tool is only shipped with Qt since 4.8.0. Change-Id: I05c77da2bcfc9e1dbf055c45add78543cacce79c Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* analyzer: fix performance problem when resorting valgrind viewshjk2011-11-231-0/+1
| | | | | | | Task-number: QTCREATORBUG-6319 Change-Id: I5a2cc1845104bb16f912fe258ba25473ba85cefd Reviewed-by: hjk <qthjk@ovi.com> (cherry picked from commit b3ae7d7e181e359adccd9085d93504f3dc4ce1d9)
* Fix size of cmake project wizardDaniel Teske2011-11-221-1/+1
| | | | | | | Task-Nr: QTCREATORBUG-6581 Change-Id: I391df32dc49a7ee7a34ba4b47bf02d1c1690647a Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Compile fix for Mac 10.5.8 gcc 4.0.1Jarek Kobus2011-11-222-13/+15
| | | | | Change-Id: I77a9ac922ead256c3c58be39ad0383aef67f3133 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* analyzer: fix tab order in 'start remote' dialoghjk2011-11-221-31/+25
| | | | | | | Task-number: QTCREATORBUG-5765 Change-Id: I24f4a0bab178f32da12dc6842945cff2f7ffa993 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Override LC_ALL for the make stepTobias Hunger2011-11-222-2/+12
| | | | | | | | | Override LC_ALL in the makestep, not LANG in the toolchain's addToEnvironment. Task-number: QTCREATORBUG-6488 Change-Id: Ic3de4f53f99b6b9d88a1337c65aa7f4839d4099d Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Make "Clean" and "Build" translated in "Add %1 Step"Jarek Kobus2011-11-221-0/+4
| | | | | | | | | | | | | | Do the same as in case of "Deploy" string: after restoring overwrite it with proper translated string. Side note: tr("Build") and tr("Clean") have already been used inside buildconfiguration.cpp so it will not produce a new record in .ts file, i.e. this change is not introducing a new message in string freeze period. Task-number: QTCREATORBUG-6595 Change-Id: I05040bba5066cbe0b55085cb2acbe43df34becd7 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Give SessionDialog a parent widgetJarek Kobus2011-11-223-4/+4
| | | | | | | | In this way there is no additional item on taskbar Change-Id: Ib946064f3d859a61eaa5495bc4fb7740b641e154 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Don't offer Makefile.Debug and Makefile.Release for importingDaniel Teske2011-11-221-0/+4
| | | | | | | Task-number: QTCREATORBUG-6562 Change-Id: I1630d7c13ab59d848626a4a4b8fb542765a16d6e Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* tr() fixes in formeditorwidgetRobert Loehning2011-11-211-2/+2
| | | | | | Change-Id: Ib67e2bf7cb04c708c09a0c8c811b30ae948276a4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fakevim: fix cursor positioning after ]] etc.hjk2011-11-181-0/+1
| | | | | | | Change-Id: Ia42fccff507fce1e999d4534656984b6ebf5180a Reviewed-by: hjk <qthjk@ovi.com> (cherry picked from commit 289a05a189064bcd5028b7e2fc3df1b2bec8c12e) Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlDesigner: crash fixThomas Hartmann2011-11-184-6/+6
| | | | | | | Task-number: QTCREATORBUG-6558 Change-Id: I5e5719c7764df350f4e466b8f1e90bdeed872b3d Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* centralize setting of "CONFIG += shared dll" for librariesOswald Buddenhagen2011-11-182-2/+0
| | | | | | | | | | "dll" and "shared" set each other, but too late to actually test for it in the project files, so include both. note that this will slightly modify the build of some of our imported qt solutions. Change-Id: I0bd4f41a68fd160f8e87eb0a0fa66096fe70ef3e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
* tr() fix in fakevimpluginRobert Loehning2011-11-181-1/+1
| | | | | Change-Id: I6d25c508f62cbbaaac2ec525aea74f8c7946aa6a Reviewed-by: hjk <qthjk@ovi.com>
* Let the Qt Quick Wizard output import QtQuick 1.1 (instead of 1.0)Alessandro Portale2011-11-172-2/+4
| | | | | | | | | ...and add a comment to change it to QtQuick 1.0 if S60 5th Ed or Maemo are supposed to be targeted. Task-Number: QTCREATORBUG-6528 Change-Id: I1936f2a5c9725f34b5a8ad4469465f5e2b645957 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Bazaar: fix jumping into file from diff viewHugues Delorme2011-11-161-2/+2
| | | | | | | | | | | | | | From a diff view, jumping into 'added' files wasn't working. Actually file jumping was working only for 'modified' files. This is fixed by using a more general diff regexp in class BazaarEditor (attribute m_diffFileId) This bugfix also allows to highlight all diff specs (rename, remove, ...) Task-number: QTCREATORBUG-6531 Change-Id: I80bcbc0f77644c6caa7e7c750bd474a12263b589 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Don't use MDeclarativeCache::qDeclarativeView()Alessandro Portale2011-11-161-1/+1
| | | | | | | | | | | | | | | | | Commit d687d11240877f848f3d1c28e2ec70ed4ff555f4 unfortunately caused two severe regressions for MeeGo: QTCREATORBUG-6473: The application creates two QDeclarativeViews QTCREATORBUG-6490: QDView functions inaccessible. Existing apps broken This commit removes most of d687d11240877f848f3d1c28e2ec70ed4ff555f4 just leaving the boosted QApplication. Now, QmlApplicationViewer *is* again the QDeclarativeView. Change-Id: I219540353ff4dd1061221d6cbe69ce9a58500e91 Task-Id: QTCREATORBUG-6473 Task-Id: QTCREATORBUG-6490 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* debugger: respect the "Always adjust column width" settingshjk2011-11-162-0/+11
| | | | | | | Task-number: QTCREATORBUG-6527 Change-Id: I53e68dbf75d3a025d760d948a31c49f9cdf93919 Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlProfiler: fix crash with context menu when nothing is selectedChristiaan Janssen2011-11-161-8/+10
| | | | | Change-Id: I8e5e47e1fcc620c823e7d3e1c5a643fb09d4b392 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QML Debugging: Always name qmake step "Enable QML debugging"Kai Koehne2011-11-151-4/+1
| | | | | | | | | We used to differ between Qt 4.7, where the step was "Link QML debugging library", and 4.8. Let's just call the checkbox "Enable QML debugging" for all Qt versions, which is easier to document. Change-Id: I9bdffd75769a9d3c08efbf7471e00be46c9d9ed7 Task-number: QTCREATORBUG-6541
* AnalyzerManager: Fix analyzer actions disabled after build errorDaniel Teske2011-11-154-15/+4
| | | | | | Change-Id: I7a6d29aba5acd2eafccf8b2c2fc08cc4ed6f00f3 Task-Nr: QTCREATORBUG-6318 Reviewed-by: hjk <qthjk@ovi.com>
* AnalyzerManager: Remove more dead codeDaniel Teske2011-11-151-9/+1
| | | | | Change-Id: I4a1bdd9c5f4ea0b44e7dc9b5fbf7c87ae4dbc15a Reviewed-by: hjk <qthjk@ovi.com>
* Dead code in AnalyzermManagerDaniel Teske2011-11-151-18/+0
| | | | | Change-Id: Ia51e7ed2fb64e89434405841f27842e2f84a917c Reviewed-by: hjk <qthjk@ovi.com>
* C++ editor: Reparse after applying rename.Christian Kamm2011-11-141-1/+3
| | | | | | | | | Fixes using quick fixes directly after finishing a rename. Task-number: QTCREATORBUG-6412 Change-Id: I22ee1df5f64189e87f6a3b3ae41781ed4b24afb4 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* VCS: Fix Apply/Revert for last line of chunkOrgad Shaneh2011-11-141-2/+1
| | | | | | | Task-number: QTCREATORBUG-6487 Change-Id: Id225856e267a4c8ac6dc15d5573175e7f0ce777f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Disambiguate include guard defineDaniel Teske2011-11-101-3/+3
| | | | | Change-Id: Ie0eeb3fa2de93370f79cede93a3360224ce10ba9 Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Fix qreal is not double.Felix Geyer2011-11-094-6/+6
| | | | | | Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2 Reviewed-by: hjk <qthjk@ovi.com> (cherry picked from commit 3b0f26e23136e60b61203c26075349f1e541f654)
* C++: Fix navigation for macrosLeandro Melo2011-11-081-8/+13
| | | | | | | Task-number: QTCREATORBUG-6399 Change-Id: Ic259d6cfed10e650d2eb7e07bdfacbc9038e51d0 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* debugger: save history of log input panehjk2011-11-081-0/+3
| | | | | | Task-number: QTCREATORBUG-6474 Change-Id: Ie57f7a6d8f2dce9f09f2b2f5140071289d9c4518 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* DebuggingHelper: Check for empty list of qt apisKai Koehne2011-11-081-4/+6
| | | | | Change-Id: I86b0ead03821c97731bcd268613938c4a5373615 Reviewed-by: hjk <qthjk@ovi.com>
* Use QString::fromLatin1 instead of QString::fromAsciiAlessandro Portale2011-11-081-1/+1
| | | | | | | | | There is no good reason to break the Qt coding style, here. The strings "%1/../Resources/%2" and "%1/../%2" are Latin1 aswell as Ascii. Change-Id: Idbf3b7650fd650f93293496839fec4d21626cd0b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* SVN: Fix Subversion 1.6 and earlier support after refactoringJonathan Liu2011-11-081-1/+1
| | | | | | | | | | After refactoring in fa2c24d92b23b23d0548c4cdcd653d7adc6326cc, Subversion 1.6 and earlier working copies are not detected properly which results in the Subversion menu missing. This fixes the detection by correcting a typo in the last return statement. Change-Id: I64334a3f46e94b2b36e8a83b1833cf899fdb58c6 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
View Lorry Controller Status