feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
11,137 Commits 108 Branches 368 Tags
726c3345c4af3d253c46f56fb1a20e0078bd1b7c
Commit Graph

11137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hjk
55c9c78153 debugger: add to manual test 2010-06-02 09:30:35 +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
Leena Miettinen
13e042737f Doc - Edit build and run instructions for Symbian target 2010-06-01 17:13:20 +02:00
Leena Miettinen
a3f1842325 Doc - Change version number to v2.0 2010-06-01 17:13:19 +02:00
Leena Miettinen
d78e5925bf Doc - Add information about creating Maemo installation packages. Edit instructions for setting up development environment for Maemo. Add not about encrypted keys not being supported. 
Reviewed-by: kh
 2010-06-01 17:13:19 +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
322436069d Disable QML runtime wizard for now. 
This is unconditional, since we seem to have no way of doing it
conditionally in a clean way.

Reviewed-by: Oswald Buddenhagen
 2010-06-01 16:31:56 +02:00
Robert Loehning
069171fc4c Fixes in German translation 
Reviewed-by: Oswald Buddenhagen
 2010-06-01 16:15:45 +02:00
Robert Loehning
536ab07f61 Decided on different use of hyphens in German translation. 
Reviewed-by: Oswald Buddenhagen
 2010-06-01 15:09:00 +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
896907f78c debugger: be nicer in the presence of missing debug information 2010-06-01 14:33:26 +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
Robert Loehning
52fce25de3 Fixed German translations related to Design mode and Qt Quick. 
Reviewed-by: Oswald Buddenhagen
 2010-06-01 13:55:09 +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
Thorbjørn Lindeijer
2641496a99 Fixed line select in gutter when text marks are not visible 
The ProjectFilesEditor used for editing the generic project's files does
not show text marks, which broke the line select in the gutter.

Task-number: QTCREATORBUG-1238
Reviewed-by: mae
 2010-06-01 13:33:35 +02:00
kh1
284fc63236 Backport some Qt Assistant print fixes. 
Reviewed-by: ck
 2010-06-01 13:15:07 +02:00
hjk
8b806c4d8d debugger: make ctrl-click to navigate between input and output pane (much) faster 2010-06-01 12:36:28 +02:00
Roberto Raggi
0dfe7b9b95 Fixed unqualified name lookup. 2010-06-01 12:22:07 +02:00
Roberto Raggi
ef83369006 Check the current under cursor before searching for the enclosing expression. 2010-06-01 12:16:38 +02:00
Christian Kamm
619d50f080 QmlJS: Make the qmldump tool treat extended types correctly. 2010-06-01 12:03:40 +02:00
Thorbjørn Lindeijer
8ffc25bbad Fixed the collapsed block popup to draw on top of cursor/highlights 
The various text editor overlays and the text cursor were being painted
on top of the collapsed block popup.

Reviewed-by: mae
 2010-06-01 12:01:23 +02:00
Roberto Raggi
f085dd2167 Some initial support for template parameters in our semantic highlighter. 2010-06-01 11:59:13 +02:00
Roberto Raggi
829df11c9d Recognize Q_* and QT_* as reserved keywords. 2010-06-01 11:58:43 +02:00
Roberto Raggi
efc01fd994 Fixed ClassSpecifierAST::lastToken() to return a valid token. 2010-06-01 11:44:34 +02:00
Leena Miettinen
05ec16f89a Doc - Update screen shots. 2010-06-01 09:24:25 +02:00
Leena Miettinen
590e8f39ad Doc - Add a disclaimer for QDeclarative functions and documentation. 2010-06-01 09:24:23 +02:00