Commit Graph

972 Commits

Author SHA1 Message Date
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
2012-04-19 16:13:09 +02:00
Joerg Bornemann
0834958063 qbs files updated
Property bindings in ProductModules now need explicit Depends items.
Also, some Qt dependencies were propagated wrongly and are now
added explicitely.

Change-Id: I58cd389eb0ab106004b1d575438d1ad2ff36189f
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2012-04-18 17:10:55 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Orgad Shaneh
06aa0363b0 Qbs: Libraries capitalized and relocated in bin on Windows
Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-04 14:16:12 +02:00
Kai Koehne
174678e049 QmlJS: Initialize variable properly
Change-Id: Ie9447e040c228b42766969ed8d80b33f67cccc46
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-03-14 13:04:57 +01:00
Kai Koehne
1f9a55e0b0 QmlJS: Fix warning text when loading .qmltypes file
Change-Id: Ia9509087fad6a63de2c6f35a012f5542c6bc2c98
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-03-13 12:24:39 +01:00
Kai Koehne
712928ff08 QmlJS: Actually print warning for .qmltypes file
Change-Id: I93030362168719c126818006839e9fae0ca673ce
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-03-13 12:24:32 +01: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
Tobias Hunger
339b34a5df Add missing copyright headers
Change-Id: I71f9050a7de9c7b07bcd7d96c8e5fc64a8565fb0
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 10:12:08 +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
Leandro Melo
b266472a4c Remove unused class member
Change-Id: I35120b106f4e246d196e2306c8043d7657f98bf3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-23 11:20:39 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Friedemann Kleint
7caeb1d627 Fix compilation with Qt5.
- Add missing QtScript module (pulled by json in utils
- Include type definitions for Q_DECLARE_METATYPE
- Unconditionally include QtSvg in Qt5

Change-Id: If298dd98fb660a6ba701f1ba36ced2d2027ea3e8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-02-09 12:44:40 +01:00
Leandro Melo
f6a4805fbc Fix header inclusion
Change-Id: I61b2f71c3eede06d7865317dca1f2714bfed14a5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-08 13:00:53 +01:00
Leandro Melo
26b783ff02 Introduce JSON validation
Support basic validation for JSON files according to the
draft http://tools.ietf.org/html/draft-zyp-json-schema-03.

This is not a complete implementation yet, but it should
already be useful, since "type" verification along with
many of the attributes is done.

Change-Id: I364bc98dd92937c5e2ea9cba7e15ed8e03eb9beb
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-02-08 11:25:07 +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
Friedemann Kleint
948c7af9f2 tr()-Fixes.
- Capitalization
- Fix lupdate warnings about tr() Usage in ZeroConf
- Fix some messages.

Change-Id: I95e4095ce54040e30d9a7968407bfc99b76643ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-12-13 16:20:26 +01:00
Friedemann Kleint
2d141afe7a Qt Creator: Compile with Qt 5.
Introduce #ifdefs for incompatible changes in QAtomicPointer
and QAtomicInt.

Change-Id: Ice03a2cc8b3aed174e549827cfcf737764c41642
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
2011-12-12 13:51:43 +01:00
Christian Kamm
9c88ae5a08 Doc: Add documentation stubs for all existing QmlJS checks.
Change-Id: I9f068ca358702f4033b21f64d5eee155d2580b83
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-12-08 10:03:49 +01:00
Christian Kamm
b67c0d5f1e QmlJS: Automate patching of generated parser.
* License headers in qmljs.g
* Directives usage

Change-Id: Ia68498c58049a2e47f0e7b120ad44556aff7b17f
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-07 11:25:07 +01:00
Christian Kamm
67dd062a31 QmlJS: Merge new parser from Qt 5.
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-07 11:24:59 +01:00
Christian Kamm
87f49ab3f0 QmlJS: Fix scoping for non-js files without scope objects.
For instance the Connections and ListModel elements have their scope
objects cleared but should still see the instantiating component chain.

Change-Id: I6fe48d77e4a99bbae2b7faa3ed38669832ccaa6a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-12-07 09:42:37 +01:00
Christian Kamm
e1d1c9e6d6 QmlJS: Fix highlighting and completion for property declarations.
When property declarations use a custom type such as

property Foo bar

we now
* highlight Foo as a QML type if it's found
* complete bar. as a Foo

Change-Id: I82c249646af19bfeb9f5a7a7692f0dc10b009835
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-12-07 09:42:31 +01:00
Christian Kamm
37bcdcf4f0 QmlJS checks: Disable warnings about expression statements in bindings.
Change-Id: Ic3aca50bec93ec3b810dbda2f9b57eefb966bbdf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-02 14:49:59 +01:00
Christian Kamm
69d6a508d3 QmlJS indenter: Fix braceless switch/try/with bindings.
Change-Id: Iee25f3f9ec38b1b7fc2697f390386c9a60cb8347
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-02 09:15:04 +01:00
Christian Kamm
a24c49720a QmlJS reformatter: Fix object literals.
The comma token seems to be invalid.

Change-Id: I859fa58ba0ba1e975e0cf1105c2b53aac848fb0d
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-30 10:11:28 +01:00
Christian Kamm
acf3ee7ca6 QmlJS: Fix lazy initialization of CppComponentValue::signalScopes.
Could lead to crashes when two threads initialize it at the same time.

Change-Id: Ia8e2c280c89087b1195451948c36a384e1098423
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-29 13:20:25 +01:00
Christian Kamm
d02b647bbf QmlJS checks: Don't warn for fallthrough on the last clause.
Change-Id: Ica84ced241eafd82cededa65d2e90f855e448f89
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-11-29 11:11:41 +01:00
Christian Kamm
25842cb13a QmlJS: Add protection against attached types attaching to themselves.
Change-Id: Ib81d5e6baabf5ac8d18411e8936098908de2c2bb
Task-number: QTCREATORBUG-6635
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-29 09:57:59 +01:00
Christian Kamm
a920096c97 QmlJS checks: Accept 'fallthrough' comment to terminate case blocks.
Change-Id: Icf71416e8aa892089b0918529b94f4cd6a1db5a3
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-29 08:25:51 +01:00
Christian Kamm
097850c842 QmlJS: Speed up ValueOwner construction.
* Don't build all default values (including the global object)
  separately for each ValueOwner instance.
* Instead, keep all global, immutable values in a single, shared
  instance.

While refactoring, some cases where we *modified* the global object had
to be removed:

* C++ context properties no longer get injected into the global object,
  instead they now have their own scope just above the global one.
* The Qt object's prototype no longer gets modified in Link. Instead,
  it's now a reference to the "Qt" object provided in a qmltypes file.
* The whole concept of a function 'Activation' that could potentially
  affect the global object was removed.

Change-Id: Id382faf965efa747fcc7a9b0bc2c90429d84d61b
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-25 10:36:42 +01:00
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
2011-11-25 09:48:25 +01:00
Christian Kamm
3e48bb6d19 QmlJS: Add documentation for ScopeChain.
Clear up Context documentation a little.

Change-Id: I2ede3dc0f15a972d2748cef1aa579a04f0786106
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-24 19:11:18 +01:00
Christian Kamm
d5b8638b48 QmlJS: Make Evaluate understand more expressions.
Change-Id: I718a74ecdbe24db917bbc2d8f3c9abddf051e134
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-24 19:11:01 +01:00
Christian Kamm
756c734e22 QmlJS: Add documentation for Evaluate.
Change-Id: I02543af2ce90dfa5bda88533ead39a7dbede90d4
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-24 14:42:29 +01:00
Christian Kamm
fad5cc0166 QmlJS indenter: Fix hang when using 'else (a==a) {}'.
Change-Id: Id7b8fba6707b1eaabf8065854f357cf600c809c5
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
(cherry picked from commit 567e68a42a)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-22 13:52:39 +01:00
Christian Kamm
eaf4b5be53 QmlJS check: Extend "don't use var" performance warning.
* now also recognizes color, rect, point, size, vector3d
* to do detect these correctly, set the return types on a number of
  builtin Qt.* functions
* add test

Change-Id: Ieaeb73be208af2d47e1bb4fa1485dc876705ee20
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-22 13:25:14 +01:00
Christian Kamm
d719489009 QmlJS: Remove unused code.
Change-Id: Ic6e7f46a3a7155a1ab41c41e4d9ee9d4832c3717
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-21 15:50:10 +01:00
Christian Kamm
2e724095c1 QmlJS: Fix crash when reading malformed qmltypes files.
Task-number: QTCREATORBUG-6587
Change-Id: I0b7c65c1d7f613283e447293daf26673e88ba6e7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-21 11:11:37 +01:00
Oswald Buddenhagen
c344032bd5 centralize setting of "CONFIG += shared dll" for libraries
"dll" and "shared" set each other, but too late to actually test for it
in the project files, so include both.
note that this will slightly modify the build of some of our imported qt
solutions.

Change-Id: I0bd4f41a68fd160f8e87eb0a0fa66096fe70ef3e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
2011-11-18 10:40:09 +01:00
Christian Kamm
b671baeffb QmlJS: Improve completion and hints for functions.
* FunctionValues know about optional arguments (for builtins)
* ASTFunctionValues only report themselves as variadic if they
  use the 'arguments' array.
* Function argument hint shows optional args and variadic.
* Completion automatically adds parentheses.

Change-Id: Ib2598600ff8b1ce8c5de3bcabd24a3e171ff3a57
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-11-16 11:20:37 +01:00
Christian Kamm
a5b26a32b3 QmlJS: Add 'reformat' action which regenerates the whole file.
Change-Id: I0aed6c6e197e122200d720eb9291a083095a6299
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-11-15 11:31:40 +01:00
Christian Kamm
dfd58916cd QmlJS: Add documentation for QmlJS::Value.
Also:
* Remove unnecessary QmlJS:: qualifications in existing documentation.
* Remove unnecessary explicit links in the documentation.

Change-Id: Icb41941d98b5cfe9d2fb3b3887fafee16635eb13
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-15 11:10:43 +01:00
Christian Kamm
12a1ba08fa QmlJS indenter: Fix indent after do-while without semicolon.
Change-Id: I4909f4640e7cd115b6c5c54c7aca7fca511653c9
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-15 08:58:21 +01:00
Eike Ziller
d1d85ba912 more s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-11 10:53:34 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
Christian Kamm
88d480cd61 QmlJS checks: Fix // @disable-check at beginning of line.
Change-Id: Iae9b9f499d3c2c6b3e3cc1be93e2b62508363aec
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-11-08 09:05:24 +01:00