Commit Graph

72811 Commits

Author SHA1 Message Date
Christian Kamm
5234c775f7 Make the QmlJSEditor work when Qml support is disabled.
- Enable qmlprojectplugin even if Qml support is disabled.
- But disable its wizards in that case.
- Disable the Qml file wizard if the support is off.

Reviewed-by: Kai Koehne
2010-06-03 10:25:17 +02:00
Robert Loehning
356648b7f4 Compile fix.
Reviewed-by: Oswald Buddenhagen
2010-06-02 21:51:27 +02:00
Robert Loehning
1e06c8bdeb String fix 2010-06-02 20:09:48 +02:00
Roberto Raggi
99b2020cb3 Check the type of the token that triggered the completion. 2010-06-02 15:22:42 +02:00
Thorbjørn Lindeijer
50ccecee2e Some initialization and removed redundant member variables
Reviewed-by: kh1
2010-06-02 14:53:44 +02:00
Thorbjørn Lindeijer
86bd6d9db5 Initialize some members in default constructor of FilterEntry 2010-06-02 14:50:46 +02:00
Roberto Raggi
ffa66f4fb5 Fixed the global completion to include the injected class name and user types. 2010-06-02 13:59:01 +02:00
Thorbjørn Lindeijer
502e86b737 Only do line selection in the gutter when the line numbers are visible
While 2641496a99 removed the marks check entirely, a fix for the same
issue made on the master branch (1263babfc6) changed it to check
whether the line numbers are visible. This is more correct.

Reviewed-by: mae
2010-06-02 13:39:45 +02:00
dt
d19ca58bf0 Fix crash with removing files in symlinked directories
Reviewed-By: thorbjorn

Task-Nr: QTCREATORBUG-965
2010-06-02 11:58:25 +02:00
hjk
b67369393e fakevim: synchronize with master
In theory this should have been a backport of the search-related commits
7e8c345a and 46fa3aa7, but they are buried in the middle of the Big
Commandline Reorganization. Just taking everything has lower risk and
is faster.
2010-06-02 11:09:39 +02:00
Oswald Buddenhagen
033a148b43 optimize assignments: record number of literals
that way the result vector can be pre-allocated - which gives zero
resizes if no expansions are in the expression.
for the joined argument lists of built-in functions, pre-allocate a
fixed 5 elements, which covers all cases and more.
the argument lists of user-defined functions are not pre-allocated
yet.
2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
a1fa00d2e7 precompile expressions
this gives a rather significant boost, in particular for
expressions which are evaluated repeatedly (includes).
2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
932d77b6dd qmake compat: delete empty elements when assigning values
some replace functions can return empty elements which should be
zapped here (according to qmake, anyway).
2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
c982d275ed factor out evaluateBoolFunction() 2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
a8d53e0ae3 serialize AST into a single string
this saves quite some mallocs in the parsing pass.
2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
dad37b23d8 maintain m_lineNo better during evaluation 2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
b97b53d9bf generalize ALWAYS_INLINE somewhat 2010-06-02 11:05:27 +02:00
Oswald Buddenhagen
0b0bbff094 move and rename ProItemReturn to VisitReturn
it's private to ProFileEvaluator::Private since the getting rid of
the visitor pattern.
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
5db91cf5bc add custom string type
ProString is almost a QStringRef, except that it keeps a copy of instead
of a pointer to the QString - to make it refcountable. additionally, it
holds a hash so it can be efficiently used for repetetive hash lookups.
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
2fd83af82f optimize assembly of arguments for built-in functions
this function class just joins each string list argument into a
single string. so instead of first building a list and joining it
right afterwards, create a single string in the first place.
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
25e6890c93 an empty argument list is still a list with one empty argument
that's actually kinda braindead, but that's qmake as usual.
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
d47b00fca8 implement $$size() 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
a98ce55e7b simplify $$quote() implementation 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
95d5ad4ab3 unify parsing of boolean arguments 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
33c5befc7f use QList::contains() instead of iterating 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
8df0fe8632 remove unused setters 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
6941898e9d remove double include 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
83d3d0f58d de-virtualize contains()
no point in it being virtual ...
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
a0cc2aec74 complain about unclosed scopes 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
c63453d878 reorganize AST
turn else, for(), defineTest() and defineReplace() into own node
types instead of treating them as magic conditionals/functions.
on top of that, introduce a proper branching node type, so finding
the alternative code paths can be moved into the parser instead of
burdening the evaluator with it.
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
583d688ee4 make if() evaluation more qmake-like
... which basically means "break it".
2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
a292fb1d77 interpret '!' operator only at start of token 2010-06-02 11:05:26 +02:00
Oswald Buddenhagen
f1b591bb06 merge ProFunction into ProCondition
there is no point in the split, given that there is nothing virtual any
more.
2010-06-02 11:05:25 +02:00
Oswald Buddenhagen
295e07eadc short-cut evaluation inside if() tests
this is consistent with the top-level scope evaluation.
2010-06-02 11:05:25 +02:00
Oswald Buddenhagen
40ffa44b74 inline doVariableReplace()
it's pretty trivial and not used a lot
2010-06-02 11:05:25 +02:00
Oswald Buddenhagen
e75092455c eliminate special splitting of INCLUDEPATH and DEPENDPATH
it wouldn't work as expected anyway, as the splitting rule (using the
semicolon in addition to whitespace) applied only to the string literal
from the pro file, but not any expanded [environment] variables, etc.
(i.e., where it might any make sense). so just drop it, as it would
considerably complicate following optimizations.
2010-06-02 11:05:25 +02:00
kh1
878462f72e Fix MADDE and pkg-config with QtCreator.
We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.

