summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner.PropertyEditor: fix for point and pixel size2.8Thomas Hartmann2013-10-211-5/+18
| | | | | | Task-number: QTCREATORBUG-9769 Change-Id: I1a1a9ebbda78daec0a62cb2e7c7859a636da57dd Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Git: Fix crash on show stashOrgad Shaneh2013-10-171-1/+1
| | | | | | | | | | | | * show() is called with a QString reference to the model * And editor is opened, which triggers stateChanged() * stateChanged() updates StashDialog, which refreshes the model with an empty directory (another bug) * The QString name reference is invalidated => crash on access Task-number: QTCREATORBUG-10397 Change-Id: I0c4077f8c4fc90905568f80d1cd89f61c4cd2cba Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner.MetaInfo: fix handling of enum scopesThomas Hartmann2013-10-161-1/+14
| | | | | | | | | | | | | | The codel model does not provide enum scopes at the moment. As a fallback we use class names, but this fails if we use the original cpp class name from the <cpp> package. For this reason we always try to find an export with a package different from <cpp>. As a final solution the code model should be able to provide the enum scopes. Task-number: QTCREATORBUG-10114 Change-Id: I15396c83590426ab0b9b55c8646a89c8d5712683 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlDesigner: Support for enums in alias propertiesThomas Hartmann2013-10-164-5/+133
| | | | | | | | | | | | | | | | | | | | | | | | Enums in combination with alias properties were not supported. The QML Engine does not distinguish between bindings and enums in this case. We want to distinguish between bindings/expressions and literal enums. This is not possible with the current code model, so we use a list of hardcoded enum keys for Qt Quick. There a several issues we want to properly fix in the future. * Make the model aware of enums. Currently enums are strings (the key) in the model. This has historical reasons. Instead we should use a custom type registered to QVariant that handles the scope, key and integer value. * The code model should be fully aware of enums even in the alias case. Do not integrate this patch to 3.0 or master. Task-number: QTCREATORBUG-10114 Change-Id: I780a201202f0949b1e2eb2f2525ddb031e1cd18b Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Support for enums in alias propertiesThomas Hartmann2013-10-161-21/+139
| | | | | | | | | | | | | Also the qmlpuppet could not handle enums in combination with alias properties. Enums on alias properties are handled as bindings. This is just an intermediate solution until we refactor the handling of enums in the model. Do not integrate this patch to 3.0 or master. Task-number: QTCREATORBUG-10114 Change-Id: I022637285deb5ff13b61d761d89b3ae1201575db Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Fix names spelling in the contributor listViktor Ostashevskyi2013-10-151-4/+4
| | | | | | | | | Change-Id: I057f0ae070e4b66628dd2ff64aa716dc2000f594 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Dmitry Savchenko <dmitry.a.sav@gmail.com> Reviewed-by: Viktor Ostashevskyi <ostash@ostash.kiev.ua> Reviewed-by: Andrey M. Tokarev <andrey.m.tokarev@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Revert "EditorManager: Fix crash when closing an editor upon activation"Orgad Shaneh2013-10-0810-127/+13
| | | | | | | | | | | | | | | Deleting an editor while currentEditorChanged is apparently not a good idea. Use a queued connection instead. This reverts commits 243a6259618e69b8da9ac2438480c449754f7f77 and d9602ca550c53e60a5229bfec9539e41fa5a694c. Task-number: QTCREATORBUG-10190 Task-number: QTCREATORBUG-10235 Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Fix a crash on codestylesettingsjkobus2013-10-074-17/+44
| | | | | | | | | | | | | Task-number: QTCREATORBUG-10235 Instead of rely on ICodeStylePreferences::destroyed() signal, when all other objects might be in destruction phase, clear project code style settings explicitly, when project closes. Change-Id: I0dd6675d54c5495d4006acbc9ad12c95f1d0a00c Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Include the correct header for std::lower_bound.Thiago Macieira2013-10-061-0/+2
| | | | | | | | That is <algorithm>. Relying on indirect includes is bad, mmkay? Change-Id: I245885672004cd406f98c82231aaa38a5cfe464c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor/CppTools: Fix plugin tests.Nikolai Kosjar2013-09-308-8/+124
| | | | | | | | | | | | | | | Starting with commit 243a625 EditorManager::closeEditors() does not delete the editors anymore, but calls deleteLater(). When the call returns, all kind of checks fail since the editor widget destructor was not yet called. Fixed by providing and calling Core::Tests::closeAndDeleteEditors(), which explicitly sends QEvent::DeferredDelete to the widget. Change-Id: I3287abbe74ccf7d7a18b997a847701c8be17cb55 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* FakeVim: Ensure that enterFakeVim() is not called recursivelyhluk2013-09-261-2/+2
| | | | | | Task-number: QTCREATORBUG-10226 Change-Id: Ib58d43dc11071a5dc28bad53e13213a4413fca71 Reviewed-by: hjk <hjk121@nokiamail.com>
* Doc: move icorelistener docs from header to sourceLeena Miettinen2013-09-264-24/+61
| | | | | | | Edit for language and style. Change-Id: I6f22ae90e95537282e4833ca90775683e76e26cf Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: edit find plugin API docsLeena Miettinen2013-09-262-60/+63
| | | | | | | | Edit for grammar and style. Remove \brief commands from function descriptions. Change-Id: I1f8c861f2f202f0af9056d639d6807b68ac517a2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: edit macros documentationLeena Miettinen2013-09-263-13/+14
| | | | | | | | Edit to use standard wording. Use \a commands for attributes. Change-Id: I90262bc12fe601df81c33a9a49cc8d0e8005407e Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: edit coreplugin docsLeena Miettinen2013-09-2614-243/+281
| | | | | | | | | | | | Remove \brief commands for functions. Use standard wording for QDoc commands. Fix style and grammar issues. Use the \a command instead of the \c command for attributes in function descriptions. Do not use \returns, because it does not exist. Change-Id: Icd32b519670cb376e246bab3a58fe7e98d2529ea Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Squish: Stabilize suite_QMLSRobert Loehning2013-09-253-3/+15
| | | | | Change-Id: I2194054c9c87eeff3b039b34dc4498f5cb0a19e2 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* External Tools: Unexpect file change in any caseDavid Schulz2013-09-241-7/+6
| | | | | | | ... when the tool has finished. Change-Id: Ia3c03d083efd605d3f75a7246c1e03592656d04b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: edit qmljs docsLeena Miettinen2013-09-234-25/+27
| | | | | | | | Use standard wording, fix capitalization, typos, and style and grammar issues. Change-Id: Iac3faa59ef32aa2a8ec1857aed0d861701cbfbe7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix crash when opening generic projectPetar Perisin2013-09-221-1/+0
| | | | | | | target t is deleted inside removeTarget(t) Change-Id: I9d5a07d65a2cb0c47869edf3997a44a526b9930e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* EditorManager: Fix crash when closing an editor upon activationOrgad Shaneh2013-09-211-3/+2
| | | | | | | | | | | | | | | * activateEditor receives a pointer to the editor. * When currentEditorChanged is emitted (using a direct connection), closeEditor is called (because changes were reverted and the editor isn't needed anymore. * closeEditor eventually deletes the editor * Control is returned to activateEditor, which now references a deleted editor -> crash Task-number: QTCREATORBUG-10190 Change-Id: I9062f03c1c1550f0a8c0c49c226dedcfd252eb12 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Squish: Fix tst_debug_empty_main for MacChristian Stenger2013-09-202-2/+7
| | | | | Change-Id: I57cd9647d07cfbf823bdff63dd1c2f5c3050cb7c Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Fix usages of :OpenDocuments_WidgetRobert Loehning2013-09-182-0/+2
| | | | | Change-Id: I1dde01e3fc8fb5f696054f72c44bdc9387aad5c6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Fix openDocument()Robert Loehning2013-09-181-1/+1
| | | | | | | This uses the Projects view, not Open Documents Change-Id: I8695d170ed85939ce2d002270c3cb60d97954130 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Fix getToolTipForViewTab()Robert Loehning2013-09-181-7/+8
| | | | | | | Shortcuts will change when order of modes changes. Change-Id: I9ee71cefebd4f2404976a7728fd1c4b500efc0f9 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Added alternative color values to tst_qml_editorRobert Loehning2013-09-182-7/+21
| | | | | Change-Id: I00b7df0c33fc6553fe3dc3364c6bc4dc448d72a7 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Doc: edit qmldebug docsLeena Miettinen2013-09-131-12/+11
| | | | | | | | Use standard wording. Fix a typo and remove a repetitive QDoc command. Change-Id: I458c661e4798a468275b40294dc2a68d0b03fd50 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Squish: More debugging output for checkDebuggingLibrary()Robert Loehning2013-09-121-3/+8
| | | | | Change-Id: Iab745b8982c31a0fc53c7a2b5620816d7b491bea Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Avoid unstable values in tst_simple_analyzeRobert Loehning2013-09-121-1/+1
| | | | | Change-Id: I88869c41f11917ea6031c45403da261b5f017e47 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Prevent possible timing issueRobert Loehning2013-09-121-1/+2
| | | | | Change-Id: Ia13ae58792c73453b89b8288c5807448f7438c37 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: More output from tst_simple_analyzeRobert Loehning2013-09-111-1/+1
| | | | | Change-Id: I8dd924a427a63c5f80f7972a8b13a6ef7d3297d7 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Doc: edit projectexplorer API docsLeena Miettinen2013-09-1116-173/+213
| | | | | | | | | | Fix grammar, punctuation, and style issues. Use standard wording for QDoc commands. Remove \brief commands from function descriptions. Move some function descriptions directly above the functions, so that the \fn command can be removed. Change-Id: Iedf4f0041af24541a982241f99bd4906e86af916 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Doc: edit texteditor plugin API docsLeena Miettinen2013-09-113-7/+7
| | | | | | | | | Fix grammar and style issues and punctuation. Use the \a command instead of \param (not a QDoc command). Change-Id: Ib048f0219a2c857e5fc3fcd858afbcbd58819193 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Squish: Fine-tuning of tst_git_cloneRobert Loehning2013-09-101-2/+2
| | | | | Change-Id: I8fdf1e663c2149ec418c2e6760bac151c0d34847 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Doc: move documentation from header to source fileLeena Miettinen2013-09-102-19/+51
| | | | | | | QDoc does not look for documentation in header files. Change-Id: Id7f6a44112e2385989b62a9dd2ee3a18e0c0ff7b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Doc: edit qmldesigner designercore model API docsLeena Miettinen2013-09-105-125/+88
| | | | | | | | | | | | | | Do not use the \returns command as it does not exist. Do not use the \arg command (use \a instead). Do not use the \see command (use \sa instead). Do not use the \name command (could use \ingroup, instead) Remove \brief command from function descriptions for consistency (as it is optional). Fix punctuation, grammar, and style issues. Remove obsolete documentation and fix function signatures. Change-Id: I0bff8c00aefdcff451b2d1cefe8b99407bfb4222 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: edit qmldesigner designercore API docsLeena Miettinen2013-09-103-71/+59
| | | | | | | | | | | | Do not use the \returns command as it does not exist. Do not use the \arg or \param commands (use \a instead). Do not use the \see command (use \sa instead). Remove \brief command from function descriptions for consistency (as it is optional). Fix punctuation, grammar, and style issues. Change-Id: I11173b84146cccf7fe9ba29a521cea93e03a4424 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: edit qmldesigner designercore exceptions API docsLeena Miettinen2013-09-1011-54/+19
| | | | | | | | | | | | Do not use the \returns command as it does not exist. Do not use the \arg command (use \a instead). Do not use the \see command (use \sa instead). Remove \brief command from function descriptions for consistency (as it is optional). Fix punctuation, style, and grammar issues. Change-Id: I10d18ef05d4116730796f4d003010d78b44a6138 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: edit devicesupport plugin API docsLeena Miettinen2013-09-102-65/+62
| | | | | | | | | | | | Edit for grammar and style. Remove \brief commands from function descriptions. Move function descriptions to directly above the functions in code, so that the \fn command can be removed and need not be maintained. Change-Id: Idb5bdd1eccf657be689f9d6d1d7eb1ca36f8f1b7 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Doc: edit vcsbase docsLeena Miettinen2013-09-104-21/+26
| | | | | | | | Remove \brief for \enum and \fn commands. Use standard wording. Edit for style and grammar. Change-Id: I338567241ddc7f90feaaf058dcd4dc9afdb8ca93 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Squish: Remove failing lines for tst_openqt_creatorRobert Loehning2013-09-101-132/+0
| | | | | | | | | Fix is in master, so this won't ever be fixed in 2.8. Task-number: QTCREATORBUG-10045 Change-Id: I714832f8fbaa39aea6992c31a41e8dd4fe8dfb16 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Doc: fix punctuation in qtcomponents docs.Leena Miettinen2013-09-101-5/+5
| | | | | Change-Id: I99615577746ff8dcd4db740595438b23346654d4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: edit extensionsystem documentationLeena Miettinen2013-09-093-54/+73
| | | | | | | Use standard wording and fix some and style issues. Change-Id: I6c226f8b8600833666f1da34f1f1e71cb333f30a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Doc: move documentation from header to sourceLeena Miettinen2013-09-092-35/+79
| | | | | | | QDoc does not look for documentation in header files. Change-Id: Ibe20a39320a08e936cc4ede25678197c0cee2f4f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Doc: edit debugger API docsLeena Miettinen2013-09-097-13/+15
| | | | | | | | | | Remove \brief commands from function descriptions. Use QDoc commands for notes and lists. Write GDB in all caps. Fix punctuation and style and grammar issues. Change-Id: I7f5bf0f53ad643eb4e2981c0d4e39c453dff5558 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: edit utils docsLeena Miettinen2013-09-0914-83/+86
| | | | | | | | | | | | | | | | Use \a for all attributes in function descriptions to avoid QDoc errors. Do not use \param, because it is not a valid QDoc command. Do not use \returns as it does not exist. Do not use \brief for functions. It is not obligatory, so rather than add them for all functions, let's consistenly leave them out. Fix typos, grammar and style issues, and punctuation. Change-Id: Ib8f296f93976265bb93dbeab40c5b47156518122 Reviewed-by: hjk <hjk121@nokiamail.com>
* Doc: edit qtcreatorcdbext docsLeena Miettinen2013-09-093-8/+8
| | | | | | | | Fix capitalization, use standard wording, and fix some QDoc commands. Change-Id: Ic2e6cfd43b9aa24d69b2703334c3dc6fb2331299 Reviewed-by: hjk <hjk121@nokiamail.com>
* Doc: edit customwizard plugin API docsLeena Miettinen2013-09-095-24/+28
| | | | | | | | Use standard wording for class and function descriptions. Edit for grammar and style. Change-Id: Ia1872b044b4add0c7c057ed4495584bd2c91becf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: edit cpptools docsLeena Miettinen2013-09-093-17/+17
| | | | | | | | | | Remove \briefs from function descriptions and use standard wording in them. Use standard wording for \enum. Replace \param with \a. Change-Id: If429b6fc67ef6d1313c18f6111aa84f9c996189f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Doc: move bineditor docs from header to sourceLeena Miettinen2013-09-062-10/+41
| | | | | Change-Id: If654e4e426ed82c5969ec17c6865f597ef02ab4f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Squish: Fix killing of left-overs on testing machinesChristian Stenger2013-09-061-12/+13
| | | | | Change-Id: Ia7bbc5c1eb3d854343717349d8800a3fb14e3e20 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
View Lorry Controller Status