Commit Graph

406 Commits

Author SHA1 Message Date
Christian Stenger
03fece349b Tests: Fix plugin path for macOS
Change-Id: I085ddbbff09d52878b82f311381c13b94739e84c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-10-24 11:19:46 +00:00
Orgad Shaneh
bdc2b4b59f Remove hard-coded disabling of debug logs
Instead, set the default level of all logs to QtWarningMsg.

The call to setFilterRules overrides the user preferences in qtlogging.ini.

Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-10-13 16:36:58 +00:00
Ulf Hermann
2b582ed455 QmlJS: Fix reformatter test
Apparently the reformatting truncates any sequence of multiple empty
lines into one. That seems to be by design. Therefore, remove one of the
two adjacent empty lines from commments.qml. Also, don't invert the
actual and expected values in the test code.

Change-Id: Id87c6fa0b2c7a03884d42d109b7d55f5040a927a
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-12 08:09:51 +00:00
Ulf Hermann
88074a4aa8 QmlJSEditor: Remove disabled qmllookup test
This test has been disabled since Qt4 times and is unfixable. In order
to test lookup of QML types, we need to write a new test.

Change-Id: I13909c277d0b9552c158b74529c350cb28fb3794
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-11 11:59:41 +00:00
Ulf Hermann
51adb199ab QmlJS: Fix and enable remaining pieces of importscheck test
Change-Id: Idaaf19cee1a0a971b9c3bf5ad3371a68ebd81f40
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-11 11:13:29 +00:00
Ulf Hermann
b6195f3de7 QmlJS: Fix case-fallthrough.qml test
The warning about strange interactions between QtQuick1 and QtQuick2
doesn't exist anymore, and I don't see why it would show up in that case
anyway. QmlJS::StaticAnalysis::Type used to have a member 324, and the
comment references that.

Change-Id: I4f0a256588919a146068b8771954bcabf0468dbc
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-09-11 10:31:31 +00:00
Orgad Shaneh
f615c9aa42 QmlDesigner: Remove outdated Qt version conditions
Change-Id: I7fa3147afbdc07814f8710a44140072e7bbd8511
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-05-11 12:41:20 +00:00
Marco Benelli
9678ea5755 QmlJs: add test for code model
Change-Id: I3e60274dcce578a170e12d44533e6f83e77d448a
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2018-04-27 08:27:03 +00:00
Marco Benelli
a874cf581d Qml/js reformatter: use quotes in objects literals
The reformatter used to remove the quotes that wraps the property name
in object literals.  This causes problem when the name is not a
valid identifier, resulting in that valid code become invalid after
reformatting.
This patch forces wrapping of property's name in quotes: in this way,
the reformatted code is consistent and it never get invalidated.

However the resulting formatted code is not consisted with the one
formatted by previous versions.

Task-number: QTCREATORBUG-17455
Change-Id: I1e361102819055de210d6c81020f204c08aaa253
Reviewed-by: Markus Maier <markus.maier.sw@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-04-05 06:50:03 +00:00
Marco Benelli
b9d72a5737 qmljs: remove remaining references to QtQuick1
This patch removes all references to QtQuick1 in qml library,
plugin, designer, profiler and tests.

Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-04-03 14:40:30 +00:00
Orgad Shaneh
27063168ad QmlDesigner: void static -> static void
That's the order everywhere in the codebase.

Change-Id: I62e57f2ddddd6e4fac0dc26d81b05839cf80a9db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-12 06:35:58 +00:00
Christian Stenger
32188f448a QmlDesigner: Fix compile before Qt5.10
QString::back() was introduced in Qt5.10.
Beside this fix the signature change of void checkNode().

Change-Id: I4945e618274e1a67fc36d33e875c14284a4b160c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-09 06:33:06 +00:00
Thomas Hartmann
cf82b8e685 QmlDesigner: Allow annotations in comments
This patch allows to store the auxiliary data of model nodes
as meta data in the QML file.
The meta data is encoded in a comment at the end of the QML file.
By default such meta data is attached to the clipboard.

Change-Id: I794d2c1297d270c5c1099c6c1be98b6b7a7f650b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-03-08 11:19:01 +00:00
Christian Stenger
cafb0760f6 Tests: Fix compile with Qt5.11
Function to convert char[] into QString has been deleted.