Reviewed-by: kh

(cherry picked from commit 0017103863)
(cherry picked from commit 9f8da8aa19)
2010-06-02 10:45:20 +02:00
kh1
9f8da8aa19 Fix MADDE and pkg-config with QtCreator.
We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.

Reviewed-by: kh
2010-06-02 10:39:28 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
2010-06-02 09:57:23 +02:00
hjk
89687ddd4b fakevim: code cosmetics. 2010-06-02 09:30:36 +02:00
kh1
0017103863 Fix MADDE and pkg-config with QtCreator.
We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.

Reviewed-by: kh
2010-06-01 17:43:23 +02:00
ck
e2d338ee22 Maemo: Fix botched merge. 2010-06-01 17:23:17 +02:00
ck
1e1c66f5c4 SSH: Fix sequence number wrap-around bug in Net7. 2010-06-01 17:23:17 +02:00
hjk
661308c96e debugger: always switch to frame 0 before trying to leave frame 2010-06-01 16:53:32 +02:00
Daniel Molkentin
9d609c88c8 Revert "Mark QML support in Qt Creator 2.0 as preview"
Not needed anymore after the general QML support got deactivated.

This reverts commit 74bd95d323.
2010-06-01 14:40:06 +02:00
hjk
ea6ff5913a debugger: switch off reverse debugging tool button if not useful 2010-06-01 14:33:26 +02:00
Daniel Molkentin
210652912b Disable everything QML-related but QMLJSEditor by default
To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake

Reviewed-by: Kai Koehne
2010-06-01 14:28:09 +02:00
Roberto Raggi
44115f48de Removed obsolete code. 2010-06-01 14:04:46 +02:00
Roberto Raggi
ed501b9bc3 Look at the injected class name. 2010-06-01 14:00:02 +02:00
Thorbjørn Lindeijer
c15a2bcd22 Fixed context help for Qt includes
Was broken in 915a07bdbb, which caused
help links only to be resolved for expressions under the cursor.

Task-number: QTCREATORBUG-159
Reviewed-by: ckamm
2010-06-01 13:33:35 +02:00