Editor: Draw column wrap line after drawing ifdef blocks

Task-number: QTCREATORBUG-12940
Change-Id: I431176c1879236bc107a2c1db11890da5d75f750
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Fix keyboard selection shortcuts on Qml/JS Console

Change-Id: I804df07c711de62c6c8e34810aa17a7ed86f2011
Task-number: QTCREATORBUG-12956
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
SdkTool: Fix "get" for complex types

Change-Id: I8dd8101e33da4a2bdb0bf36f4217f1c466583b47
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Squish: Include new Qt Quick templates

Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Squish: Stabilize tst_CSUP06

Change-Id: I68071a5e8964c89a61a4dfe310fdbd7bb5fd1b8a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
SdkTool: Fix warnings

Change-Id: I2a16bdff7b184e0988d9147f01075c87f8eb1309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Fixed creation of mapping files for winphone 8.1

Change-Id: I42f97f8f629b6ffbf48a01409605853f60a9c02b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Fixed font deployment for winphone 8.0

Change-Id: I8d7a2debfec3bbd06780458a29f11031dd9b862c
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
qmljs: always add environment paths to the qml vContexts

Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
qmljs: highlight properties with inline qml components

Task-number: QTCREATORBUG-10892
Change-Id: Ifbf5675ab53de54f6f38c07726f5ad400f6ee9d6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
QmlDesigner.PropertyEditor: Change default editor for color

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>
QmlDesigner: Fix regression for import paths

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>
Templates: Remove wrong version information

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.PropertyEditor: Change step size for reals

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>
QmlDesigner.Navigator: Crash fix

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.Navigator: Fix reordering in case of invisble nodes

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.Puppet: Adding size hints to Window mockup

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: add more specifics

Fix: QTCREATORBUG-12798

Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
QmlDesigner.TextToModelMerger: Fixing comparison of QVariant

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: Adding a manual test for plugin integration

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>