Change-Id: Iedf5db322b907d4ea1a20cc5c70394388d54f214
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-02-13 08:47:45 +00:00
Christian Stenger
0fcbe60cd6 Tests: Fix qml import check
Change-Id: I7fcf4a3b718c3b2124171187cdb06493c84ff7b8
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-12-19 13:51:35 +00:00
Tim Jenssen
d5342eff77 fix property spelling
Change-Id: I00f84ec8d2c83d7f3937d2e21a24e02ba28991b3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-17 10:38:08 +00:00
Orgad Shaneh
b57372f2b5 Replace include guards with #pragma once
Change-Id: Ic36cf0e9cac61d4d9a7e4434192944f5301b8aaa
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-06-28 08:07:56 +00:00
Eike Ziller
88897f3a87 Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
2017-04-19 09:56:14 +02:00
Montel Laurent
5d27bc747b Use QFileInfo::exists(...) which is faster that QFileInfo(..).exists
Change-Id: I0d2e61d84c74e60ef4f54074a4ca00f2d0835562
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 13:18:28 +00:00
Marco Benelli
d0823cd5e2 QmlJs: fix reformatting of 'signal' statements
Reformatting 'signal' preceded by comments used to bring to a bad
formatted file.

Task-number: QTCREATORBUG-17886
Change-Id: I02e093a4721cd1e75d45b498ea768251aee88ea4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-07 05:32:20 +00:00
Marco Benelli
f8688a478e QmlJs: update test for VisualItemModel
Change-Id: I6402e3870b3103e8c0423ecb6f064d050367d8ad
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-03 11:33:36 +00:00
Marco Benelli
592262ecdd QmlJs: test for delegate in ListView
Change-Id: Ifce93261fb2a532213cd011b7923f1ca38f00f6a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-03 11:33:22 +00:00
Thomas Hartmann
5e43e6c6ae QmlDesigner: Disable QML compiler for tests
Change-Id: Ia0c9a0241b5c2dd11a3a0c0f667adcdef9706191
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:15:06 +00:00
Tim Jenssen
5d159639eb QmlDesigner: remove warning
Change-Id: I253261d8fc18f856afc10d737de58da21cb7fbf0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-06 13:41:07 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Christian Stenger
2475da1bb5 Replace some more occurrences of QStringList() << pattern
Change-Id: Ic7193ac3a741763479a9ef129ed05cb7ca64f1e9
Reviewed-by: hjk <hjk@qt.io>
2017-02-08 14:27:48 +00:00
Marco Benelli
96c7d6f8f4 qmljs editor: test for reformatter
Add test cases for multiline comments.

Change-Id: I3e02560791b331c7e1892e9c0bb50cd64241a2bb
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2017-01-31 09:55:50 +00:00
Thomas Hartmann
f9f74566a7 QmlDesigner: Do not escape "\" for unicode chars
Task-number: QTCREATORBUG-12616
Change-Id: If8cac8d35cb97f59e12d1609f808dd639f93f315
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 13:12:07 +00:00
Tim Jenssen
5ad0cbc070 QmlDesigner: remove unnecessary save method
Change-Id: Ia2a195c84ce83bc3a83155cc19b0585475a5547a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-06 11:26:27 +00:00
Tim Jenssen
75f867b9bf QmlDesigner: Implementing changing the type of a node in the model
The type of a ModelNode can now be changed in the model.
The rewriter can already handle the case and the NodeInstanceView
does a reset.
We still have to expose this new feature in the UI.

Change-Id: I9bc405d40b123f257324ba582a4451fbd395f24f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 11:44:57 +00:00
Tim Jenssen
f8618740a8 QmlDesigner: fix make check at qmldesigner tests
Change-Id: Ibadfb2f37c5b67fd5e12bcad4180e68aa8843aa6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 16:55:38 +00:00
Tim Jenssen
9de96a9997 QmlDesigner: just skip not working test
Change-Id: I90b279a16a082d4dbb6e5bc45ae1a573d2f85bee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 16:55:31 +00:00
Thomas Hartmann
003a8985a2 QmlDesigner: Adjusting tests
We do not allows ids like "text" and "item" anymore,
since they are ambiguous. This patch adjusts a couple of tests.

