Commit Graph

41907 Commits

Author SHA1 Message Date
Thomas Hartmann
2f7e85ebcf QmlDesigner: Change the priority of projects and kits
First we try to find a project that contains the document.
We fallback to the current project.
If the kit of the active target is invalid we return 0.

Before any newly created qml file used the fallback puppet.

Change-Id: Ide3333455d85418459924e507f4f5e77afae4188
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:46 +00:00
Thomas Hartmann
231404ecac QmlDesigner: Change signature of DesignDocument::fileName()
Change-Id: I58041af21f20373adf88ec5d2b5b3af785e3faff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:37 +00:00
Thomas Hartmann
e55119bb3a QmlDesigner: Add missing return to DesignDocument::contextHelpId()
Change-Id: I51e3b08efeda4da8cd2aee84e832a5f8c110b8bb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:31 +00:00
Thomas Hartmann
80eb278765 QmlDesigner: Rename SLOT to different name then the signal
Change-Id: I79857fb7fb76ab6bb5c4f2d668c30a6552cadb00
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:25 +00:00
Thomas Hartmann
2c32e57877 QmlDesigner: This fixes a UI glitch in the toolbar
For some reason
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)
fixes a styling bug in the toolbar.

Change-Id: I8ac219a0896d36ce5632eee1542b37fc577673ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:19 +00:00
Thomas Hartmann
418bd3e7e6 QmlDesigner.Rewriter: Adding warning
Change-Id: Ife1542a61abbd1b333ce1fa46854d95de252f288
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:12:38 +00:00
Thomas Hartmann
8cdfc4e097 QmlDesigner.Rewriter: Cleaning up the warning code
The class is renamed to RewriterError and moved outside of RewriterView.
Reason: Inner classes cannot be forward declared in C++.

Changing RewriterView::Error to RewriterError, because inner
classes cannot be forward declared.

Change-Id: I51e3b08efeda44a8cd2abe84e833a5f8c190b84e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:12:32 +00:00
Thomas Hartmann
9b4512f906 QmlDesigner: Implement debugOutput
Change-Id: I081866dcba41a8cbed1243dd9e235aca5c30beee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:12:26 +00:00
Thomas Hartmann
c64657da22 QmlDesigenr: Collect qrc urls and create mapping for the qmlpuppet
We collect all possible qrc path and the mappings provided by
the code model in the TextToModelMerger.
Then we set this mapping as environment variable for the puppet
in the PuppetCreator(QMLDESIGNER_RC_PATHS).

Change-Id: I4b4c7253af23d1f32a75394d04199e76f2e9efdd
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:12:20 +00:00
Thomas Hartmann
165ced5568 QmlDesigner: Improve puppetcreator error handling
Change-Id: I79e62ed497cca2a0c82ccd6bafa8c1ae77245baa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 08:35:41 +00:00
Tobias Hunger
80e60a5be5 ToolChainManager: Demote previously auto-detected ToolChains to manual
Demote previously auto-detected toolchains to manual detection if
the binary is still found but no longer auto-detected.

This should address the bug were toolchains stayed around after they
were deregistered with the sdktool (without de-installing the binaries).

Task-number: QTCREATORBUG-12751
Change-Id: Ifcc8de0691c0b0839b8bf887a2a934c41101febe
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 14:52:24 +00:00
Tobias Hunger
03ad5ccc44 ToolChainFactories: Remove some code that is not necessary
Change-Id: I2cd3940960bad385bc2bf70959df57847dcd101f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 14:45:40 +00:00
Tobias Hunger
c275dac084 Rename toolchain type constants in ProjectExplorer
Change-Id: I56f5b7373846bb091456c050eb1ff3495ca2dd72
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 14:44:07 +00:00
Tobias Hunger
e6d1141e1e ToolChain: Get rid of type() in favor of typeId()
Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 14:40:03 +00:00
Tobias Hunger
3b364f70e8 Fix build of puppetcreator
Change-Id: I12fc3f6a94d3c3d9049f5a78252ee2a80e90d803
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-07-14 14:10:27 +00:00
Thomas Hartmann
045d1496b5 QmlDesigner: create error output file for puppet builds
Change-Id: I140820702d11e5bc20e6063bdee13411a5f2eeaa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 14:05:06 +00:00
Tobias Hunger
6eec39c308 ToolChainFactory: Rename id() to typeId()
This is the same as ToolChain::typeId(), so it should have the same
name.

