Commit Graph

25 Commits

Author SHA1 Message Date
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
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
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Robert Loehning
75719f04ee Removed dead assignments
Change-Id: I1368cb534284016479211160cd8bf3cbc2f738e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-10-21 21:17:08 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2'
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
2011-06-23 19:47:50 +02:00
Oswald Buddenhagen
7b9ef7923f fix read beyond eol on missing expansion terminator
now we uniformly increment the read pointer only if we encountered a
terminator (which also implies that we were not at non-eol yet).

Task-number: QTCREATORBUG-5022
Change-Id: If4a4e7aec7423684297393fa10e50a69773b2048
Reviewed-on: http://codereview.qt.nokia.com/222
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-05-30 16:54:04 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Oswald Buddenhagen
17740d2ec3 continue parsing line despite errors
as far as possible, anyway. and suppress messages after the first one.
this avoids that scope nesting gets thrown off and thus spurious
followup-errors crop up.

as a "side effect", this fixes a crash resulting from us rewinding the
token stream but ignoring the block stack on the way.

Task-number: QTCREATORBUG-4368
2011-04-06 21:36:04 +02:00
Oswald Buddenhagen
d9e5f676ef reshuffle word counting in expressions
this makes the value list sizehints more correct: instead of the number
of literals and expansions, it's now the number of actual words, and
that only if the expression starts with a literal (otherwise the
pre-allocation is discarded anyway).
the performance impact seems negligible, with qt being a tad slower and
creator a tad faster.

as a side effect, complaining about excess words in a test expression
does not immediately terminate the current line's parsing.
2011-04-06 21:36:03 +02:00
Oswald Buddenhagen
c87eda573c remove useless initializations
reverts 6f5bf29e. coverity sucks, thankyouverymuch.
2011-04-06 21:36:03 +02:00
Oswald Buddenhagen
5433b43efd const-correctness 2011-04-06 21:36:03 +02:00
Oswald Buddenhagen
a3e578f318 add some comments 2011-03-16 12:24:37 +01:00
Oswald Buddenhagen
c0719b1ad6 remove obsolete comment 2011-03-16 12:24:37 +01:00
Oswald Buddenhagen
2d8967d039 fix line number after leading comment-only lines 2011-03-07 22:11:26 +01:00
Oswald Buddenhagen
e77c2f5a8b don't give up on parsing errors
instead of erroring out the parse, only error out the evaluation in
exact mode. that way we can do cumulative evaluation even on broken
files.

Task-number: QTCREATORBUG-3093
2011-02-10 14:56:15 +01:00
Oswald Buddenhagen
cef5754641 fix read beyond end of input line
a line ending in two backslashes would produce a literal backslash and
run off the end.

Task-number: QTCREATORBUG-3360
2011-01-18 15:12:18 +01:00
con
54f4fba003 It's 2011 now. 2011-01-12 15:34:06 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Oswald Buddenhagen
5f5d6c200d reinitialize block stack for new files
this has only an effect if parsing the previous file failed in a place
with a non-empty stack.
2010-09-16 13:42:05 +02:00
Oswald Buddenhagen
7322900692 make ProFileParser API less bug-prone
QString::isNull() vs. isEmpty() discrimination is a time bomb ...
2010-09-02 18:08:22 +02:00
Oswald Buddenhagen
f5e44fb7b6 parse braces on the RHS of assignments
this is less insane than (and thus incompatible to) qmake, but i
postulate that nobody will complain. :)
2010-06-24 19:19:21 +02:00
Oswald Buddenhagen
ec249304e6 work around msvc2010's apparent lack of appreciation for the meaning of "static" 2010-06-21 16:05:09 +02:00
Bill King
6f5bf29e71 Coverity: Fixes minor uninitialised constructor values issue. 2010-06-21 15:02:01 +10:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +02:00