feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,177 Commits 108 Branches 368 Tags
f25f1858f090062adab50ed92f15ba90cae4c0d2
Commit Graph

574 Commits

Author SHA1 Message Date
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
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +01:00
Christian Kamm
1d4cd9b7f2 QmlJS: Remove the strict separation of types and attached types. 
The problem was that several lookup calls suddenly failed because
the actual QML types were no longer in the default scope chain. However,
the QML documentation says the type names are in the scope.

Also, 'MyComponent.' in a JS-expression context only showed the attached
properties of MyComponent and missed the enums.

With this change completion now may offers too many options, but that's
better than missing some.

This reverts parts of 490f2797f6

Reviewed-by: Leandro Melo
 2011-02-21 15:05:04 +01:00
Erik Verbruggen
d866848ab8 Re-imported and re-generated the QML parser from Qt. 2011-02-21 12:46:02 +01:00
Tobias Hunger
fe33a0984e More copyright fixes 2011-02-18 10:37:19 +01:00
Christian Kamm
490f2797f6 QmlJS: Completion for attached properties. 2011-02-10 17:04:22 +01:00
Christian Kamm
187ae1e94a QmlJS: Rework FakeMetaObjects to no longer contain pointers. 
Having a duplicate prototype chain - once in FakeMetaObjects and once
in QmlObjectValues was unnecessary. Now FMOs don't contain references
which may allow other simplifications.
 2011-02-10 17:04:22 +01:00
Christian Kamm
13f9135827 qmldump: Dump attached types and read them in Creator. 2011-02-10 17:04:22 +01:00
Christian Kamm
660ae9b28d QmlJS: Update list of Qt object members. 
That means createComponent etc. will now be completed.
 2011-02-10 11:41:51 +01:00
Christian Kamm
55520a3804 QmlJS: Simplify loading types defined in C++. 2011-02-09 13:40:09 +01:00
Christian Kamm
85444451d9 QmlJS: Use / in fully qualified names to separate package and classname. 2011-02-09 10:42:49 +01:00
Christian Kamm
4fc2032e10 QmlJS: Put types with cpp names into a separate package. 
In preparation of relocatable plugin types.
 2011-02-09 10:42:49 +01:00
Christian Kamm
c99d2ca206 QmlJS: Fix local-file url property check. 2011-02-09 10:42:49 +01:00
Christian Kamm
f1012b4363 QmlJS: Fix qml type info by reintroducing workaround exports. 2011-02-09 10:42:49 +01:00
Christian Kamm
c935fd36d7 qmldump: Use the new qmldump correctly. 2011-02-09 10:42:49 +01:00
Christian Kamm
2ec429e8ce QmlJS: Switch to new format for QML meta data. 2011-02-09 10:42:49 +01:00