Commit Graph

4400 Commits

Author SHA1 Message Date
Christian Stenger
2a7b28a3b9 Squish: Fix getConfiguredKits()
Change-Id: Ie8a38eedac3e89abbe0bfb659ccc57bb7a30990d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-09-25 13:44:09 +02:00
Thomas Hartmann
7fee2d7a34 Tests:QmlDesigner: fixing changeGradientId
Attaching a second RewriterView is not allowed.

Change-Id: I54055b36f86cd1cff0313edfd405c128c5783705
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 12:58:13 +02:00
Thomas Hartmann
2f0f887acc Tests.QmlDesigner: fixing testStatesBaseState
We have to process events to ensure that the correct
data is actually delivered by qmlpuppet.

Change-Id: I5a8b18d20ced5c7b9279868c53fbee698a752b74
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 12:58:02 +02:00
Thomas Hartmann
facd24c6b5 Tests.QmlDesigner: fixing defaultPropertyValues
Image does not exist have a revision 1.1.

Change-Id: I012cf4e3636239665b45369717fba8c3c61c0352
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 12:57:49 +02:00
Robert Loehning
4a1be4d0b9 Squish: Fix in tst_create_proj_wizard
Change-Id: I6d8541f1e734bc1f425456b22b2b392f181a62c7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-25 12:08:16 +02:00
Christian Kamm
47d2558f6f C++11: Fix bug with parsing ctor initializers.
Task-number: QTCREATORBUG-7919

Change-Id: I12307c3fb6c20424c8b5aaf564a031924c755d25
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-25 11:03:18 +02:00
Robert Loehning
543a29fef6 Squish: Added Harmattan Kit
Change-Id: I01f95b250a9e708a58793f1fc859cd1152624bae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-09-24 17:48:02 +02:00
Thomas Hartmann
c620ea67f0 Tests.QmlDesigner: compile fix
This header file is not needed and was moved
by recent refactoring.

Change-Id: I0899de93be4e6f03c42d94e128feaa203a12063d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-24 12:23:48 +02:00
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
Christian Kamm
a81389356e C++11: Fix and add test for simple decltype uses.
Change-Id: I7f843fa96e33671ecb135b9db6f68d9f2cbf2fac
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-24 12:08:25 +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
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
2012-09-19 18:02:46 +02:00
David Schulz
44177392ec Debugger: Add missing continue to simple test
Change-Id: Ief142db796db9392d7d910c98c0dd1425e5f1230
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 16:35:40 +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
Christian Stenger
93fb2928d6 Squish: Added new test cases/suite for welcome page
Change-Id: Id01582e881b8150a76336bb4f3ea6511c4bcd249
Done-with: Jan Kerekes
Done-with: Pavol Grainda
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-09-19 16:16:08 +02:00
Christian Kamm
aa645254a2 C++11: More (expression-list) or brace-init-list.
This time in the 'new' expression. Changed it to make
new C(1, abc...) and new C{1, abc}
work.

Change-Id: I7232798fd083b653ee04ef9ede386d6536133e16
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 12:23:18 +02:00
Christian Kamm
83da5f68be C++11: Allow for typename Foo<T>{}, Foo{} and int{}.
As a postfix expression.

Change-Id: I65cae0571080a9fb699af61c661328ef06f97890
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 12:21:31 +02:00
Christian Kamm
2aa27e6d22 C++11: Make expression-list expand to initializer-list.
This will fix a couple more places where brace-init-lists and
pack expansions are allowed but are not currently accepted by
the parser. For example:

foo(abc...);

now parses correctly.

Change-Id: I93710cef35154fea8437329f3174e4a2d56637b8
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 12:20:58 +02:00
Christian Kamm
0c3acb80c8 C++11: Allow brace-init-list in default argument declaration.
Change-Id: Iab707d855f98982697365f9a4cd7832877e64d17
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 12:20:15 +02:00
Christian Kamm
392c80c6e4 C++11: Fix use of >> in template arguments.
Change-Id: Ic99ca897e7a3b9c82cf8c5093a90bf9c88dbb0ed
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:58:34 +02:00
Christian Kamm
44c9cef30a C++11: Make 'enum struct', enum-base and opaque enum decls work.
For declarations like:
enum struct Foo : long int;

Change-Id: Id813efdbc31c8d70a4b40bb0101dc33a8dd2556a
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:57:23 +02:00
Christian Kamm
8711121197 C++11: Parse alias declarations.
The parser no longer fails declarations like:
using Foo = std::vector<int>::iterator;

Change-Id: Ib3a552ebbe0147fa138db6448a52cdba8f9b9207
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:56:33 +02:00
Christian Kamm
9bd86e7d68 C++11: Allow brace-init-list in range-for statement.
Also drop the unused 'initializer' member from
RangeBasedForStatementAST.

Change-Id: I078ebbc85cafa643af4bfe62d698bf7de71360e4
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:54:50 +02:00
Christian Kamm
ecd54059d3 C++11: Add alignof() expression.
Change-Id: Id3fb30b9a16ea724bab0d5b05e8cbddb0064e6eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:53:46 +02:00
Christian Kamm
1aed32d866 C++11: Fix indent of brace initializers in ctor lists.
Change-Id: Ib784df9e17ff2fe6bb249dcf8c2fee7310340f50
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:52:40 +02:00
Christian Kamm
8c1a45565c C++11: Accept ref-qualifiers in function declarators.
Means
void foo() const &; void bar() &&;
and the corresponding pointer-to-member declarators
now parse.

Change-Id: Idbf295bd4f51cd5d9e38efcac1940b8cc2e32fce
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:51:48 +02:00
Christian Kamm
b9f6f1bcf7 C++11: Allow uniform initialization in ctor init lists.
So
class C { C() : _x{12}, _y({12}) {} };
now parses correctly.

Change-Id: I4281dcb0541a86b550e74630cad6ae0a59fef1b4
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:47:49 +02:00
Christian Kamm
903ba378c2 C++11: Don't fail on = default and = delete initializers.
These are converted to IdExpr(SimpleName(token)) initializers.

Change-Id: I1e85c4b261ca028dc75ffe6c00e1090630c2957c
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:46:51 +02:00
Christian Kamm
0bdf1dc406 C++11: Allow brace initializers in return statements.
Like return {1, 2};

Change-Id: I7442da1866b0106bc075783653c95c16ebedb51a
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-19 11:46:09 +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
Christian Kamm
9b7d1901ba C++11: Allow brace initializers in assignment expressions.
Like:
var += {1, 2};
in a function context.

Change-Id: I3936c97c4fcb6b3dcac2979e0508d422d47fddfc
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-17 15:31:40 +02:00
Christian Kamm
342709a9cc C++11: Allow brace initializer lists in more places.
This allows them to be used in declarator initializers that expect
an expression list in parentheses. Like

T v({1, 2}, 3, 4);

Change-Id: I62e1ffd355ca88f7acbb8708c9b40c8310489ca3
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-17 15:16:56 +02:00
Christian Kamm
23a11e2ddb C++: Rename NewPlacementAST to ExpressionListParenAST.
It'll be reused as the initializer expression for declarators
that are followed by "( expression-list )".

Change-Id: I6c76a76641941874ef1ed21daa7b6e057c6d170f
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-17 14:53:20 +02:00