Change-Id: I93a1404c052a8f1d302c179141c6feb35e83afc8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-20 09:39:56 +00:00
Tim Jenssen
1898ba5ad3 make library defines more consistency
Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-12 14:48:34 +00:00
Thomas Hartmann
f69a466534 QmlDesigner: Adapt test to api changes
Change-Id: I1340d5a9654f4f757790206fe010004adb6ea236
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-28 11:35:16 +00:00
Oswald Buddenhagen
424639ecac make resource file handling able to deal with QMakeProject's VFS
resources.prf may create virtual qrc files when RESOURCES contains
non-qrc files.

Change-Id: If591de9b32b775059d67e94bc3cb06d23ee44b08
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 17:34:55 +00:00
Eike Ziller
02a39c013f Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	src/plugins/ios/iostoolhandler.cpp
	src/shared/qbs
	src/tools/3rdparty/iossim/iossim.qbs
	src/tools/3rdparty/iossim_1_8_2/main.mm

Change-Id: Ied9cafec4f1ee93d9e524f095f5c6b1480b2f054
2016-10-17 16:16:07 +02:00
Oswald Buddenhagen
e4fd1f2e0c fix build of qmldesigner coretests against namespaced qt
Change-Id: I6fcd87a4f1a3e59994ca13d559a215b789f02e96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-14 14:24:34 +00:00
Christian Stenger
f7e4c2fb4c Tests: Fix compilation
Introduced with c1e3fd9f3e.

Change-Id: I5a760efa5c6e300ad5a4b5951492e57b03d0b50c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-10 05:19:30 +00:00
Orgad Shaneh
ed12120bf2 QmlDesigner: Fix test compilation
Change-Id: I092b28d10af15edff77a6806cd71554cc5be0d73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-29 23:58:48 +00:00
Thomas Hartmann
325f63c732 QmlDesigner: Implementing dynamic node properties
The model now supports dynamic node properties. e.g.:
Item {
    property Item item: Item {
    }
}


In this case Property::dynamicpropertyType() is Item and
Property::isDynamic() is true.

To create such a property I added:
NodeProperty::setDynamicTypeNameAndsetModelNode().

It is not supported to reparent nodes in an out of
dynamic node properties. The model throws an exception in this case.
This is currently not required on the application level and not
supported by the rewriter.

Change-Id: Ie05325663c481d8583dc45bee38b559c190fbb30
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-22 10:57:29 +00:00
Marco Benelli
11dea636a0 QmlJs code model test cases
Change-Id: If9ee9a946fc973a6dcc47625f5b26ca0a203be42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-09-05 07:13:36 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Oswald Buddenhagen
45b854dbd5 enable c++11 really globally
... and remove all instances that became redundant now.
this excludes everything that comes from outside qtc, or looks like it
could "leave" it.

Change-Id: Idc8baad17cd1ffdc5e160ec48ea3292d633a2562
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-02 07:52:38 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
2016-07-22 15:18:00 +03:00
Christian Kandeler
572b874941 Autotests: Fix qbs build
Change-Id: I362ab24a4f0d74073aef754ffbf60a7c8758af95
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-18 04:51:17 +00:00
Eike Ziller
7e1b4ccebb Merge remote-tracking branch 'origin/4.1'
Change-Id: I041b949aff8bee481a572ba6f7e2ef72b9010923
2016-07-15 14:10:38 +02:00
Christian Stenger
6063c185cb Tests: Provide qbs file for newly added test
Change-Id: I0b6c41b8c8dbb3ef84bd106aa26357267f5de9a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-15 04:38:40 +00:00
Christian Stenger
7583557dcc Tests: Fix test when using shadow build
Change-Id: I82ebdbd63a221802f24b2ef17ca6c076151fba0c
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-07-15 04:38:33 +00:00
Thomas Hartmann
e1f9cba249 QmlDesigner.Test: Adding test for implicit components
Implicit components like delegates have to be marked by the rewriter.

Change-Id: I5b9c3e14f26c817e058f2db1e955333d43208719
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-13 12:35:41 +00:00