feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,997 Commits 108 Branches 368 Tags
14e645df8e07051a92f6fcab1fbf1505280602b6
Commit Graph

789 Commits

Author SHA1 Message Date
Christian Kamm
b729d4b973 QmlJS: Fix uses of Scanner::state(). 
Change-Id: I5195fc43e8a6653bf52c0eaa6cddb8dfd25b6217
Reviewed-on: http://codereview.qt.nokia.com/319
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-06-03 08:53:24 +02:00
Fawzi Mohamed
96129accb5 Qml Editor: accept imports with absolute paths 
qmljs code model now correctly handles absolute paths in imports

Change-Id: I6a4bcfbe9a8d9ab70b5fcac1df36ba9802ff5efe
Reviewed-on: http://codereview.qt.nokia.com/256
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-05-31 10:54:36 +02:00
Christian Kamm
83072da8b0 QmlJS: Fix potential linking problem. 
Don't use plugin from libs/qmljs.

Change-Id: Ia345c567cd1f244ab2191017810ef3eeb91fe0e4
Reviewed-on: http://codereview.qt.nokia.com/213
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-05-30 15:19:06 +02:00
Christian Kamm
060ca8d1cb Prefer C++-style cast. 
Change-Id: Id5e300c2e28bc704cbd1ae0d6022be4db8535429
Reviewed-on: http://codereview.qt.nokia.com/203
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-05-30 14:51:45 +02:00
Christian Kamm
88dc2d71fb QmlJS: Import 'as' has precedence over types imported without as. 
Change-Id: Iece286c9d1725d2bb1e3eff57cd73af97dd8c748
Reviewed-on: http://codereview.qt.nokia.com/181
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-30 11:38:51 +02:00
Christian Kamm
f0a4e7e225 QmlJS: Output qmltypes parse warnings to General messages pane. 
Change-Id: I8ca100ef141082c7606bb98f8a2f81502b14e1af
Reviewed-on: http://codereview.qt.nokia.com/204
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-05-30 11:32:23 +02:00
Christian Kamm
715cee76a9 qmldump: Bump to QtQuick.tooling 1.1, make parser more permissive. 
The qmltypes file reader now ignores unknown bindings and components
to allow for better forward-compatibility.

Change-Id: I2e31c17344dc8fdcd301a62c8d08e98c29ef53ee
Reviewed-on: http://codereview.qt.nokia.com/202
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-05-30 11:26:54 +02:00
Christian Kamm
cf7663b2de QmlJS: Read the 'revision' property generated by qmldump. 
Change-Id: Ia31b1845b1e1e5aabc347dc115e580c72e36f4e3
Reviewed-on: http://codereview.qt.nokia.com/200
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-30 09:31:37 +02:00
Christian Kamm
8742026380 QmlJS: Allow for QML modules with version subdirectories. 
That means
import Foo 2.1
can resolve to
/path/Foo.2.1 or
/path/Foo.2 or
/path/Foo

Task-number: QTCREATORBUG-4607
Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1a
Reviewed-on: http://codereview.qt.nokia.com/194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-30 08:25:19 +02:00
Christian Kamm
96cde1e9de QmlJS: Fix import cache usage with 'as' imports. 
Change-Id: I6c057e494f87df927adc7b83c6caf1ecc729ac65
Reviewed-on: http://codereview.qt.nokia.com/176
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-27 11:49:01 +02:00
Christian Kamm
a7f4e5fab5 QmlJS: Separate imported types and imported JS scopes. 
Task-number: QTCREATORBUG-4981
Change-Id: I06d3e428ca4928296a3d5977aeff29fc3217c37c
Reviewed-on: http://codereview.qt.nokia.com/175
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-27 11:48:53 +02:00
Christian Kamm
8a8b371ecc QmlJS: Initialize error state in PrototypeIterator. 
Change-Id: I231b847607d0558080d0dc0b6392bae5b833d65a
Reviewed-on: http://codereview.qt.nokia.com/107
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-05-25 11:51:05 +02:00
Christiaan Janssen
3cf5379380 QmlLivePreview: removing and inserting animations and transitions 
Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545
Reviewed-on: http://codereview.qt.nokia.com/75
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-05-24 13:03:43 +02:00
Christian Kamm
779fafcbfe Make C++ code style configurable. 
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-24 12:45:07 +02:00
Christian Kamm
d67b7d17dc QmlJS: Refactor ObjectValue members. 
* property -> lookupMember
* setProperty -> setMember
* removeProperty -> removeMember

Change-Id: I638479ee2b90b684283e714630bdcab237f6b3f2
Done-with: Fawzi Mohamed
Reviewed-on: http://codereview.qt.nokia.com/77
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-24 11:55:03 +02:00
Friedemann Kleint
a3c9cb995d Compile fix 
Change-Id: I8f3eb7d21074fec00de870d33e493842286222ee
Reviewed-on: http://codereview.qt.nokia.com/51
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-05-23 08:49:03 +02:00
Christian Kamm
f027b1da87 QmlJS: Make the Scanner recognize regular expression literals. 
Task-number: QTCREATORBUG-4566
Change-Id: I48b08f8eee79b25d0ebe186b996cdcb8f1979e3d
Reviewed-on: http://codereview.qt.nokia.com/38
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-23 08:30:26 +02:00
Christian Kamm
0bf18d008b QmlJS: Find prototype resolution errors. 
To avoid lots of follow-up errors where the root cause is a failed
prototype resolution or a prototype cycle.

