feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,241 Commits 108 Branches 368 Tags
c20c20f01277d1d0f7e452ee6ad7fd5f2bc34f3d
Commit Graph

311 Commits

Author SHA1 Message Date
Thomas Hartmann
102f915463 Tests.QmlDesigner: adding testBasicStatesQtQuick20 
Testing basic states for Qt Quick 2.0.

Change-Id: I86b4dbaffa3ec340eb175a1cd687eef465d87efe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 12:21:42 +02:00
Thomas Hartmann
3c42ca4138 Tests.QmlDesigner: adding testQtQuick20BasicRectangle 
Basic test for Qt Quick 2.0.
This time using Rectangle (different prototype chain).

Change-Id: I5500fa5d1a6e2d049404944be81f0b5657cefe3c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 12:21:30 +02:00
Thomas Hartmann
3c5b64a722 Tests.QmlDesigner: adding basic test for Qt Quick 2.0 
Change-Id: Id98be8ec130eb5adfcbd490600369e8353f168b8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-24 11:47:07 +02:00
Thomas Hartmann
e4114505ee QmlDesigner: fix regression uncovered by tests 
Fixing a regression in the meta info system.

We follow now Qthe Declarative1StateOperation convention (note the 1).
Since this data is provided by Qt Creator it is independent from any Qt
version. (4.8/5.1)

Also the type comparison was broken in NodeMetaInfo for <cpp> types.
PackageName() does retrieve the package name of the cpp type which might
be different from the one used in qualfiedTypeName().

Change-Id: I5cdae37c2024cdc89824e68168c16e2050051d06
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-20 12:01:20 +02:00
Thomas Hartmann
6fb9e90920 Tests.QmlDesigner: adding some QApplication::processEvents(); 
This is needed process all the events created by NodeInstanceView.

Change-Id: Ia2df51f5aafdc670e60a47064092123a1a100049
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:45 +02:00
Thomas Hartmann
96a41678c8 Tests.QmlDesigner: remove QSkip for working tests 
Change-Id: I85f61ff4b0ff5abcbff4ef766c4ca7706069bdbc
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:35 +02:00
Thomas Hartmann
4cc46ef904 Tests.QmlDesigner: fix testSubComponentManager() 
Types names changed.

Change-Id: Ide7cc23289ab490ff272ca99ee048ccc6c99d335
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:29 +02:00
Thomas Hartmann
55b7759a93 Tests.QmlDesigner: fix loadEmptyCoreModel() 
Attaching more then one rewriter is not a good idea.

Change-Id: I3ec000836dc21029b43003c4636927086f267d10
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:22 +02:00
Thomas Hartmann
7b3b3adaff Tests.QmlDesigner: fix testModelBasicOperations 
We have to respect the meta info. So we create a Flipable.

Change-Id: I427cce93e1cb6fea7ac1c70b0c1020234af3494d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:14 +02:00
Thomas Hartmann
8a6c2a6001 Tests.QmlDesigner: fix testRewriterErrors 
Error {} was not an Error anymore since we ignore unknown types.
Rectangle does not have the property test. This triggers an error.

Change-Id: I838b12ba15c394a34f6f9176e5eb5826d54b0f2b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:01 +02:00
Thomas Hartmann
838a16d7c6 Tests.QmlDesigner: fix testModelResolveIds() 
We have to respect the meta info. "test" is replaced by
"acnhors.fill" for that reason.

Change-Id: I7b3c9784de0d9d5cbaf2cd811ebb427ffbbf4b70
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:29:37 +02:00
Thomas Hartmann
32c38a158e Tests.QmlDesigner: fix testRewriterChangeImports 
Qt 4.7 is no more. The test was broken for the alias import.

Change-Id: Ia642907802d03d379d6ea3bdeb9745241b6bc7fc
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:29:31 +02:00
Thomas Hartmann
2057892bd4 Tests.QmlDesigner: testBasicOperationsWithView 
We do not set the size of the root item to 100x100.
Since "out of process" the instanceValue of a node has no specfic
meaning anymore.

