summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Update qbs submodule.Christian Kandeler2014-09-111-0/+0
| | | | | | | | | | | | | | To HEAD of 1.3 branch. Change-Id: I474a2cdfbc99a82cd075ee785d2530a8a5f012e4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | SSH: Fix tunnel test.Christian Kandeler2014-09-111-1/+2
| | | | | | | | | | | | | | | | Since we're opening the port for IPv4, we must also use an IPv4 host address. Change-Id: I73e009ebd6deb0bd6804cddc8c83299dbfc1b312 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | SSH: Adapt test to signal renaming.Christian Kandeler2014-09-111-1/+1
| | | | | | | | | | | | | | This was overlooked in the original patch. Change-Id: I1709e28552ed9dd83bd3e810ba51ef5ec95d8580 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | SSH: Do not always emit an error if an SFTP channel exits.Christian Kandeler2014-09-111-0/+3
| | | | | | | | | | | | | | | | Channel exit is completely normal if we closed the channel, so this must not cause an error message. Change-Id: I57f5165b339a52a25118ad5e357f41334dadebc4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | SSH: Fix maximum packet size check.Christian Kandeler2014-09-111-3/+5
| | | | | | | | | | | | | | | | The statement in the RFC was misunderstood. Task-number: QTCREATORBUG-12884 Change-Id: Icd533362ebf95d963cacc8d11da03360e742f070 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | QmlDesigner.PropertyEditor: Fix regression in SliderSpecificsThomas Hartmann2014-09-111-1/+1
| | | | | | | | | | Change-Id: Id71d3ec192a030ead81bb7746681b18cb9d79e27 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner: Allow negative spacings for positionersThomas Hartmann2014-09-114-8/+8
| | | | | | | | | | Change-Id: I610127421b071a4bf4ed0d21aeab2b2f0c089d28 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.Instances: Do not use Qt kit for fallback puppetThomas Hartmann2014-09-111-1/+2
| | | | | | | | | | Change-Id: I825c7f2380a376b30cc647942aa7d252aa9d36df Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Doc: update Qt Quick version numbersLeena Miettinen2014-09-111-2/+2
| | | | | | | | | | | | | | | | | | Make references more generic, because the templates are frequently updated to import latest Qt Quick and Qt Quick Controls versions. Change-Id: Ic3e6744c960fe8f953abf2aaddd2c7498bdb1f38 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Doc: fix labels and tooltipsLeena Miettinen2014-09-112-14/+14
| | | | | | | | | | | | | | | | Fix capitalization, punctuation and typos, and remove unnecessary text. Change-Id: Iee39e465125d5d9eec099323fb7d75756c8d81df Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.PropertyEditor: Allow centering and anchoring at the same timeThomas Hartmann2014-09-101-8/+16
| | | | | | | | | | | | | | | | | | With this patch center anchor and right/left/top/right anchors can be used at the same time. Task-number: QTCREATORBUG-11455 Change-Id: I3114eb76bdfc4226e78fd711e04849d7d7d7cd38 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | ClearCase: Initialize checkout dialog after sync has finishedOrgad Shaneh2014-09-101-5/+6
| | | | | | | | | | | | | | | | If it is initialized too early, activities combo is empty. Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Only insert SideBarWidget for existing idThomas Hartmann2014-09-101-1/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-12974 Change-Id: I69cacab32de0454a78c5a67edcc7dcbbdcb12784 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlJS: Add error message for invalid root item in the designerThomas Hartmann2014-09-104-0/+26
| | | | | | | | | | | | | | | | | | Documents with those types do crash the qmlpuppet and confuse the users. With this patch we give a clear error message and such files are not supported anymore. Change-Id: Iba19def2751d4dc81d90684c0c63c0274fdf49cf Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | QmlDesigner: Adding UI option for fallback puppet.Thomas Hartmann2014-09-103-27/+48
| | | | | | | | | | | | | | | | | | This patch adds an option to configure the usage of qml(2)puppet. By default the qml(2)puppet that comes together with Qt Creator is used. Change-Id: Idada8457e81fa17d3290dc97ded303aab475a9f3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Doc: Clear a number of documentation warningsTopi Reinio2014-09-102-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc gets confused about the contents of doc_src_plugins.qdoc, mistaking some of its code for QDoc commands. To work around this problem, change the file to be a qdoc include file, wrap the code blocks with \badcode, and refer to them using \include. Using \badcode will also turn off code highlighting and autolinking, something that is not desired for these code snippets. Change-Id: I6c3b65ef098ec6f6f06892d78a3abb38e0d28ca3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | QmlDesigner: Adding a manual test for plugin integrationThomas Hartmann2014-09-097-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we had a couple of regressions in this area, I add this project for manual testing. In this project we have a qmlproject with a plugin that contains a .metainfo file and a custom property sheet. We define two items in the item library: MyComponent and MyComponent2. While MyComponent has a custom property sheet the property sheet for MyComponent2 is auto generated. Change-Id: I8d5ade43f648354175587c0a3e989bad87149298 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.TextToModelMerger: Fixing comparison of QVariantThomas Hartmann2014-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | n the case of custom types, their equalness operators are not called. Instead the values' addresses are compared. This is not want we want. Instead we have to cast and compare our custom types manually. This fixed a couple of QTC_ASSERTS. Change-Id: I3a82b84744f9b8860b7efaeb203475bb9dba5d11 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner: add more specificsTim Jenssen2014-09-098-92/+288
| | | | | | | | | | | | | | Fix: QTCREATORBUG-12798 Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.Puppet: Adding size hints to Window mockupThomas Hartmann2014-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | Without defining the properties, the properties do not work and do not get notified properly. They are also missing defaults which breaks "resetting". Task-number: QTCREATORBUG-13004 Change-Id: Ib36f39770930be486225b45169d2ebdb53df8df4 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.Navigator: Fix reordering in case of invisble nodesThomas Hartmann2014-09-083-30/+7
| | | | | | | | | | | | | | | | | | | | If the model contains nodes that are invisible in the navigator (e.g. QtObject) updateItemRowOrder() does not work correctly. To avoid complexity we update the subtree in this case. Change-Id: Ia40ce061e9188ef9ad6ca54ce3444432b878ddf6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.Navigator: Crash fixThomas Hartmann2014-09-081-1/+3
| | | | | | | | | | | | | | | | | | Objects which are not an Item are not visible in the tree view. In this case model() is 0 and Qt Creator was crashing when detaching the navigator view. Change-Id: I144c940d76157defb27133673ed911d733d8b5ef Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | QmlDesigner.PropertyEditor: Change step size for realsThomas Hartmann2014-09-081-0/+1
| | | | | | | | | | | | | | | | the default step size of 1 does not make much sense for reals. Task-number: QTCREATORBUG-12985 Change-Id: I28be2ca8de37f1032e8fbbe785913ae5a8f6be33 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Templates: Remove wrong version informationChristian Stenger2014-09-085-5/+5
| | | | | | | | | | | | | | Change-Id: I7379f79d22335d6faf0db845cdde863c5888300b Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner: Fix regression for import pathsThomas Hartmann2014-09-0810-33/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The imports paths used by the sub component manger and meta info system were not correctly resolved. The main reason was that the textDocument in the text modifiers are just plain text buffers and do not containt any url for the document. This patch removes importPaths() from the TextModifier. The ViewerContext can be stored in the TextToModelMerger and does not have to be recreated when needed. Change-Id: I17281caee23ddd51f6e36d5346bc3bd7c53005e8 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | QmlDesigner.PropertyEditor: Change default editor for colorThomas Hartmann2014-09-081-1/+2
| | | | | | | | | | | | | | | | This template breaks the layout and is currently unusable. Therefore we replace it by a string editor. Change-Id: I0818d006a4516f34954d5406ee4074664e909891 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | qmljs: highlight properties with inline qml componentsFawzi Mohamed2014-09-081-1/+6
| | | | | | | | | | | | Task-number: QTCREATORBUG-10892 Change-Id: Ifbf5675ab53de54f6f38c07726f5ad400f6ee9d6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | qmljs: always add environment paths to the qml vContextsFawzi Mohamed2014-09-081-0/+7
| | | | | | | | | | Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fixed font deployment for winphone 8.0Oliver Wolff2014-09-051-3/+19
| | | | | | | | | | Change-Id: I8d7a2debfec3bbd06780458a29f11031dd9b862c Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Fixed creation of mapping files for winphone 8.1Oliver Wolff2014-09-051-10/+21
| | | | | | | | | | Change-Id: I42f97f8f629b6ffbf48a01409605853f60a9c02b Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | SdkTool: Fix warningsChristian Stenger2014-09-051-1/+2
| | | | | | | | | | Change-Id: I2a16bdff7b184e0988d9147f01075c87f8eb1309 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Squish: Stabilize tst_CSUP06Robert Loehning2014-09-051-0/+1
| | | | | | | | | | Change-Id: I68071a5e8964c89a61a4dfe310fdbd7bb5fd1b8a Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Include new Qt Quick templatesRobert Loehning2014-09-054-5/+15
| | | | | | | | | | Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | SdkTool: Fix "get" for complex typesOrgad Shaneh2014-09-051-1/+36
| | | | | | | | | | Change-Id: I8dd8101e33da4a2bdb0bf36f4217f1c466583b47 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix keyboard selection shortcuts on Qml/JS ConsoleKai Koehne2014-09-041-2/+6
| | | | | | | | | | | | | | Change-Id: I804df07c711de62c6c8e34810aa17a7ed86f2011 Task-number: QTCREATORBUG-12956 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* | Editor: Draw column wrap line after drawing ifdef blocksVicken Simonian2014-09-041-19/+20
| | | | | | | | | | | | Task-number: QTCREATORBUG-12940 Change-Id: I431176c1879236bc107a2c1db11890da5d75f750 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Squish: Provide test for ClangCodeModel pluginChristian Stenger2014-09-043-1/+220
| | | | | | | | | | Change-Id: I4bf45cf838baa89b558292ca9d08ec184e80c20d Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* | Do not build UpdateInfo pluginEike Ziller2014-09-031-5/+5
| | | | | | | | | | | | | | | | It is broken, and people should not even be able to manually enable it. Change-Id: I990922b1a514e43ed7e4b951ee230306e031f942 Task-number: QTCREATORBUG-11262 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | VariableManager: Hopefully fix crash with int variablesEike Ziller2014-09-031-1/+2
| | | | | | | | | | | | | | | | Capturing const references in lambdas is potentially dangerous. Change-Id: I4b4ddc8dcb1e839e4ed919caccdf0010ed8e6a34 Task-number: QTCREATORBUG-12948 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | QmlJS: Use canonical paths for matching of import directoriesKai Koehne2014-09-034-11/+20
| | | | | | | | | | | | | | | | | | We rely on string comparison for detection of QML import paths. Therefore make sure that all paths are canonical. Change-Id: I416bc31915644a888c416d726049668b0e71f29a Task-number: QTCREATORBUG-12902 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | QmlJS: Remove undefined methodKai Koehne2014-09-031-2/+0
| | | | | | | | | | Change-Id: I06439c81bf7b194a2e32d1301e71a2c26e163d03 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | QmlJS: Don't use QDir::separator() for internal pathsKai Koehne2014-09-035-6/+6
| | | | | | | | | | | | | | We use forward slashes in all internal paths, even on Windows. Change-Id: Ie0b418c770dad96829dd357fe425616b6d3a5b82 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | SettingsAccessor: Fix discarding user sticky settings on 3.1->3.2 upgradeOrgad Shaneh2014-09-021-0/+5
| | | | | | | | | | | | | | ... when both the shared and the user file are older than 3.2. Change-Id: I9e16d67c2b566c43060cb9e05f02ea3a5343065f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Squish: Continue testing other files after fatal errorRobert Loehning2014-09-021-1/+6
| | | | | | | | | | Change-Id: I2e8709a84882dde5a6bc96b4bd213581175c6c8c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | RemoteLinux: Fix mixed debugging.Christian Kandeler2014-09-022-18/+25
| | | | | | | | | | | | | | | | | | | | The QML part was broken due to recent changes relating to gdbserver "multi" mode. Task-number: QTCREATORBUG-12928 Change-Id: Ia806f0cbfedd6961138f7cd89a0387bd851ff83e Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Fix behavior of debugger run widget.Christian Kandeler2014-09-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | The logic checking the other check box if the only checked one is being unchecked was faulty, only updating the UI but not the actual state. As a result, both C++ and QML were switched off, resulting in interesting behavior when starting a debugging session. Change-Id: Ifd61f7080ad70f816fa80b416f8594f057c299d4 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QbsProjectManager: Fix crash when an install step is removed.Christian Kandeler2014-09-012-0/+14
| | | | | | | | | | | | | | | | The object has already been deleted when the stepRemoved() signal comes in, so we call disconnect() on a dangling pointer. Change-Id: Ife5192f9edbde3d42c96dbcae60d7eb03b051745 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | German translation of 3.2 branchRobert Loehning2014-09-011-2545/+3397
| | | | | | | | | | Change-Id: I634d31d3dd6421b5afdd32350513c61bf7ad683b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Squish: Test opening of QBS projectRobert Loehning2014-09-014-1/+5902
| | | | | | | | | | Change-Id: I980ad15147f419b2d42d86b2a62ebf2875a3c2d8 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Debugger: Don't use document with AST from indexing snapshotNikolai Kosjar2014-08-291-4/+1
| | | | | | | | | | | | | | ...since the AST will be released at some point from another thread. Change-Id: I71d20228ebec71e98dca3474452677ec63ffe4c6 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
View Lorry Controller Status