Task-number: QTCREATORBUG-4952
Change-Id: Id474c8c6c152c993aca8c6c421b6d88eb1481676
Reviewed-on: http://codereview.qt.nokia.com/36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-05-20 13:33:18 +02:00
Christiaan Janssen
2d41159dab QmlLivePreview: avoid compiler warnings on gcc on mac 
Reviewed-by: Roberto Raggi
 2011-05-18 12:30:37 +02:00
Christiaan Janssen
09a78a3ae7 QmlLivePreview: adding states to an item 
Reviewed-by: Kai Koehne
 2011-05-17 10:42:45 +02:00
Christian Kamm
4937769eab QmlJS: Don't add invalid imports to TypeEnvironment. 
Done-with: Fawzi Mohamed
 2011-05-16 12:21:20 +02:00
Christian Kamm
cf15e14e5e QmlJS: Add tooltips to imports. 
Task-number: QTCREATORBUG-4814
 2011-05-12 15:29:41 +02:00
Christian Kamm
d72bddc7da QmlJS: Update to new QmlJS parser. 
UiPublicMember is now initialized with a statement.
 2011-05-12 13:39:53 +02:00
Christian Kamm
d0b12f8f19 QmlJS: Remove unused argument for Link helper function. 2011-05-11 09:13:13 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christian Kamm
d05992d0fa QmlJS: Stop doing significant work in constructors. 
To avoid order-of-initialization problems.

Reviewed-by: Thomas Hartmann
 2011-05-06 13:48:55 +02:00
Christiaan Janssen
89d9b83aa2 QmlDebugger: adding slots to items in Live Preview 
Reviewed-by: Kai Koehne
 2011-05-05 17:03:37 +02:00
Pawel Polanski
d9775a4159 Compilation fix 2011-05-04 12:13:03 +02:00
Christian Kamm
a9662aef0f Add files missing from 02b7eacf4b 2011-05-04 11:52:55 +02:00
Christian Kamm
02b7eacf4b QmlJS: Fix type detection for alias properties. 
Task-number: QTCREATORBUG-2306
 2011-05-04 11:14:35 +02:00
Christian Kamm
a03de5f717 QmlJS: Disable unhelpful warning. 2011-04-26 14:44:53 +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
c504d28eb5 QmlJS: Add semantic errors to task window. 
Task-number: QTCREATORBUG-4103
Reviewed-by: Leandro Melo
 2011-04-21 11:16:50 +02:00
Christian Kamm
e21311132b QmlJS: Fix library-by-path imports. 
Fixes the problem 5426c3ac2c and
7b25f438c6 worked around.

Reviewed-by: Erik Verbruggen
 2011-04-21 11:16:14 +02:00
Christian Kamm
ad43f5c48e QmlJS: Don't warn about function exp statements. 
Reviewed-by: Roberto Raggi
 2011-04-21 09:43:51 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Kai Koehne
52f52ffde3 QmlJS: Don't force -O3 in debug mode 
Makes debugging the QMLJS lib a pain :)
 2011-04-13 10:29:57 +02:00
Kai Koehne
3e07024e10 QmlJS: Don't warn user about imports if static info is available 
Don't underline the import if a qmldump fails,
but the typeinfo is available via a .qmltypes file. That should allow
users to 'fix' qmldump issues by shipping a .qmltypes file.

Reviewed-by: Erik Verbruggen
 2011-04-12 11:27:17 +02:00
Erik Verbruggen
7b25f438c6 Fixed import of "." in a library with a hack. 
Task-number: QTCREATORBUG-4198
Reviewed-by: Kai Koehne
 2011-04-06 10:49:27 +02:00
Christian Kamm
5e78fef6c5 QmlDump: Fix uri-based plugin dumping. 2011-03-16 15:35:15 +01:00
Christian Kamm
106513223d QmlJS: Fix infinite loop for objects that are attached to themselves. 2011-03-11 10:19:45 +01:00
Christian Kamm
b980a9b964 QmlJS: Fix implicit "." import when . has a QML module. 
Reviewed-by: Erik Verbruggen
 2011-03-10 15:03:36 +01: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
Thomas Hartmann
1178d623d5 QmlJs::Check: using the Option enum to ignore type errors 
Unifying the api and exposing the options.
 2011-03-01 17:21:03 +01:00
Thomas Hartmann
d6e08c3542 QmlJs::Check: turning "file or directory does not exist" into a warning 
Missing files should be a warning.
 2011-03-01 17:21:02 +01:00
Christian Kamm
aeb8c352ee QmlJS: Try to implicitly import libraries in the same directory. 
In QML, the current directory that holds a QML file is imported
implicitly. If it contains a qmldir file, the library is imported.

Since there is no explicit import statement, Creator can't know the URI
of this library. However, if type information is available for it
already - either through a previous dump or a qmltypes file - we can
guess the URI by looking at the contained exports.

Task-number: QTCREATORBUG-3768
 2011-02-25 16:23:12 +01:00