Change-Id: I953fb32816548a74631fcee8ae50a550514758c0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:29:23 +02:00
Thomas Hartmann
bd04f2edbf Tests.QmlDesigner: Qt 4.7 is obsolete 
Change-Id: If8cde21be29e2fe1a524171d98a2e6410391145a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 11:27:52 +02:00
Thomas Hartmann
c596151d7e Tests.QmlDesigner: Outdated test - we skip the "Component" node 
Change-Id: I41950436ff9db77e50cfb1601f63af401f7e2364
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 11:27:46 +02:00
Thomas Hartmann
6e0cfe39b1 Tests.QmlDesigner: NodeInstanceView has to run in TestModus 
Change-Id: I3f0710050c3010f74e6b9c67dec463b9f9e96625
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 11:27:39 +02:00
Thomas Hartmann
6d26d349c9 Test.qmlDesigner: add batch file to setup path 
Without qtcreator\plugins\Nokia\ in the path the plugin .dlls
are not found (qmljstools).

Change-Id: If63e6350d8b2e10cc754b914246031dcce47d2bb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-18 16:33:48 +02:00
Thomas Hartmann
4897839b6e Test.qmlDesigner: fixes meta info tests 
Some tests were broken. Most just worked.

Change-Id: I085d30b44ff2ecb2afa63233fe883657fdf2134b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-18 16:33:41 +02:00
Thomas Hartmann
deed11f392 Tests.QmlDesigner: fixing more meta info tests 
The tests were outdated.

Change-Id: I92bf43b32c3a81dedec405ac57f1a73412a4e100
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-18 15:46:34 +02:00
Thomas Hartmann
e024877e7a Tests: fix warnings 
Change-Id: Ib26931ba6d951ad36ca93758d8f5bfeb22d42179
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-18 12:45:18 +02:00
Thomas Hartmann
410ca98735 Test.qmlDesigner: fixing test testTypicalRewriterOperations 
The rewriter is stricter now and does not allow arbitray properties.
We have to respect the meta info.

Change-Id: I3ef852f6661c0113e11e17cd2f3ed5b3a5a71f72
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-18 12:45:10 +02:00
Marco Bubke
410b5cfa2a Qmldesigner.Test: Fix gradient type versions 
Change-Id: Ie8534060b59e28020f1b7d4fb55d3555b0c84a13
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-14 12:49:08 +02:00
Marco Bubke
44d7c848ec QmlDesigner.Test: Fix model creation to version 1.1 
Change-Id: I9a6d30291ca02c72a08da96dc9be5199f0800a55
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 16:33:18 +02:00
Marco Bubke
1550bab21a QmlDesigner.Test: Fix import version 
Change-Id: I2e53ed6c727c539e04565595614ebedb62a902ec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 16:33:04 +02:00
Marco Bubke
edab369be8 QmlDesigner.Tests: Don't use helper function for custom rewriter 
Change-Id: I7994cd830392fed347d0dd8aacc6d578823fcc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 15:23:12 +02:00
Marco Bubke
1c08fce320 QmlDesigner.Tests: Change version of states items to 1.0 
Change-Id: I0216319b6ce0ca63daa1365a90b259ebb4503761
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 15:09:56 +02:00
Marco Bubke
d93fb08f8f QmlDesigner: Fix rewriter tests 
Change-Id: Ic715e8f64bcc17785c972f41b8ab2e00438441b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-13 15:09:37 +02:00
Marco Bubke
09674e4707 QmlDesigner.Test: More test fixes 
Change-Id: I14f45e6a50c2caac696346e37b4fcd325829d0d4
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-12 20:48:20 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
 2012-09-11 14:02:03 +02:00
Christian Kamm
0df5933539 QmlJS indenter: Fix wrong indentation after list<> typed properties. 
Task-number: QTCREATORBUG-7726
Change-Id: If709a9a71cfed69e2f14af92c114f79d11d03145
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-10 14:21:57 +02:00
Marco Bubke
b21f7ca7e5 QmlDesigner.Test: Default size is zero 
I'm a little bit unsure about that.

