summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix ambiguous shortcuts in the Git submit editor.Friedemann Kleint2012-10-051-2/+2
| | | | | | | Task-number: QTCREATORBUG-7965 Change-Id: I4f1988a1f3bac7afe1d7195a74bdb874b1041344 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Christian A. Reiter <christian.a.reiter@gmail.com>
* Remove special characters from installer licenseEike Ziller2012-10-051-9/+9
| | | | | | | | Task-number: QTCREATORBUG-7954 Change-Id: Ib188f80994ceea252bba02d1e6ac2b0f32a84157 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* hasCopyright: Creator does not use GPL licenseTobias Hunger2012-10-051-2/+2
| | | | | Change-Id: I24ce89117812a7f15913dc092687910a39da9358 Reviewed-by: hjk <qthjk@ovi.com>
* Inspector: Select only known objects for 4.xAurindam Jana2012-10-051-5/+12
| | | | | Change-Id: If052b4a018d5d0c20086a0251d7d1b206e7d4192 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* SSH: Work around issue with dynamic_cast.Christian Kandeler2012-10-057-27/+81
| | | | | | | | | | | | | | | | | | It has been observed that on MacOs, a dynamic_cast from Botan::Public_Key to Botan::RSA_PublicKey reproducibly fails even though it should definitely succeed. This happens with both gcc and clang on different Macs, but on no other platform. The problem could not be reproduced with an example project. The workaround is to move the allocation of the respective object from the client side to the Botan library itself. In addition, the following actions were taken to guard against similar problems in the future: - Also move to Botan the allocations of all other objects that are potentially dynamically cast. - Use shared pointers for these objects, so the deallocation also happens inside Botan. Change-Id: Ie595a56a239a41e2629b6ff631de59910b8244dd Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove feedback link.Eike Ziller2012-10-053-38/+0
| | | | | | | The form has vanished and wasn't up to date anymore anyhow. Change-Id: I40292593e8e705da0b5e47f54ab6c1a519144404 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: added some Mac OS commandsLeena Miettinen2012-10-051-11/+14
| | | | | | | The screenshots are now taken with a Mac and the text looked wrong. Change-Id: I3b2358255eee752cdb6b0a21b7fb802916011771 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* "Find Usages" and "Refactor" may decode error.raidsan2012-10-051-5/+11
| | | | | | | | Task-number: QTCREATORBUG-7204 Change-Id: I6ce82c701246ddac9cadcdd22ef994b0086ce8f7 Reviewed-by: Andre Hartmann <aha_1980@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CMake and Kits: Fix interaction between themDaniel Teske2012-10-0512-215/+413
| | | | | | | | | | | | | | | On initial run we offer the user a choice between all the kits, which are compatible with the cached generator. After the initial run, the user can't change kits nor generators anymore. Except if the builds into a new directory or adds a buildconfiguration, then the user can choose between generators but not kits. Task-number: QTCREATORBUG-7940 Task-number: QTCREATORBUG-7928 Change-Id: I9b663435cd2e021f7fe08379c1c487a6aebe8976 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
* Update copyright check scriptTobias Hunger2012-10-057-39/+147
| | | | | | | | Use perl instead of bash and avoid lots of rereading of the file, making the script much faster to run. Change-Id: Ic898f324b2952c593b89d8efca8ea1e344cf5858 Reviewed-by: hjk <qthjk@ovi.com>
* debugger: fix QMap dumper/gdb pretty printer for Qt 5hjk2012-10-051-3/+63
| | | | | Change-Id: If1b2dcb6d517b837a135fbdb97cde422122464c3 Reviewed-by: hjk <qthjk@ovi.com>
* debugger: fix display of QObject object names for Qt 5hjk2012-10-051-1/+4
| | | | | Change-Id: I58ad709575f4846812de3e2109112be170e8e433 Reviewed-by: hjk <qthjk@ovi.com>
* Qt4BuildConfiguration: Fix extractSpecFromArguments with symlinked dirsDaniel Teske2012-10-051-0/+1
| | | | | | | | | | The canonical form of the -spec argument is a relative path if the mkspec is a child of the mkspec dir. Since we resolve all symlinks for the mkspec, we must do the same for the mkspec dir. Task-number: QTCREATORBUG-7908 Change-Id: I24628c2d49ff7ad078caa6fd3896cb407d0d7906 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* QNX: fix image size checks in project wizardKevin Krammer2012-10-051-9/+39
| | | | | | | | | | | | Upcoming BlackBerry devices require larger icon/splashscreen sizes than the ones the plugin code was originally created for. Use place holders in error strings to avoid further string changes on future size changes Change-Id: I1065fa68eeba4e03a60fee85da6dbb8922160af8 Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QNX: Fixup bar-descriptor.xml filesTobias Nätterlund2012-10-055-25/+10
| | | | | | | | | - Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH - Make application ID depend on project name Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* debugger: fix build of manual test app with Qt 5hjk2012-10-041-1/+1
| | | | | Change-Id: I58f63941038978b665455025313faafc851bccc8 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* QmlDesigner: fix runtime warningThomas Hartmann2012-10-041-2/+3
| | | | | | | m_controlShape is not in any scene. Change-Id: I5047bf43cf33be409c7644ff03beee3e04ffbd60 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: crash fixThomas Hartmann2012-10-041-1/+1
| | | | | | | | | | | 1000ms is too long. It was possible to close the designer before the 1000ms finished. 100ms make it impossible to close the designer fast enough to trigger the crash. Change-Id: Ie12b406298350551551b36cb021b560eeeba7ecf Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Add Close button to window asking what to do with changed documentsTobias Hunger2012-10-043-2/+7
| | | | | | | | | | | Add a close button to window asking what to do with documents that were changed outside Creator. Finally a simple way to get rid of open moc-files that trigger this window over and over again:-) Task-number: QTCREATORBUG-7360 Change-Id: I7a373ed60d85d810caf6604bc7dae7bb7fa186a9 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix removal of temporary Qt versions and kitsTobias Hunger2012-10-041-9/+12
| | | | | Change-Id: Icae877d0c809ce6952b47d51e575930696738349 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ClearCase: Fix top level optimization for unixOrgad Shaneh2012-10-041-2/+4
| | | | | | | | Also use the optimization for snapshot views as well. Change-Id: Ic8c2d9f874f09b6b3b4a50eb8c5d396f10ecd6cd Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* FileName: Fix isChildOf for some corner casesOrgad Shaneh2012-10-042-0/+46
| | | | | | | empty directory has no children, and root directory was not handled correctly Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Adapt to moved online documentation.Eike Ziller2012-10-041-1/+1
| | | | | Change-Id: I4186502f0615ee16340a6cabc9c61d7a9ff4836c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: updated screenshots because of term changes in the new project wizardLeena Miettinen2012-10-0410-0/+0
| | | | | Change-Id: I145f2849db8b1a488b4af51f0f136cfa6ac12b67 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* CMake: add Ninja supportPeter Kümmel2012-10-049-38/+212
| | | | | | | | | | | | | | The cmake wizard proposes also ninja if ninja support is available Ninja must be in PATH, but it is only called once, so it doesn't hurt. Task-number: QTCREATORBUG-7720 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Change-Id: If3c9c7ae55e6990fa16b031fc2998a8d8d9ed17a Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Backup foreign .user files before overwriting themTobias Hunger2012-10-041-12/+6
| | | | | | | At the very least data can be restored that way. Change-Id: I3a75783f9988fee7cd3571ed6e57c3cc0c86e0e8 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix having several unconfigured projects at onceTobias Hunger2012-10-041-3/+1
| | | | | Change-Id: Idac6b09d9b8d3371070490b68fe116e94f0fda72 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Make sure to save settings when closing managersTobias Hunger2012-10-042-0/+3
| | | | | | | | This is needed to catch any updates that were triggered during tear down of the UI (which happens after the saveSettings signal was emitted). Change-Id: I9f14e8807070f3192551a3653bad31072db539f5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Warn when failing to restore auto-detected tool chainsTobias Hunger2012-10-041-1/+5
| | | | | Change-Id: If9582c35a35322efcd0d1666a6e52a62df98af21 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Warn when dropping tool chainsTobias Hunger2012-10-041-0/+1
| | | | | Change-Id: I5246852f77f13791e7dfc8af781da69789519116 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Doc: remove Qt Simulator from the build and run example tutorialLeena Miettinen2012-10-042-18/+9
| | | | | Change-Id: Iadb961ec0c74529f0afe278e5e46473e22c05979 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* debugger: use a more robust method to detect function pointershjk2012-10-041-1/+1
| | | | | | | | The previous one was failing on 'this' pointers of instances of classes templatized on function pointers. Change-Id: I2be50db5be643974f318fb6999136f5c7a4cfc1c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Get rid of some Q_WS_X11.Nikolai Kosjar2012-10-047-15/+3
| | | | | | | | | | | | | This macro isn't defined in Qt5 anymore, so use Q_OS_* where appropriate. Regarding bug QTCREATORBUG-7936: Now the fonts look normal again on GNU/Linux, e.g. in the text editor and the application/compile output pane. Task-number: QTCREATORBUG-7936 Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* GDB build: Remove symbian targetOrgad Shaneh2012-10-043-3/+3
| | | | | Change-Id: Id15d42d9447221be85baff92d08823d3fff4c3da Reviewed-by: David Schulz <david.schulz@digia.com>
* Do not loose device settings in Kits when adding a new deviceTobias Hunger2012-10-022-0/+18
| | | | | Change-Id: I1947726b67c5f9474b0052c25ea8dca494f4c6b4 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Make kit config tidy againTobias Hunger2012-10-021-1/+1
| | | | | | | | Do allow kit config to become "tidy" again after a change made it dirty. Change-Id: I764093c2ce199633d8f67bea0e4747d6b0bfd2b7 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix isDirty detection of tool chain config widgetTobias Hunger2012-10-021-1/+1
| | | | | Change-Id: I17046315b286dd4c224f7465da0ec981941c77d5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix crashes when cyclic inheritancePrzemyslaw Gorszkowski2012-10-024-1/+166
| | | | | | | Task-number: QTCREATORBUG-7933 Change-Id: I98469a092ff3ff0acc69800e9aade4ebb268332a Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* German translation for 2.6.Friedemann Kleint2012-10-021-199/+291
| | | | | | Change-Id: I8cbb07c76c730cf40d6099b3cd26ebc82923931c Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Added test for automatic conversion from "." to "->"Robert Loehning2012-10-024-0/+63
| | | | | Change-Id: Ib1cd24818b691fc4ccd43b60ff4afdd4e0394fde Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Editor: Fix resizing of proposal widgedDavid Schulz2012-10-022-0/+22
| | | | | | | | | Stop resizing width on scrolling the proposal widget via drag of the scrollbar. Task-number: QTCREATORBUG-7925 Change-Id: I948a0ec1bba8a9294b8a65b5eaa72063bbede48f Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Device support: Ensure UI changes are always propagated to the device.Christian Kandeler2012-10-027-9/+45
| | | | | | | | | | | | | | | | The original problem was that we cannot assume QLineEdit::editingFinished() is emitted when clicking a button while a QLineEdit has the focus (QTCREATORBUG-1675). The original solution to that introduced two more bugs, namely that changes are not visible in other tabs until the dialog has been closed and reopened and that pressing "Apply" also applies changes that are done later and which the user intends to revert by by pressing "Cancel" (QTCREATORBUG-7288). This patch intends to fix all of these issues. Task-number: QTCREATORBUG-1675 Task-number: QTCREATORBUG-7288 Change-Id: I569a89f64843e08ee389e3eba6bdcb473ba22393 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix "Apply function signature change" for boost::shared_ptrPrzemyslaw Gorszkowski2012-10-021-1/+2
| | | | | | | | Problem was with nested template type(in this case shared_ptr<T> is nested template type) Task-number: QTCREATORBUG-6784 Change-Id: I8ea9203f2b1fbde73d9ac4e6c8cdeb2b6e0afcef Reviewed-by: David Schulz <david.schulz@digia.com>
* QmlInspector: Fetch data when neededAurindam Jana2012-10-012-24/+36
| | | | | | | | | | | Fetch data on demand for 4.x. Since, parentIds are not known, the tree will be reset when new objects are created. Related changes in Qt side: https://codereview.qt-project.org/#change,35982 Task-number: QTCREATORBUG-7779 Change-Id: I8b53604979bbbc2e6f01bc7b785929811a76f398 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Small string fixRobert Loehning2012-10-011-1/+1
| | | | | Change-Id: I06fadcc2643b16a59adb962f134c259aa3991c39 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Prevent modal dialogs from locking up in Qt 5.Friedemann Kleint2012-10-012-2/+4
| | | | | | | | | | | | When choosing "Manage kits" from the wizard, the settings dialog locks up when using Qt 5 since 2 modal dialogs execute on the mainwindow. Task-number: QTBUG-27206 Change-Id: I69b756fed48983ec7217452b2f6c3049a520f1c3 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* tr()-fixes for 2.6.Friedemann Kleint2012-10-012-4/+4
| | | | | | Change-Id: I6ad0e25d084cfccde6776c8d4cdaae43ea071b55 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* TypeHierarchy: Make type hierarchy independent of editorTobias Hunger2012-10-012-39/+14
| | | | | | | | | This makes it possible to close all editors and still have the typehierarchy visible. It used to close for no apparent reason. Change-Id: I4d1500b5402905c6a04623ea60247c9d746acab8 Reviewed-by: David Schulz <david.schulz@digia.com>
* UI text: fix capitalizationLeena Miettinen2012-10-011-4/+4
| | | | | Change-Id: I16419b21a7414c0e97238d33c433a88233076cf5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* UI text: fix capitalization for debugger stringsLeena Miettinen2012-10-014-20/+20
| | | | | Change-Id: If70418319529f75e893f3d5b60cb7dfa6a739dca Reviewed-by: hjk <qthjk@ovi.com>
View Lorry Controller Status