feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,591 Commits 108 Branches 368 Tags
b13f964fd5403d15ece89f89f9823dd19a2bc459
Commit Graph

326 Commits

Author SHA1 Message Date
Christian Kamm
97ad582c28 QmlJS: Add infrastructure for tests of QML static checker. 
Change-Id: Idf49bc0c29ad82456a5fe65e2acced6a4fb130fc
Reviewed-on: http://codereview.qt-project.org/4552
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 11:13:51 +02:00
Christian Kamm
f51efea40f QmlJS tests: Make basic test pass again. 
Change-Id: Iff7d36e7c7908b267fc02cd46e3f2a173ef5c7b9
Reviewed-on: http://codereview.qt-project.org/4547
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 11:03:46 +02:00
Christian Kamm
16b4a6fe73 QmlJS indenter: Fix labelled statements and break/continue with label. 
Also do some cleanup to make handling of substatements nicer.

Change-Id: I78773fc81d9b0058fa97c5cef393cca34b7fd885
Reviewed-on: http://codereview.qt-project.org/4413
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 11:02:45 +02:00
Christian Kamm
62a71b75a0 QmlJS indenter: Fix indentation for property initializers. 
property int foo: {

used to start an object literal but is a block statement now.

Change-Id: I9ffbce4927b444314f1a43aba65ca3d9d234e47c
Reviewed-on: http://codereview.qt-project.org/4339
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-08 13:55:08 +02:00
Christian Kamm
9dc9674c6b QmlJS: Share Context. 
Previously Context was not entirely thread safe and had to be
copied locally. Now it is thread safe and its lifetime
managed by QSharedPointer.

The non-safe parts were moved into ScopeChain in a previous commit.

Change-Id: I851a93de85cbd6391dbea0fe33b011e2e093addb
Reviewed-on: http://codereview.qt.nokia.com/1695
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-08 12:05:19 +02:00
Christian Kamm
f3a45d7b55 QmlJS: Fix basic code model test. 
Change-Id: If62153e9db56e65e10d008d49f0945d3ea77c4f4
Reviewed-on: http://codereview.qt.nokia.com/1502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-07-12 11:25:31 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Christian Kamm
7ffd2e8b9f Add missing license headers. 
Change-Id: I2dc5d18bfffc8389ad0b162b7dc3b5cc2406027f
Reviewed-on: http://codereview.qt.nokia.com/1222
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-07-06 11:17:05 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
Christian Kamm
8d4d88f072 QmlJS: Fix object literal indent in property initializers. 2011-04-21 12:56:59 +02:00
Christian Kamm
d0d0a8c07e QmlJS: Fix indent of object literals. 
Reviewed-by: Roberto Raggi
 2011-04-21 12:25:15 +02:00
Christian Kamm
e3928941ee Fix the qmljs indenter autotest. 
Reviewed-by: Bill King
 2011-04-21 12:25:15 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Thomas Hartmann
5f27ad85ea QmlDesigner.tests: compilefix 2011-04-04 13:23:38 +02:00
Oswald Buddenhagen
7007326837 clean up DEPENDPATH insanity 
simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
 2011-03-09 22:24:13 +01:00
Bill King
3593fe08ae tests: add licence headers 2011-02-18 14:48:16 +01:00
Christian Kamm
90a44ab1df QmlJS indenter: Fix object bindings with namespaces. 
Task-number: QTCREATORBUG-3371
Reviewed-by: Roberto Raggi
 2011-01-20 11:32:25 +01:00
Marco Bubke
146d9ede08 QmlDesigner: core test changes 2011-01-19 19:24:42 +01:00
Marco Bubke
4bcd401092 QmlDesigner: Add instance test mode to test 
For synchronisation to the puppet process.
 2011-01-18 19:38:01 +01:00
Marco Bubke
272b86a8de QmlDesigner: Fix linker error in core tests 2011-01-18 19:36:46 +01:00
Marco Bubke
4dc17bc1bb QmlDesigner: Test compiles again 
But not linking
 2011-01-18 18:23:43 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
23c22b7c66 License headers, part 2 2010-12-17 17:14:20 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Christian Kamm
5f04fbba1a QmlJS indenter: Fix for expressions starting with numbers or strings. 
Reviewed-by: Roberto Raggi
 2010-12-09 13:28:43 +01:00
Kai Koehne
c4e4913870 QmlProject: Add mainFile property 
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
 2010-12-08 15:08:49 +01:00
Kai Koehne
efcac96f57 QmlProject: Add autotest for Files element 2010-12-08 15:08:49 +01:00
Bill King
6b7535d8b3 tests: fixes 2010-12-03 15:04:19 +10:00
Thomas Hartmann
f6fb0d82ed Test: Extend QmlJS code model test. 2010-11-11 11:49:11 +01:00
Christian Kamm
87afbf3933 Add simple stub non-functional autotest. 
Done-with: Thomas Hartmann
 2010-11-11 11:49:10 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments 
Krazy was complaining about those.
 2010-11-03 12:45:34 +01:00
Bill King
bc04081622 tests: make qmakeable again 2010-11-01 11:43:36 +10:00
Kai Koehne
c4ca0060e3 QmlProject: Don't use RegExp for simple wildcard matching 
QRegExp matching is quite expensive, and has to be done for every file
in the project directory tree against all possible suffixes. Optimize
for the common case that the pattern is "*.suffix" by doing a
fileName.endsWidth(suffix) in this case.

This speeds up loading of examples/declarative/declarative.qmlproject by
about 30%.

Reviewed-by: Christian Kamm
 2010-10-29 09:41:20 +02:00
Bill King
524a9ac4a8 tests: more test project cleanup 2010-10-21 14:49:58 +10:00
Bill King
d95f3324c7 tests: remove unnecessary TARGET = tst_$$TARGET 
"CONFIG += testcase" does this for us, and is the proper way to do this.
 2010-10-20 15:03:01 +10:00
Bill King
5217ca8096 tests: get qmldesigner coretest running again 2010-10-20 14:57:07 +10:00
Bill King
54c8a2e5b5 Tests: Get autotests compiling again. 2010-10-20 14:16:04 +10:00
Thomas Hartmann
f2ada23d26 QmlDesigner: using Qt 4.7 again 
We need to support the N900

Reviewed-by: Kai Koehne
 2010-10-06 09:47:13 +02:00
Thomas Hartmann
9a49ad003a QmlDesigner: using QtQuick 1.0 instead of Qt 4.7 
huge renaming from Qt to QtQuick
propertyeditor qml files moved from Qt to QtQuick
auotests fixed
files used in tests fixed

autotests pass

Task-number: QTCREATORBUG-2556

Reviewed-by: Kai Koehne
 2010-10-01 13:21:09 +02:00
Christian Kamm
b58ebe7d29 QmlJS indenter: Fix incorrect indent after break/continue. 
Make sure to push a transitory state before leave(true) so it only
finishes the statement - and not the surrounding statement!

Reviewed-by: trustme
 2010-09-30 19:03:29 +02:00
Christian Kamm
e20bfaed68 QmlJS indenter: Fix break/continue/throw in if statement without braces. 
Reviewed-by: Roberto Raggi
 2010-09-27 10:30:39 +02:00
Christian Kamm
b4bd5449f6 QmlJS indenter: Fix problem with object literals. 
Reviewed-by: Roberto Raggi
 2010-09-27 10:12:50 +02:00
Thomas Hartmann
80527b93c4 QmlDesigner.tests: fixes the auto tests for latest changes 2010-09-24 09:10:45 +02:00
Thomas Hartmann
09d0c9e3f1 QmlDesigner.Tests: Fix compile for tests 2010-09-24 09:10:41 +02:00
Thomas Hartmann
9b492331da Adding LowLevel units test for instances 
testing data, children and resources properties
 2010-09-16 12:53:00 +02:00
Thomas Hartmann
3b62aeaffd QmlDesigner: fixing states 2010-09-16 12:52:58 +02:00
Thomas Hartmann
1a08caf77f QmlDesigner.tests: new auto tests 2010-09-08 16:36:20 +02:00
Christian Kamm
34f37fb5e3 QmlJS indenter: Fix one-line object declarations in array bindings. 
Task-number: QTCREATORBUG-2295
 2010-09-08 15:50:07 +02:00
Thomas Hartmann
742c49aebf QmlDesigner.test: fix 2010-09-07 16:31:22 +02:00