Change-Id: Ifd344825be801aff3dab96bfe924a1984a77bbee
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 14:00:32 +00:00
Thomas Hartmann
da5f911751 QmlDesigner: Add default implementations to AbstractView
This allows us to remove empty implementations in the views.

Change-Id: I65f815dc5bd699d3b8a782881a2cdd5b01fb76ee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:34:40 +00:00
Thomas Hartmann
ed49f54880 QmlDesigner: Remove unused include
Change-Id: Ibd0643a8508b791aa22e0197f7bed6cc9c521777
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:32:00 +00:00
Thomas Hartmann
388bfa22a8 QmlDesigner: Improve lookup for context senseitive help
Change-Id: Ic3cb05dd639548a81c1b45f35e2ee32348e54dcc
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:53 +00:00
Thomas Hartmann
095b1a22fe QmlDesigner: Move QmlWarningDialog to the QmlDesigner namespace
Change-Id: Ic8fa31ded61992f05ceeee7f5cab85022e9b3d99
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:43 +00:00
Thomas Hartmann
acac9cb89a QmlDesigner: Cleanup
Change-Id: I571325fd98ed555abc19f87ac8a164d7e0c76288
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:38 +00:00
Thomas Hartmann
94eff1ddae QmlDesigner: Add typdef PropertyTypeList
Change-Id: I253b2e0c4af942a8c697b1998c9656495e80f799
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:26 +00:00
Thomas Hartmann
41cec55d20 QmlDesigner: Keep export property alias if changing id
If the id of a ModelNode is changed the expression of an exporting property
(property alias id: id) is changed but not the property name.
So we get property alias oldId: newId.

To keep the exports consistent this code adjusts the property name
to the new id.

Change-Id: Ibd9c9f4a2e755fbfb7beeed458ea45270db7f666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:19 +00:00
Thomas Hartmann
f6d6db5b4c QmlDesigner.Rewriter: Clear the cache at every qml load
Already cached items from a possible wrong
environment(kit, default kit, ...) have to be cleared.

Change-Id: Ibd0643a8508b791aa22e0197f7bed6cc9c521066
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:12 +00:00
Thomas Hartmann
0f382b7ef2 QmlDesigner.Rewriter: Improve warnings
Change-Id: I18598953e59a8fe1c7847b4d16bf863aec578636
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:31:05 +00:00
Thomas Hartmann
823f7ff8b9 QmlDesigner: Support Layout attached properties and expressions
Change-Id: I4518579364915a91e38c7748857d435a67fd00aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:30:56 +00:00
Thomas Hartmann
75de75b346 QmlDesigner: Blacklist imports in import manager
Those import do not make sense in the designer.
So the user should not add them.

Change-Id: I253b2e0c4af942a8c697b1968c9656495e80f719
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:30:48 +00:00
Thomas Hartmann
2221257306 QmlDesigner: Add list of known global enum scopes
We know that TextInput and TextEdit are enum scopes. Currently
there is no other way (than hardcoding) to identify those scopes, if
they are used for controls (And the actual type is int).

Change-Id: I8eccc54d3b7a90428a71c882364a04e5d1030988
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:30:40 +00:00
Thomas Hartmann
dd32d1a16e QmlDesigner: Add error channel from puppet -> designer
Change-Id: I57c325fd98ed505abc19f87ac8a164d7e0c76244
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:30:23 +00:00
Tobias Hunger
6d81730764 ToolChainFactory: Add typeIdFromMap and use it in factories
Change-Id: Id3254bcb3a5c426540bbab49dc61545031af6826
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-14 13:27:31 +00:00
Thomas Hartmann
468337c56b QmlDesigner: Move PuppetBuildProgressDialog to the QmlDesigner namespace
Change-Id: Ic8fa31ded61992f05cceee7f5cab85022e9b3d77
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:00:40 +00:00
Thomas Hartmann
b3b6d3fc71 QmlDesigner: Change signature of our exceptions to use QByteArray instead of QString
This allows to use macros like __FUNCTION__ for the exceptions
if QT_NO_CAST_FROM_ASCII is defined.

