OSDN Git Service
Oswald Buddenhagen [Tue, 27 Apr 2010 16:29:51 +0000 (18:29 +0200)]
remove double include
Oswald Buddenhagen [Mon, 26 Apr 2010 17:18:48 +0000 (19:18 +0200)]
de-virtualize contains()
no point in it being virtual ...
Oswald Buddenhagen [Tue, 11 May 2010 10:09:39 +0000 (12:09 +0200)]
complain about unclosed scopes
Oswald Buddenhagen [Mon, 19 Apr 2010 20:35:58 +0000 (22:35 +0200)]
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.
Oswald Buddenhagen [Mon, 17 May 2010 12:19:56 +0000 (14:19 +0200)]
make if() evaluation more qmake-like
... which basically means "break it".
Oswald Buddenhagen [Mon, 17 May 2010 10:38:49 +0000 (12:38 +0200)]
interpret '!' operator only at start of token
Oswald Buddenhagen [Fri, 9 Apr 2010 09:23:00 +0000 (11:23 +0200)]
merge ProFunction into ProCondition
there is no point in the split, given that there is nothing virtual any
more.
Oswald Buddenhagen [Thu, 8 Apr 2010 13:36:17 +0000 (15:36 +0200)]
short-cut evaluation inside if() tests
this is consistent with the top-level scope evaluation.
Oswald Buddenhagen [Tue, 6 Apr 2010 19:12:09 +0000 (21:12 +0200)]
inline doVariableReplace()
it's pretty trivial and not used a lot
Oswald Buddenhagen [Thu, 1 Apr 2010 14:33:48 +0000 (16:33 +0200)]
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.
kh1 [Wed, 2 Jun 2010 08:38:18 +0000 (10:38 +0200)]
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
hjk [Wed, 2 Jun 2010 07:57:23 +0000 (09:57 +0200)]
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/debugger/debuggermanager.cpp
src/plugins/texteditor/basetexteditor.cpp
hjk [Tue, 1 Jun 2010 14:39:03 +0000 (16:39 +0200)]
fakevim: code cosmetics.
hjk [Tue, 1 Jun 2010 12:29:15 +0000 (14:29 +0200)]
debugger: add to manual test
kh1 [Tue, 1 Jun 2010 15:38:15 +0000 (17:38 +0200)]
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
ck [Tue, 1 Jun 2010 15:22:50 +0000 (17:22 +0200)]
Maemo: Fix botched merge.
ck [Tue, 1 Jun 2010 10:32:48 +0000 (12:32 +0200)]
SSH: Fix sequence number wrap-around bug in Net7.
Leena Miettinen [Tue, 1 Jun 2010 15:12:46 +0000 (17:12 +0200)]
Doc - Edit build and run instructions for Symbian target
Leena Miettinen [Tue, 1 Jun 2010 15:12:13 +0000 (17:12 +0200)]
Doc - Change version number to v2.0
Leena Miettinen [Tue, 1 Jun 2010 15:11:49 +0000 (17:11 +0200)]
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
hjk [Tue, 1 Jun 2010 12:35:51 +0000 (14:35 +0200)]
debugger: always switch to frame 0 before trying to leave frame
Daniel Molkentin [Tue, 1 Jun 2010 14:23:38 +0000 (16:23 +0200)]
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
Robert Loehning [Tue, 1 Jun 2010 14:15:45 +0000 (16:15 +0200)]
Fixes in German translation
Reviewed-by: Oswald Buddenhagen
Robert Loehning [Tue, 1 Jun 2010 13:08:39 +0000 (15:08 +0200)]
Decided on different use of hyphens in German translation.
Reviewed-by: Oswald Buddenhagen
Daniel Molkentin [Tue, 1 Jun 2010 12:39:31 +0000 (14:39 +0200)]
Revert "Mark QML support in Qt Creator 2.0 as preview"
Not needed anymore after the general QML support got deactivated.
This reverts commit
74bd95d3238dca1c6e22fb3faa59b94f590b1ac8.
hjk [Tue, 1 Jun 2010 11:13:27 +0000 (13:13 +0200)]
debugger: be nicer in the presence of missing debug information
hjk [Tue, 1 Jun 2010 11:12:03 +0000 (13:12 +0200)]
debugger: switch off reverse debugging tool button if not useful
Daniel Molkentin [Tue, 1 Jun 2010 10:51:18 +0000 (12:51 +0200)]
Disable everything QML-related but QMLJSEditor by default
To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake
Reviewed-by: Kai Koehne
Roberto Raggi [Tue, 1 Jun 2010 12:04:46 +0000 (14:04 +0200)]
Removed obsolete code.
Roberto Raggi [Tue, 1 Jun 2010 12:00:02 +0000 (14:00 +0200)]
Look at the injected class name.
Robert Loehning [Tue, 1 Jun 2010 11:54:07 +0000 (13:54 +0200)]
Fixed German translations related to Design mode and Qt Quick.
Reviewed-by: Oswald Buddenhagen
Thorbjørn Lindeijer [Tue, 1 Jun 2010 11:04:05 +0000 (13:04 +0200)]
Fixed context help for Qt includes
Was broken in
915a07bdbbd5dc65332369a117acde58793a165d, which caused
help links only to be resolved for expressions under the cursor.
Task-number: QTCREATORBUG-159
Reviewed-by: ckamm
Thorbjørn Lindeijer [Tue, 1 Jun 2010 10:39:08 +0000 (12:39 +0200)]
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
kh1 [Tue, 1 Jun 2010 11:13:59 +0000 (13:13 +0200)]
Backport some Qt Assistant print fixes.
Reviewed-by: ck
hjk [Tue, 1 Jun 2010 10:32:52 +0000 (12:32 +0200)]
debugger: make ctrl-click to navigate between input and output pane (much) faster
Roberto Raggi [Tue, 1 Jun 2010 10:22:07 +0000 (12:22 +0200)]
Fixed unqualified name lookup.
Roberto Raggi [Tue, 1 Jun 2010 10:16:13 +0000 (12:16 +0200)]
Check the current under cursor before searching for the enclosing expression.
Christian Kamm [Tue, 1 Jun 2010 10:03:17 +0000 (12:03 +0200)]
QmlJS: Make the qmldump tool treat extended types correctly.
Thorbjørn Lindeijer [Mon, 31 May 2010 11:48:40 +0000 (13:48 +0200)]
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
Roberto Raggi [Tue, 1 Jun 2010 09:57:25 +0000 (11:57 +0200)]
Some initial support for template parameters in our semantic highlighter.
Roberto Raggi [Tue, 1 Jun 2010 08:08:00 +0000 (10:08 +0200)]
Recognize Q_* and QT_* as reserved keywords.
Roberto Raggi [Tue, 1 Jun 2010 09:42:49 +0000 (11:42 +0200)]
Fixed ClassSpecifierAST::lastToken() to return a valid token.
Leena Miettinen [Tue, 1 Jun 2010 07:23:52 +0000 (09:23 +0200)]
Doc - Update screen shots.
Leena Miettinen [Tue, 1 Jun 2010 07:23:18 +0000 (09:23 +0200)]
Doc - Add a disclaimer for QDeclarative functions and documentation.
Leena Miettinen [Tue, 1 Jun 2010 07:22:44 +0000 (09:22 +0200)]
Doc - Added the firmware version of Nokia N900 software update release 1.2.
Leena Miettinen [Tue, 1 Jun 2010 07:21:53 +0000 (09:21 +0200)]
Doc - Update the mobile example to include instructions for testing on devices.
Thorbjørn Lindeijer [Mon, 31 May 2010 16:07:34 +0000 (18:07 +0200)]
Open .prf files in the pro file editor
This fixes QTCREATORBUG-1434, but it's more of a workaround than a fix.
The problem was that the file was opened in the diff editor due to a
broken diff detection, and the diff editor in turn has a bug in that
it's kind of halfway read-only.
Reviewed-by: ossi
Task-number: QTCREATORBUG-1434
Daniel Molkentin [Mon, 31 May 2010 14:36:48 +0000 (16:36 +0200)]
Mark QML support in Qt Creator 2.0 as preview
Reviewed-by: Kai Koehne
Roberto Raggi [Mon, 31 May 2010 14:00:59 +0000 (16:00 +0200)]
Fixed possible crash when parsing template declarations at the end of a C++ file.
Roberto Raggi [Mon, 31 May 2010 11:57:32 +0000 (13:57 +0200)]
Compile.
Erik Verbruggen [Mon, 31 May 2010 13:03:38 +0000 (15:03 +0200)]
Fixes rounding errors in block positions.
Influences the position of the folded-block markers.
Reviewed-by: thorbjorn
Sergey Belyashov [Mon, 31 May 2010 13:04:47 +0000 (15:04 +0200)]
Updated Russian translation
Merge-request: 143
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leandro Melo [Mon, 31 May 2010 11:56:46 +0000 (13:56 +0200)]
Generic highlighter: Refactored how format configuration is done.
Now the highlighter engine does not directly depend on TextEditor::FontSettings. This also makes things easier for unit testing.
Daniel Molkentin [Mon, 31 May 2010 11:56:58 +0000 (13:56 +0200)]
Remove accidentially committed symlinks
Daniel Molkentin [Mon, 31 May 2010 10:08:18 +0000 (12:08 +0200)]
Add links for building an example and building a mobile application
Reviewed-by: Leena Miettinen
Daniel Molkentin [Mon, 31 May 2010 10:07:08 +0000 (12:07 +0200)]
Do not try to force a version, this heuristic breaks too often.
Reviewed-by: Leena Miettinen
Daniel Molkentin [Mon, 31 May 2010 09:22:24 +0000 (11:22 +0200)]
Fix doc links to tips of the day, remove some to minimize l10n breakage.
Reviewed-by: Leena Miettinen
kh1 [Mon, 31 May 2010 10:37:21 +0000 (12:37 +0200)]
Some translation fixes and reuse some existing constants.
Reviewed-by: ossi
kh1 [Mon, 31 May 2010 10:28:02 +0000 (12:28 +0200)]
Use native separator and make the line not wrap in the table view.
Reviewed-by: ck
Roberto Raggi [Mon, 31 May 2010 10:36:30 +0000 (12:36 +0200)]
Disable the cacheing of template instantiations.
Roberto Raggi [Mon, 31 May 2010 10:15:10 +0000 (12:15 +0200)]
Cache the LookupContext.
Roberto Raggi [Mon, 31 May 2010 10:09:28 +0000 (12:09 +0200)]
Ensure we keep the context around for as long as it is needed.
ck [Mon, 31 May 2010 10:12:37 +0000 (12:12 +0200)]
SSH: Fix Net7 crash.
Reviewed-by: kh1
Erik Verbruggen [Mon, 31 May 2010 10:21:12 +0000 (12:21 +0200)]
Fixed default property discovery for custom QML components.
Reviewed-by: Christian Kamm
Erik Verbruggen [Mon, 31 May 2010 09:48:18 +0000 (11:48 +0200)]
Fixed possible crash.
Reviewed-by: Christian Kamm
Erik Verbruggen [Mon, 31 May 2010 09:17:42 +0000 (11:17 +0200)]
Removed invalid testcase.
Reviewed-by: Christian Kamm
Thiago Macieira [Mon, 31 May 2010 09:12:58 +0000 (11:12 +0200)]
Fix compilation: #include <ctype.h>
Marco Bubke [Wed, 26 May 2010 16:05:49 +0000 (18:05 +0200)]
Do reparenting only with the control modifier hold
The isContainer flag is now ignored.
Reviewed-by: kkoehne
Daniel Molkentin [Mon, 31 May 2010 09:04:00 +0000 (11:04 +0200)]
Do not add a menu if the examples cannot be found.
This is not only a waste of ressources, but breaks a check later on
which tries to load the QML examples from Creators ressource path
if no QML capable Qt version is found (included with Creator packages)
Reviewed-by: dt
Erik Verbruggen [Mon, 31 May 2010 09:03:59 +0000 (11:03 +0200)]
Remove snippet tooltip when completion list looses focus.
Task-number: QTCREATORBUG-1425
Reviewed-by: Christian Kamm
Marco Bubke [Wed, 26 May 2010 14:03:38 +0000 (16:03 +0200)]
If you move a new item on the formeditor the item is always in the base
state
The position is now setted int the base state if you drop a item on the
formeditor and move it around.
Task-Number: BAUHAUS-644
Reviewed-by: kkoehne
Kai Koehne [Thu, 20 May 2010 14:06:31 +0000 (16:06 +0200)]
QuickDesigner: Fix last (?) occurence of 4.6 as version of Qt namespace
Reviewed-by: Thomas Hartmann
Robert Loehning [Fri, 28 May 2010 18:48:35 +0000 (20:48 +0200)]
Added missing colons in German translation
Reviewed-by: Alessandro Portale
Roberto Raggi [Fri, 28 May 2010 15:17:11 +0000 (17:17 +0200)]
Fixed header protection.
Leena Miettinen [Fri, 28 May 2010 15:11:25 +0000 (17:11 +0200)]
Doc - Add firmware release for Nokia N900 software update 1.2. Update information about Maemo Emulator build target.
Leena Miettinen [Fri, 28 May 2010 15:10:03 +0000 (17:10 +0200)]
Doc - Add tutorials on building and running example applications and creating mobile applications.
Reviewed-by: Christian Kamm
Leena Miettinen [Fri, 28 May 2010 15:07:44 +0000 (17:07 +0200)]
Doc - Update the run settings for desktop, Symbian, and Maemo.
Leena Miettinen [Fri, 28 May 2010 13:14:22 +0000 (15:14 +0200)]
Doc - In New project wizard, OK button label was changed to Choose.
Leena Miettinen [Fri, 28 May 2010 13:12:25 +0000 (15:12 +0200)]
Doc - Fix links to Qt reference docs to point to the latest versions.
Leena Miettinen [Thu, 27 May 2010 14:13:43 +0000 (16:13 +0200)]
Doc - Fix a bug.
Task-number: QTCREATORBUG-1491
Erik Verbruggen [Fri, 28 May 2010 15:03:15 +0000 (17:03 +0200)]
Removed debug line.
Erik Verbruggen [Fri, 28 May 2010 15:02:32 +0000 (17:02 +0200)]
Fixed missing include, and #undeffed debug code.
Kai Koehne [Thu, 20 May 2010 11:14:08 +0000 (13:14 +0200)]
QuickDesigner: Make metainfo system robust for different version numbers
With the inclusion of org.webkit 1.0 types some common ancestors are shared
with different version numbers. These used to override each other. With this
patch the hierarchy is preserved.
This commit includes several changes by Marco Bubke.
Reviewed-by: Marco Bubke
Marco Bubke [Tue, 18 May 2010 14:38:09 +0000 (16:38 +0200)]
Load plugins at the beginning of the meta info initializing
Reviewed-by: kkoehne
Erik Verbruggen [Fri, 28 May 2010 14:23:31 +0000 (16:23 +0200)]
Added a utility method to search by line/column.
Erik Verbruggen [Fri, 28 May 2010 13:25:24 +0000 (15:25 +0200)]
Moved ASTPath to its own header/source files.
Erik Verbruggen [Fri, 28 May 2010 12:51:43 +0000 (14:51 +0200)]
Fixed off-by-1-token for symbol end offsets.
Friedemann Kleint [Fri, 28 May 2010 13:58:55 +0000 (15:58 +0200)]
Qt Designer integration: Fix Help button in stylesheet editor.
Wire QDesignerIntegration's help signal to help manager.
Task-number: QTCREATORBUG-1505
Reviewed-by: kh <qtc-committer@nokia.com>
hjk [Fri, 28 May 2010 13:47:50 +0000 (15:47 +0200)]
debugger: implement "old" QSize and QSizeF dumpers, re-enable QImage/QPixmap
hjk [Fri, 28 May 2010 13:05:51 +0000 (15:05 +0200)]
debugger: add another version string to the auto test
hjk [Fri, 28 May 2010 11:57:35 +0000 (13:57 +0200)]
fakevim: fix (again) 'r' at last position of a line
Thorbjørn Lindeijer [Fri, 28 May 2010 12:06:57 +0000 (14:06 +0200)]
Make sure bookmarks survive a document reload
While reloading a text document, the bookmarks got lost since their
associated QTextBlocks were deleted.
This patch makes sure that before reloading, the bookmarks are removed
non-persistently in the same way as when closing a document, and that
they are restored after the document was reloaded.
Currently, no effort is made to update the location of the bookmarks
based on the way the file changed.
Task-number: QTCREATORBUG-1281
Reviewed-by: dt
Roberto Raggi [Fri, 28 May 2010 10:51:12 +0000 (12:51 +0200)]
Always remove the duplicates from the completion, even when the items are not sorted.
Christian Kamm [Fri, 28 May 2010 13:22:50 +0000 (15:22 +0200)]
QmlJS: Update builtin type definitions.
Qt.labs.gestures and Qt.labs.filelistmodel weren't dumped before,
Qt.multimedia and Qt.widgets are gone.
Task-number: QTCREATORBUG-1507
Reviewed-by: Roberto Raggi
Leandro Melo [Fri, 28 May 2010 12:37:25 +0000 (14:37 +0200)]
More functionality for the generic highlighter options. Other small changes.
Kai Koehne [Fri, 28 May 2010 11:45:53 +0000 (13:45 +0200)]
Fix crashes when loading large .qmlproject's (Mac OS X)
There is a hard limit on the number of file handles that can be open at one point per process on Mac OS X (e.g. it's 2560 on Mac OS X Snow Leopard Server, as shown by ulimit -a). Opening one or several .qmlproject's with a large number of directories to watch easily exceeds this. The results are crashes later on, e.g. when threads cannot be created any more.
This patch implements a heuristic that the file system watcher used for .qmlproject files never uses more than half the number of available file handles. It also increases the number from rlim_cur to rlim_max - the old code in main.cpp failed, see last section in
http://developer.apple.com/maac/library/documentation/Darwin/Reference/ManPages/man2/setrlimit.2.html
for details.
Reviewed-by: ckamm
Task-number: QTCREATORBUG-1487
Task-number: QTCREATORBUG-1486
Christian Kamm [Thu, 27 May 2010 12:46:30 +0000 (14:46 +0200)]
QmlJS: Fix folding information for multi-line comments after edits.
Since the highlighter doesn't run on the whole file, only on the changed
line, we need to store the information whether a block starts in a
multi-line comment.
Reviewed-by: Erik Verbruggen
hjk [Fri, 28 May 2010 11:44:49 +0000 (13:44 +0200)]
debugger: remove obsolete createBreakpointByFileAndLine()
hjk [Fri, 28 May 2010 11:09:24 +0000 (13:09 +0200)]
fakevim: cleanup 'r' handling
hjk [Thu, 27 May 2010 16:23:51 +0000 (18:23 +0200)]
debugger: add some wcout related tests