feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,509 Commits 108 Branches 368 Tags
76bf971cb9545793d56bc7805622a4d5d4871711
Commit Graph

2079 Commits

Author SHA1 Message Date
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
Christian Kamm
813846232b C++11: Allow for brace initializers like T v{1, 2}. 
And add a basic test.

Change-Id: I3b8b87d51a9da154758d17380bba5922795f675c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-17 14:47:14 +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
Robert Loehning
b99fd060e1 Squish: Updated tst_simple_debug 
Change-Id: Ida1508c5e2f15a3fc79066d5133b91c0f9e3affa
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-13 13:57:54 +02:00
Eike Ziller
9b6852ff0c Merge remote-tracking branch 'origin/2.6' 2012-09-13 13:16:07 +02:00
Christian Stenger
75ee870259 Squish: Use global objects.map from inside SCOM 
Change-Id: Ib789dd239fb7dfbb684e2f97607aa30de205fe0b
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-13 10:02:46 +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
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6' 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
 2012-09-12 17:27:37 +02:00
Christian Stenger
77a6b71f72 Squish: Use global objects.map from inside QMLS 
Change-Id: I5c37408bc3a0e232d7f2a70e01db510725f99df1
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 17:22:39 +02:00
Christian Stenger
7f98c517e1 Squish: Use global objects.map from inside HELP 
Change-Id: I3df21777eb06e002de318c094741e3ff878a5f17
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 14:08:44 +02:00
Christian Stenger
7218a2b428 Squish: Fix for UI change 
Change-Id: Ie3d0c8deae67020d7adcd2bd69807f190bc0be0a
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 12:56:47 +02:00
Christian Stenger
e98a947998 Squish: Use global objects.map from inside CSUP 
Change-Id: I70b80f926d01f801f842cd45ca3710b9d16de273
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 12:45:15 +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
Robert Loehning
e16eb7ea43 Removed unneeded and mistyped HTML 
Change-Id: I49f50fc213b88af478c1411933630eb705898c23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-09-11 08:19:33 +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
hjk
19a7f66df3 debugger: add gnuplot based display for QVector 
Change-Id: Ic24a0d77906a59bc2c216ef0d6dd655695e2033e
(cherry picked from commit 41ac231ddfbabec6c09101345cf4d1370646f027)
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-10 12:16:46 +02:00
Robert Loehning
394f6d2db6 Squish: Updated getConfiguredKits() 
Change-Id: I3f9dc08ce45eb773366a05de96a685a82266a54b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-07 16:08:03 +02:00