Change-Id: Ib629482bb60502cb311cb2657f1a73c730daf6aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 13:00:32 +00:00
Thomas Hartmann
2dc48cb4ae QmlDesigner: Move PuppetDialog ui files to the QmlDesigner namespace
Change-Id: Ic8fa31ded61992f05cceee7f5cab85022e9b3d66
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 12:28:08 +00:00
Thomas Hartmann
749e5a00b1 QmlDesigner: Add QmlItemNode::isInLayout()
Change-Id: I3823c000599db2b1ed326463d4310c94b96f5466
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 12:27:55 +00:00
Thomas Hartmann
d3992542b3 QmlDesigner: Add isAliasExport to BindingProperty
Change-Id: I64ebe10541957f712b86a998e922a24111ad4a88
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 12:27:50 +00:00
Thomas Hartmann
473c7d65d1 QmlDesigner: Adding override
Change-Id: I4c0443a212de2b82087295405317d6bce1c0f3eb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 12:27:45 +00:00
Thomas Hartmann
2b0ffa3448 QmlDesigner: Remove export alias properties recursively
If a child node id have an export alias property this one was not deleted.
Now we delete the export alias properties of all child nodes.

Change-Id: Ica66a199e8a8d6615208e56dc46ee3de807ddcaa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 12:27:40 +00:00
Thomas Hartmann
00f8b9ee23 QmlDesigner: Fix lookup of navigator icons
The version check was simply wrong.
The version of the used item might be higher then the version in the
item library. We can still use the icon.

I removed the version check completely. There is no reason to have different
icons for different versions. This just increases the complexity and
introduces bugs without any reason/use cases.

Change-Id: Ib6d2040490739ee903ffe8eb308cd942b96444aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 12:27:28 +00:00
Thomas Hartmann
10bbc00873 QmlDesigner: QT_NO_CAST_FROM_ASCII fixes
Change-Id: Ife1552a666bbb1b3333e1fa46854d95de252f2aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:26:15 +00:00
Thomas Hartmann
a1c1d7d26f QmlDesigner: Trivial QT_NO_CAST_FROM_ASCII fixes
This are the "trivial" low risk fixes for QT_NO_CAST_FROM_ASCII
in the Qt Quick Designer.

Change-Id: Ife1542a61abbd1b323cecea46854d95de252f2bb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:09:21 +00:00
Thomas Hartmann
d31e77be26 QmlDesigner: Remove using namespace QmlJS::AST from AddArrayMemberVisitor
Change-Id: Ife1542a61abbd1b323ce1fa46854d95de252f2a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:08:32 +00:00
Thomas Hartmann
2d6399383b QmlDesigner: Remove using namespace QmlJS::AST from AddObjectVisitor
Change-Id: Ife1542a61abbd1b323ce1fa46854d95de234f2aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:08:27 +00:00
Thomas Hartmann
717a5a13c2 QmlDesigner: Remove using namespace QmlJS::AST from ASTObjectTextExtractor
Change-Id: Iff1234a61abbd1b323ce1fa46854d95de252f2a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:05:08 +00:00
Thomas Hartmann
056c4db900 QmlDesigner: Remove using namespace QmlJS::AST from ChangeImportsVisitor
Change-Id: Ife1542a61bbbdbb323ce1fa46854d95de252f2a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:05:02 +00:00
Thomas Hartmann
ff54bc0b5f QmlDesigner: Remove using namespace QmlJS::AST from ChangePropertyVisitor
Change-Id: Ife1542a61abbd1b323ce1fa46854e95de252f2ab
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:04:38 +00:00
Thomas Hartmann
54a10d2a37 QmlDesigner: Remove using namespace QmlJS::AST from MoveObjectBeforeObjectVisitor
Change-Id: Ife1542a61abbd1b123ce1fa46854d95de252f2ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:02:34 +00:00
Thomas Hartmann
3c3003bef0 QmlDesigner: Remove using namespace QmlJS::AST from MoveObjectBeforeObjectVisitor
Change-Id: Ife1542a61abbd1b323ce1fa46854d9595252f2aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:02:29 +00:00
Thomas Hartmann
9b475d7f10 QmlDesigner: Remove using namespace QmlJS::AST from ObjectLengthCalculator
Change-Id: Iff5542a61abbd1b323ce1fa46854d95de252ffaa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:02:23 +00:00
Thomas Hartmann
f9a0f9abd9 QmlDesigner: Remove using namespace QmlJS::AST from QMLRewriter
Change-Id: Ife1552a666bbd1b333ce1fa46854d95de252f2a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 11:02:17 +00:00