Change-Id: I9f319b11b494c5101a3e6ed59543067b9b4052f1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 21:37:18 +02:00
Marco Bubke
7267aa1611 QmlDesigner.Test: Remove magic 
Explicit code is more readable than some short magic. Yes, that is not
cool, but in the end more maintainable. ;-)

Change-Id: Iac2f4e2dc3c4d7aa4d9be1f1e9d7dc3231d4d375
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 17:25:29 +02:00
Marco Bubke
ae72dae1e7 QmlDesigner.Test: Fix expression 
Change-Id: I2c88112ceccc18741207c2bd78f72c787a862eb5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 15:35:14 +02:00
Marco Bubke
4518552e7b QmlDesigner.Test: Change the version of the Rectangle to 1.0 
Change-Id: I56f7bfe3a8a7f43e08a6f59623f7da0cceb194d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 15:35:06 +02:00
Marco Bubke
a13c3aeb2f QmlDesigner.Test: Refactor model creation 
Change-Id: I58f615f30029d2554ed26518343a9b77b594bd0d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-06 15:34:54 +02:00
Marco Bubke
4f0c97d0d6 QmlDesigner.Test: Fix spelling 
Change-Id: I16fb26cd859c0292f1f01b2a87de59df45d2bada
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:55:15 +02:00
Marco Bubke
f2468e16b6 QmlDesigner.Test: Change qtquick version to 1.1 
Change-Id: Ief61ae32b2321637194e9ca9ea9064fd67956c06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:55:02 +02:00
Marco Bubke
d7b1928b67 QmlDesigner.Test: Fix type versions 
Change-Id: I2450094776b50dbaf7ad41807990d3505057ab8d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:54:49 +02:00
Marco Bubke
76323d6e1e QmlDesigner.Test: Fix type names 
Change-Id: Iff89e88db48cf4026142862590cbb5b7d7c0370e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:54:01 +02:00
Marco Bubke
f8430d3935 Qmldesigner.Test: fix plugin path 
Change-Id: I159886b1b487b3bf085d0ceab64ed0f075ea8833
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-04 19:52:53 +02:00
Marco Bubke
139d08b143 QmlDesigner.Test: Remove messages 
Change-Id: I8b72b60458957c8db698adf7742f5db34c65b2ac
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-04 15:41:11 +02:00
Marco Bubke
b19bebbfa5 QmlDesigner.Tests: Compiling again 
Change-Id: I85a7fc5c37d9beea6e2433a9fd2a3ef779f0d63c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-03 18:02:15 +02:00
Marco Bubke
26630c3de0 QmlDesigner.Tests: Fix formating 
Change-Id: I466a0e808fc7da8516421ee46c1a09ca1d0a0144
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-08-23 17:02:33 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug 
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Christian Kamm
ab64c1aef3 QmlJS indenter: Improve indentation of function expressions. 
As discussed with Tor Arne and Fawzi in
http://codereview.qt-project.org/#change,18080

Change-Id: Ia0482d2ed3ddd61fa002e2c76b948301af52a795
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-03-06 17:26:46 +01:00
Christian Kamm
658e80d1b8 QmlJS indenter: Improve handling of function expressions. 
Task-number: QTCREATORBUG-7001

Change-Id: I254b84153b042c81008314bbebc800edfe201b89
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
(cherry picked from commit fcaf3d4f4c)
 2012-03-01 17:00:02 +01:00
Robert Loehning
ff58b3102c QmlJS indenter: Fix hang with invalid code. 
Task-number: QTCREATORBUG-7005

(cherry picked from commit 0c597a6f07)

Change-Id: I2e343fbcc6931530e7db142bf6e268dac696970f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2012-03-01 08:27:40 +01:00
Christian Kamm
06e6d88b81 Fix compilation of QmlJS code formatter test. 
Done by moving ITextMark and ITextMarkable from itexteditor.h
to itextmark.h. The test uses parts of the texteditor plugin by
compiling some of its files. For that to work, the code has to be
fairly stand-alone. The reference to EditorManager in
itexteditor.cpp broke it.

Long term, the test should become a plugin based test to avoid this
kind of problem.

Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-02-28 15:47:11 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00