summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doc: changes in the Welcome modeLeena Miettinen2011-11-022-2/+2
| | | | | Change-Id: Ia7168e0f7065c4895e461429b9d2e6af967eb808 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Version update in the readmeEike Ziller2011-11-021-3/+3
| | | | | Change-Id: I583c0ce503bf5db76c92362921352a6f388fa2c1 Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Make sysrootify case-insensitive on windowsDaniel Teske2011-11-021-2/+8
| | | | | | | Task-Number: QTCREATORBUG-6419 Change-Id: If3ab035ee3a117744213d5e3db3ffa41f7283d53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* WelcomePage: layout fixThomas Hartmann2011-11-022-10/+1
| | | | | | | | | Fixes a regression introduced in 44928237af12ec16eeb13b5eb86c6da2c483a6c1 Task-number: QTCREATORBUG-6444 Change-Id: Ie92ba0be9e888e065aaa52aac41bf3338bf8aeb6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Doc: edit for grammar and styleLeena Miettinen2011-11-021-42/+43
| | | | | Change-Id: I238b1f2707038beb4ea717308a8dc079db1ff8d2 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* projectexplorer: More consistent '...'hjk2011-11-024-7/+7
| | | | | | | Used for buttons that open additional dialogs, but not comboboxes. Change-Id: I9b40eac236f18b4c0b2e358ddeccb953024e8d50 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* VCS base diff editor with merge conflictsPeter Kuemmel2011-11-021-8/+19
| | | | | | | | | | | 'git diff' marks merge conflicts different to changes. With this fix it is possible to jump to the merge conflicts also by a double click. Task-number: QTCREATORBUG-6424 Change-Id: I355274e1ded4a05b3c7db718cbe9f48453070f82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Squish: Small refactoring - renamed helperChristian Stenger2011-11-022-16/+16
| | | | | | Change-Id: I3ca9261043f568a9e160546998dd7b2cd5aa0dd4 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* debgugger: fix crash when opening memory editor through register valueshjk2011-11-021-1/+1
| | | | | | Task-number: QTCREATORBUG-6430 Change-Id: I92edba9e4564bbdff6babc548d49e9ba36bc3b77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* debugger: cleaner debugger abortinghjk2011-11-026-14/+43
| | | | | | | | | | Make the second "Abort Debugger" kill the gdb process directly instead of relying on further communication. Also fix some "unexpected" (but harmless) state transitions. Change-Id: I0938ec76420fbd77ec4b7348819dd7f63763547f Reviewed-by: hjk <qthjk@ovi.com>
* debugger: don't store empty watched expressionshjk2011-11-021-0/+1
| | | | | Change-Id: I3aa6ae756557c86caed7860bd0ffb26dced35bdc Reviewed-by: hjk <qthjk@ovi.com>
* Squish: Avoid blocking in tst_build_speedcrunchRobert Loehning2011-11-011-2/+1
| | | | | Change-Id: I468d57012df690c5e8120e1e5ec51ad7af224829 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Doc: help browser does not allow file downloadLeena Miettinen2011-11-011-0/+5
| | | | | | Task-number: QTCREATORBUG-6339 Change-Id: I28e32df3ef5ae0846349baa140c12230f9e8451d Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Squish: Added function which selects template for new projectRobert Loehning2011-11-012-19/+12
| | | | | | Change-Id: I7858e60c21641e39f6a5c23a12e3fd78a9d17334 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Squish: Fix test for Linux/MacChristian Stenger2011-11-011-1/+1
| | | | | | | | Because of a different naming of the Qt versions on Linux/Mac this test always runs without starting a build on these OS's. Change-Id: I93d89576ee6f56d7de9aee70aa79ea58a4239c5f Reviewed-by: Bill King <bill.king@nokia.com>
* Squish: Avoid timing issues when using LocatorRobert Loehning2011-11-013-19/+19
| | | | | Change-Id: If768a758f3887607c9ef46939dc22685cf54fb45 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Doc: update example to use Qt Mobility API 1.2Leena Miettinen2011-11-013-65/+53
| | | | | | | Task-number: QTCREATORBUG-6270 Change-Id: I2c65d7ec2df856ed0145468be1497b7dc5ac76a1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Set text editor font also for new search panels.Eike Ziller2011-11-011-0/+3
| | | | | | | Task-number: QTCREATORBUG-6432 Change-Id: I67b6a92faccc65f92cc612abf210c0a2eca4860b Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* QmlProfiler: Make sure standalone tool is shipped on Mac OS XKai Koehne2011-11-011-1/+1
| | | | | Change-Id: Icbe52a5198b670fb7a0bbe2ddb12fc0bbdb2dd17 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* fakevim: fix replacement of '\&'hjk2011-11-011-0/+1
| | | | | | Task-number: QTCREATORBUG-6434 Change-Id: Ic6ec34288733c4aa46cee353acf3920f3b4cf9ce Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Doc: rename Symbian^3 and Symbian^1 as Symbian Anna and S60 5th EditionLeena Miettinen2011-11-012-69/+130
| | | | | | | | | | | Reflect changes in targets installed with the Qt SDK 1.1.4. Add information about advanced development with Symbian SDK. Task-number: QTCREATORBUG-6051 Change-Id: I28715cbb11a8088630ce4de5d0756ede2ca1d96e Reviewed-by: Tim Kelly Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Squish: Added function handling name and location of new projectsRobert Loehning2011-10-312-48/+30
| | | | | | Change-Id: I23af07bb41b517af1ad9f65c642c3eedd0712093 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Fix showing of "Debugging Helper Missing" warning.Eike Ziller2011-10-316-19/+5
| | | | | | | | It was only showing up if one had a helper library that was outdated. Change-Id: I8d0ffcd16434dc6cfeadd408a2bdb59aa3ec73ba Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* QmlDesigner.documentController: bugfix for crumblebarThomas Hartmann2011-10-311-2/+5
| | | | | | | This fixes a crash bug. Change-Id: Ibfe5c30910fed8b5e3132a05bc6a2eec39d4d308 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
* BuildManager: Display times for build messagesOrgad Shaneh2011-10-311-1/+7
| | | | | | Task-number: QTCREATORBUG-6426 Change-Id: I253b005c1e0af093342a5b8315086c007138b764 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Editor: Support floating point values for tab stopLeandro Melo2011-10-311-2/+7
| | | | | | | Task-number: QTCREATORBUG-833 Change-Id: I76a4b69d6e9402f045a98712531475aff5e8d0ac Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Doc: update screenshots and make text clearerLeena Miettinen2011-10-314-3/+5
| | | | | | Task-number: QTCREATORBUG-6154 Change-Id: I90afe4693d34ff3061c214673b0e3a04b548e528 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* C++ insert def: Fix bug when minimizing name.Christian Kamm2011-10-314-78/+30
| | | | | | | | | | Constructors would not get the correct name before. Now rewriting the function's name is not done by going through the 'rewrite type' func- tionality but rather by minimizing the symbol's name directly. Task-number: QTCREATORBUG-6223 Change-Id: I3c25e414337937f5dd0f54570c899ca2ca21d2ef Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* Fix various crashesDaniel Teske2011-10-3112-46/+196
| | | | | | | Task-Number: QTCREATORBUG-6365 Change-Id: I19a200e3c811eef83d591f6eacca3e48eb0fba8f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Qt: Pick tool chain that works with the default mkspecTobias Hunger2011-10-312-0/+15
| | | | | | | | | | | Pick a tool chain that suggests the same mkspec as the Qt version was build with if possible. This should help with the case of us choosing the wrong tool chain on mac. Change-Id: I206658fd36f2f3c2223392a2c69cf264b5b6a54e Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* GCC: Autodetect old GCC versions needed for macx-g++XY mkspecsTobias Hunger2011-10-311-1/+7
| | | | | Change-Id: If35b1ef2c0eba424cbdf70e0405243c14d413bab Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Doc: sharing project settingsLeena Miettinen2011-10-314-2/+94
| | | | | Change-Id: Ibd1b35244346a9c868fe0a2b011085c234a6c4e1 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* C++: Fix findMatchingDeclaration for functions not in a class.Christian Kamm2011-10-311-3/+3
| | | | | | | | | That fixes navigation and the 'function signature update' quickfix for global functions and functions in namespaces. Task-number: QTCREATORBUG-6413 Change-Id: Ifc68a88a34eb363f4e84c72e9f72444d22df1086 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* QmlJS: Avoid an infinite loop if a qmltypes file has a cycle.Christian Kamm2011-10-312-8/+25
| | | | | | | | | | | | | The qmltypes files shipped with libraries shouldn't, but could define components that form a prototype cycle. Use of the new QmlObjectValue::prototypes() function avoids the code model getting stuck in an infinite loop for these cases. For plain ObjectValues this is already solved by using PrototypeIterator. Change-Id: I0f562672ab99b454bc3a0121c7a1b9eca43476bb Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* QmlJS indenter: Never touch indent of multi-line strings.Christian Kamm2011-10-317-14/+43
| | | | | | Task-number: QTCREATORBUG-6368 Change-Id: Iae68427e429e625214bc0729aaaf313dc3371570 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Limit the length of shown search result line.Eike Ziller2011-10-312-3/+16
| | | | | | | | | | This e.g. avoids "lines" of several MB if file search hits a binary file. Task-number: QTCREATORBUG-6116 Change-Id: Ibf89a332bc82ddbdb2aeb83c4b3886e784dab4b8 Reviewed-by: Ralf Neubersch <neubersch@neubersch.de> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Remove unnecessary code.Eike Ziller2011-10-312-89/+0
| | | | | | Change-Id: I07a382696c57f5451645e854e55aa30e9e81326c Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Fix memory leaks (lacking destructors for uis)Jarek Kobus2011-10-289-0/+25
| | | | | | Change-Id: I07c2708d727d59286b0d625a4c0c318f18b03b93 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Code style selector improvementsJarek Kobus2011-10-285-72/+200
| | | | | | | | | | | | | Change layout in code style selector. Make it possible to see the values of built-in code style without a need to copy it. Built-in code style can be also modified after being copied inside code style editor. Task-number: QTCREATORBUG-6341 Change-Id: Ifcbf807d5730ccf9026e86572710d0cc0ccf9f1a Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Squish: Fix timing issue on linux (too fast to catch).Bill King2011-10-281-0/+1
| | | | | | | Change-Id: Ia52abf2de8ef35269c11c198351e5024eae01830 Reviewed-by: Christian Stenger <christian.stenger@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Bill King <bill.king@nokia.com>
* Doc: fix security issue in HTML templateLeena Miettinen2011-10-282-18/+0
| | | | | Change-Id: I2fbcb030195a9104eeba8b83037623103efdb5c0 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* debugger: re-enable sorting of source files, modules, and thread viewshjk2011-10-283-0/+3
| | | | | Change-Id: I5610be7e78593d345c1f79fff6b2a61b105f8fbc Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Harmattan: Use "mad" wrapper to call dh_clean.Christian Kandeler2011-10-281-5/+2
| | | | | Change-Id: Iddfc6de1e34ce08bbc5fe6601195b3206b120c27 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Do not try to evaluate examples or demos for Qt 5.Daniel Molkentin2011-10-281-0/+3
| | | | | | | | | | There is no good plan on how to expose examples and demos of Qt 5 other than using XML manifests. Thus, it's best to disable the fallback mechanism, as it can only break (see e.g. QTCREATORBUG-5472). Change-Id: I4cc1fa875297c3d368ae261f5404fa61301f172f Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* CODA: Increased timeout for Deploy stepPawel Polanski2011-10-281-1/+1
| | | | | | | | | The 2s work perfectly for most cases. However, while deploying via WLAN sometimes due to weak signal the 2s is not enough Change-Id: If3a8bfbf6c4a244e589c1620a5c953486a0524d0 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QMutableMapIterator uses map in destructor, use foreach.Friedemann Kleint2011-10-281-6/+3
| | | | | | Change-Id: Ie8737acaea614fdda66cb7642eaed21be41cae64 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix leakDaniel Teske2011-10-271-0/+1
| | | | | Change-Id: I5d7b0faf4c0331eb88f75a2f778eaa71ca8fa10a Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix bug with unclean paths with multiple .pro files in the same dirDaniel Teske2011-10-271-1/+1
| | | | | | | Task-number: QTCREATORBUG-6414 Change-Id: Idb9277e951270688766b1e569c7ae0f962b2e4c3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Don't show fallback examples if we do not have any installed.Daniel Molkentin2011-10-271-2/+6
| | | | | Change-Id: I296888ce0c98a38afc4b21554942aa579a56c95a Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlEngine: Engine State transitionsAurindam Jana2011-10-271-1/+7
| | | | | | | Rectify wrong state transitions for "Attach to QML Port". Change-Id: Ife55344fb5089513743ff14f6bb5f2cabeed0adb Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
View Lorry Controller Status