OSDN Git Service
Christiaan Janssen [Tue, 16 Nov 2010 15:17:16 +0000 (16:17 +0100)]
QmlDebugger: Fixing QmlCppEngine for failed setup due to timed out connection
kh1 [Tue, 16 Nov 2010 13:16:48 +0000 (14:16 +0100)]
Cannot reset font size for help when shown in side pane.
Task-number: QTCREATORBUG-2924
Reviewed-by: ck
kh1 [Tue, 16 Nov 2010 13:15:23 +0000 (14:15 +0100)]
Fix ambiguity with help manager by renaming the file to match class.
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
Christian Kamm [Tue, 16 Nov 2010 13:39:54 +0000 (14:39 +0100)]
QmlJS: Make follow symbol work with member properties.
A full evaluate() call resolves the property and continues to the
underlying type. If we use Evaluate::reference() instead, we only the
first step is done and we can get at the source location if a
ASTPropertyReference is returned.
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 16 Nov 2010 12:54:50 +0000 (13:54 +0100)]
QmlJS: Add a filter for functions to the locator.
Task-number: QTCREATORBUG-2607
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 16 Nov 2010 12:53:39 +0000 (13:53 +0100)]
QmlJS: Also bind FunctionExpressions.
Reviewed-by: Erik Verbruggen
Christian Kamm [Tue, 16 Nov 2010 12:40:23 +0000 (13:40 +0100)]
Locator: Use all matching filters, not just the highest priority one.
Reviewed-by: con
hjk [Tue, 16 Nov 2010 11:52:02 +0000 (12:52 +0100)]
debugger: some simplification after engine objects are no more re-used
hjk [Tue, 16 Nov 2010 11:42:57 +0000 (12:42 +0100)]
debugger: make the command timer a direct member of GdbEngine
hjk [Tue, 16 Nov 2010 10:55:48 +0000 (11:55 +0100)]
debugger: breakpoint code cosmetics
Friedemann Kleint [Tue, 16 Nov 2010 11:38:50 +0000 (12:38 +0100)]
Debugger: Stop in case of gdb crash in InferiorStop.
Reviewed-by: hjk
Task-number: QTCREATORBUG-3099
con [Tue, 16 Nov 2010 11:33:04 +0000 (12:33 +0100)]
Stupid editor adding tabs instead of spaces...
con [Tue, 16 Nov 2010 11:30:50 +0000 (12:30 +0100)]
Fix tool buttons in details widget on Mac with raster engine.
Task-number: QTBUG-15170
Friedemann Kleint [Tue, 16 Nov 2010 11:17:00 +0000 (12:17 +0100)]
Debugger: Fix useFullPath in gdb.
hjk [Tue, 16 Nov 2010 10:48:17 +0000 (11:48 +0100)]
debugger: remove intermediate BreakpointData stucture layer
Friedemann Kleint [Tue, 16 Nov 2010 10:42:20 +0000 (11:42 +0100)]
Debugger/BreakpointDialog: Show only data applicable to type.
Clear controls that are not applicable to type, but save
and restore their value once the type is again choosen.
hjk [Tue, 16 Nov 2010 10:12:05 +0000 (11:12 +0100)]
debugger: potentia;l cdb compile fix
hjk [Tue, 16 Nov 2010 10:06:09 +0000 (11:06 +0100)]
debugger: looks like the BreakpointData layer is going to be unneeded.
hjk [Tue, 16 Nov 2010 09:50:11 +0000 (10:50 +0100)]
debugger: more breakpoint refactoring
hjk [Mon, 15 Nov 2010 18:07:47 +0000 (19:07 +0100)]
debugger: code cosmetics
hjk [Mon, 15 Nov 2010 18:05:31 +0000 (19:05 +0100)]
debugger: move marker filename and linenumber to BreakpointItem
Friedemann Kleint [Tue, 16 Nov 2010 09:23:20 +0000 (10:23 +0100)]
Debugger: Handle throw/catch/main as BreakpointType enum values.
Remove BreakHandler::hasPendingBreakpoints, handle new types
in CDB and gdb. Start fixing Breakpoint-Dialog.
Add assignment of Breakpointresponse from BreakpointParameters.
Reviewed-by: hjk
Alessandro Portale [Mon, 15 Nov 2010 21:28:58 +0000 (22:28 +0100)]
Valid XML attempt
Alessandro Portale [Mon, 15 Nov 2010 21:15:34 +0000 (22:15 +0100)]
Mass Qt Quick App generator.
First usage: convert QML examples into c++ projects.
Alessandro Portale [Mon, 15 Nov 2010 21:14:14 +0000 (22:14 +0100)]
Moved some functions to helpers.cpp
Oswald Buddenhagen [Mon, 15 Nov 2010 18:03:18 +0000 (19:03 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/static.pro
src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
src/plugins/projectexplorer/outputwindow.cpp
Oswald Buddenhagen [Mon, 15 Nov 2010 18:00:07 +0000 (19:00 +0100)]
compile, thank you very much
hjk [Mon, 15 Nov 2010 17:48:58 +0000 (18:48 +0100)]
debugger: don't store watch points in session
con [Mon, 15 Nov 2010 16:53:32 +0000 (17:53 +0100)]
Fixes: Mac: Size of build steps increases when hovered
The fixed size buttons were too big on Mac.
Task-number: QTCREATORBUG-3098
Reviewed-by: Jens Bache-Wiig
Tobias Hunger [Mon, 15 Nov 2010 16:47:21 +0000 (17:47 +0100)]
Windows: Fix some warnings
Friedemann Kleint [Mon, 15 Nov 2010 16:36:00 +0000 (17:36 +0100)]
Debugger: Bring back debug output.
Friedemann Kleint [Mon, 15 Nov 2010 16:32:32 +0000 (17:32 +0100)]
Debugger: Remove debug output.
hjk [Mon, 15 Nov 2010 16:25:42 +0000 (17:25 +0100)]
debugger: fix setting of breakpoint types on session loading
Christiaan Janssen [Mon, 15 Nov 2010 16:09:28 +0000 (17:09 +0100)]
QmlDebugger: Refactored QmlEngine and QmlCppEngine
Reviewed by: hjk
Friedemann Kleint [Mon, 15 Nov 2010 16:15:04 +0000 (17:15 +0100)]
Debugger: Initialize BreakpointParameters correctly.
Tobias Hunger [Mon, 15 Nov 2010 15:46:42 +0000 (16:46 +0100)]
Symbian: Allow installer to set SBS v2 directory
Allow the installer to specify the SBS v2 directory.
Reviewed-by: Tim Jenssen
Friedemann Kleint [Mon, 15 Nov 2010 16:04:29 +0000 (17:04 +0100)]
Debugger: Introduce BreakpointParameters as base struct.
For Breakpoint data manipulation.
Reviewed-by: hjk
hjk [Mon, 15 Nov 2010 15:58:23 +0000 (16:58 +0100)]
debugger: update display on engine exit
hjk [Mon, 15 Nov 2010 15:24:34 +0000 (16:24 +0100)]
debugger: BreakpointByFileAndLine is default when loading sessions.
hjk [Mon, 15 Nov 2010 15:22:51 +0000 (16:22 +0100)]
debugger: work on breakpoint enabling/disabling in gdb engine
Tobias Hunger [Mon, 15 Nov 2010 14:24:17 +0000 (15:24 +0100)]
Symbian: Provide field in Qt version to set up SBSv2
Provide a field in the symbian Qt version to set up the SBSv2 build
system.
Reviewed-by: dt
hjk [Mon, 15 Nov 2010 14:30:39 +0000 (15:30 +0100)]
debugger: re-enable "Delete all breakpoints" etc
Friedemann Kleint [Mon, 15 Nov 2010 14:24:27 +0000 (15:24 +0100)]
Debugger: Make CDB compile again.
hjk [Mon, 15 Nov 2010 14:15:09 +0000 (15:15 +0100)]
debugger: code cosmetics; fix toggling breakpoints using the editor context
hjk [Mon, 15 Nov 2010 14:05:39 +0000 (15:05 +0100)]
debugger: show disabled breakpoints again
hjk [Mon, 15 Nov 2010 13:35:19 +0000 (14:35 +0100)]
debugger: add some description to breakpoint states in tooltip.
FIXME: add translations once interface has stabilized.
hjk [Mon, 15 Nov 2010 13:27:06 +0000 (14:27 +0100)]
debugger: move breakpoit tooltip from BreakpointData to BreakpointHandler
It also shows the response data.
hjk [Mon, 15 Nov 2010 13:12:05 +0000 (14:12 +0100)]
debugger: make BreakpointData and BreakpointResult proper value types
Christian Kamm [Mon, 15 Nov 2010 13:02:15 +0000 (14:02 +0100)]
QmlJS: Add wizard for creating new js files.
Task-number: QTCREATORBUG-3070
con [Mon, 15 Nov 2010 12:41:03 +0000 (13:41 +0100)]
Visible wrap column wrong with fractional font metrics.
E.g. on Mac.
hjk [Mon, 15 Nov 2010 12:12:13 +0000 (13:12 +0100)]
debugger: collect breakpoint related data in a single hash
dt [Mon, 15 Nov 2010 11:48:04 +0000 (12:48 +0100)]
ProjectExplorer: Add expensive asserts to FlatModel
Should help in debugging QTCREATORBUG-2821
hjk [Mon, 15 Nov 2010 11:32:51 +0000 (12:32 +0100)]
debugger: add forgotten ignoreCount accessor implementation
hjk [Mon, 15 Nov 2010 11:21:43 +0000 (12:21 +0100)]
debugger: tighten write accesss to BreakpointData
hjk [Mon, 15 Nov 2010 10:37:15 +0000 (11:37 +0100)]
debugger: fix display of shadowed variables again
Christian Kandeler [Mon, 15 Nov 2010 10:44:21 +0000 (11:44 +0100)]
Help plugin: Fix possible crash on documentation update.
We must not call updateFilterPage() when the "Options" dialog
is not currently open.
Without this patch, Creator will crash on a documentation update
if that dialog has been opened at least once and is currently closed.
Reviewed-by: kh1
Reviewed-by: con
hjk [Wed, 10 Nov 2010 15:33:11 +0000 (16:33 +0100)]
debugger: Refactor breakpoint handling.
The breakpoints are now (fairly) tightly guarded by the BreakpointHandler.
Engines and Views are only supposed to refer to them by id. They also have
individual states now. The breakpoint data is split into a "user requested"
"fixed" part in BreakpointData and the engines' acknowledged data in a new
struct BreakpointResponse.
TODO: Move m_state and m_engine members to BreakpointResponse. Fix regressions
in the marker handling.
Friedemann Kleint [Mon, 15 Nov 2010 11:06:38 +0000 (12:06 +0100)]
Debugger: Suppress fetching of modules/registers in invalid states.
Reviewed-by: hjk
Friedemann Kleint [Mon, 15 Nov 2010 11:06:09 +0000 (12:06 +0100)]
VCS[git]: Fix change dialog.
con [Mon, 15 Nov 2010 11:01:50 +0000 (12:01 +0100)]
Some menus where missing a setEmptyAction(EA_None) call.
Was exposed by fixing the empty action mechanism in
d7e7c3427d878cadbdce26f12ef39aceafbff966.
Friedemann Kleint [Mon, 15 Nov 2010 10:20:39 +0000 (11:20 +0100)]
Debugger: Fix stack context menu.
Initial-patch-by: hjk
Christian Kamm [Fri, 12 Nov 2010 13:53:00 +0000 (14:53 +0100)]
QmlJS: Avoid infinite loop with recursive prototypes.
Rhys Weatherley [Mon, 15 Nov 2010 05:02:21 +0000 (15:02 +1000)]
Create AST nodes for qualified GLSL types
dt [Fri, 12 Nov 2010 19:42:40 +0000 (20:42 +0100)]
ModeManager: Fix ordering of actions in modebar
The Target Selector wasn't accounted for.
dt [Fri, 12 Nov 2010 19:18:29 +0000 (20:18 +0100)]
ProjectExplorer + Debugger: Move Debug Action to the Debugger plugin
Since all the debuggers are implemented in the debuggerplugin, that's a
natural place to put the action.
dt [Fri, 12 Nov 2010 17:31:07 +0000 (18:31 +0100)]
ProjectExplorer: runProjectImpl -> runProject and make it public
dt [Fri, 12 Nov 2010 16:25:39 +0000 (17:25 +0100)]
ProjectExplorer: Fix context menu actions
Disable/Enable them correctly and give them the correct context.
Task-Nr: QTCREATORBUG-3078
Roberto Raggi [Fri, 12 Nov 2010 16:11:20 +0000 (17:11 +0100)]
Initial work on the code completion for GLSL files.
Oswald Buddenhagen [Fri, 12 Nov 2010 13:36:54 +0000 (14:36 +0100)]
don't maintain (and save) m_userSetWorkingDirectory
there is no point in doing it, as it is equivalent with
m_userWorkingDirectory being non-empty.
this code is consistent with CMakeRunConfiguration.
Thorbjørn Lindeijer [Fri, 12 Nov 2010 14:32:51 +0000 (15:32 +0100)]
Tweaks to the Inkpot style
Added missing categories with customized colors for Field, Occurences,
Static and VisualWhitespace.
Removed highlighting for the 'Local' category, since at least I consider
the white names a little messy. In general we've considered the
highlighting of locals less useful than highlighting the members.
Task-number: QTCREATORBUG-2490
Kai Koehne [Mon, 25 Oct 2010 12:27:39 +0000 (14:27 +0200)]
Observer mode: Fix automatic selection of all instances
If the user clicks on an instance of an element in the running app
while in server mode, the cursor selection is automatically updated.
However, the change of the cursor then leads to all the other
instances of the element at the cursor position being selected too.
Prevent this 'call back' in the QmlInspector by checking whether one
of the newly selected items is the one just selected.
Simpler mechanisms (like a sequential blocking of updates) don't
work because the call back happens through a QTimer.
Task-number: QTCREATORBUG-2366
Kai Koehne [Mon, 25 Oct 2010 07:52:11 +0000 (09:52 +0200)]
QmlJSInspector: API cleanup
Rename setSelectedItemsByObjectReference slot to gotoObjectDefinition
Kai Koehne [Mon, 25 Oct 2010 07:38:54 +0000 (09:38 +0200)]
QmlJSInspector: Don't send update if selection hasn't changed
Kai Koehne [Mon, 25 Oct 2010 07:37:15 +0000 (09:37 +0200)]
QmlJSInspector: API cleanup
Give m_client, m_designClient member variables more descriptive names.
Kai Koehne [Mon, 25 Oct 2010 06:56:25 +0000 (08:56 +0200)]
QmlJSInspector: API cleanup
Simplify method names.
Kai Koehne [Mon, 25 Oct 2010 06:05:13 +0000 (08:05 +0200)]
QmlJSObserver: API cleanup
Change signature of setSelectedItemsByObjectId to match the one from
signal currentObjectsChanged.
Kai Koehne [Fri, 22 Oct 2010 14:12:59 +0000 (16:12 +0200)]
QmlJSDebugger: Simplify selection handling code
Avoids multiple calls singleSelectionManipulator.select().
Kai Koehne [Fri, 22 Oct 2010 10:41:39 +0000 (12:41 +0200)]
QmlJsDebugger: Avoid CURRENT_OBJECTS_CHANGED message flooding
Thorbjørn Lindeijer [Fri, 12 Nov 2010 13:19:08 +0000 (14:19 +0100)]
Started the changes file for 2.2.0
Thorbjørn Lindeijer [Fri, 12 Nov 2010 13:18:37 +0000 (14:18 +0100)]
Added the Inkpot color scheme
This color scheme is based on the vim Inkpot color scheme, originally
created by Ciaran McCreesh:
http://www.vim.org/scripts/script.php?script_id=1143
It was adapted for use by Qt Creator by Jan Kundrát and subsequently
updated by Campbell Barton.
Task-number: QTCREATORBUG-2490
Christian Kamm [Fri, 12 Nov 2010 13:15:21 +0000 (14:15 +0100)]
QmlJS: Remove ComponentVersion::major/minor.
They are unusable on linux as there are commonly-included macros
of the same name.
Leandro Melo [Fri, 12 Nov 2010 10:31:12 +0000 (11:31 +0100)]
Editors: Make block highlights go beyond the margin
Block highlights should still be visible even outside the margin (when
margins are displayed naturally), since it acts only as indicator of
the character limit.
Apparently this had already been noticed before and recently there was
a merge request (no. 204) with an attempt to fix it. However, the
implementation was not handling it in a nice form. This is a small
patch that solves the issue and keeps the editor beautiful. (Check
the merge request for more details.)
Reviewed-by: Thorbjorn Lindeijer
Kai Koehne [Thu, 11 Nov 2010 10:39:57 +0000 (11:39 +0100)]
QmlWizards: Unify templates
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).
Reviewed-by: Alessandro Portale
Christian Kamm [Fri, 12 Nov 2010 11:48:22 +0000 (12:48 +0100)]
QmlJS: Enable file name completion in imports.
Task-number: QTCREATORBUG-3067
Reviewed-by: Roberto Raggi
Christian Kamm [Fri, 12 Nov 2010 10:57:44 +0000 (11:57 +0100)]
QmlJS: Detect whether cursor is in an import.
Reviewed-by: Roberto Raggi
con [Fri, 12 Nov 2010 12:45:54 +0000 (13:45 +0100)]
Don't show GLSL or QML tools menus while they don't offer anything
con [Fri, 12 Nov 2010 12:45:13 +0000 (13:45 +0100)]
Fix updating of menus with EA_Hide.
Christian Kamm [Fri, 12 Nov 2010 12:37:54 +0000 (13:37 +0100)]
QmlProject and Observer: Work with Simulator Qt targets.
This allows using the qmlviewer of a Simulator Qt version. It also
builds and uses the qmlobserver when debugging.
Reviewed-by: Kai Koehne
Roberto Raggi [Fri, 12 Nov 2010 11:44:55 +0000 (12:44 +0100)]
Parse GLSL code.
con [Fri, 12 Nov 2010 11:28:50 +0000 (12:28 +0100)]
Fix generation of Info.plist on Mac.
Since the move to Info.plist.in, Mac builds were missing their
Info.plist, because the combination of QMAKE_INFO_PLIST and
QMAKE_SUBSTITUTES doesn't play well.
Moving to use QMAKE_SUBSTITUTES exclusively.
Jarek Kobus [Fri, 12 Nov 2010 11:07:52 +0000 (12:07 +0100)]
Add "New Subproject..." context menu action in project explorer
Reviewed-by: dt <qtc-committer@nokia.com>
Pawel Polanski [Mon, 8 Nov 2010 13:35:32 +0000 (14:35 +0100)]
Value for "silent installation" for SymbianOS is random - bug fixed
Task-number: QTCREATORBUG-3016
Leandro Melo [Thu, 11 Nov 2010 17:08:18 +0000 (18:08 +0100)]
Remove empty dir from static.pro
This was added in the case we start shipping some of the Kate XMLs (still
a pending decision), which should be placed in this dir. However, this
causes a warning when loading qtcreator.pro with master branch version.
So I'll removed it. If we really ship the files it should be re-added
and also the installer notified.
Reviewed-by: con
Leena Miettinen [Fri, 12 Nov 2010 08:22:47 +0000 (09:22 +0100)]
Doc: fix a typo
Leena Miettinen [Thu, 11 Nov 2010 16:34:12 +0000 (17:34 +0100)]
Doc: added a warning about opening ports
Task-number: QTCREATORBUG-3074
Reviewed-by: Olivier Goffart
Christian Kamm [Fri, 12 Nov 2010 10:12:34 +0000 (11:12 +0100)]
QmlJS: Add missing null check for completion in string literals.
Christian Kamm [Fri, 12 Nov 2010 10:05:10 +0000 (11:05 +0100)]
QmlJS: Don't autoinsert ' in string literals.
Task-number: QTCREATORBUG-2155
Reviewed-by: Roberto Raggi
Christian Kamm [Fri, 12 Nov 2010 09:09:43 +0000 (10:09 +0100)]
QmlJS: Complete '{' instad of ':' at the end of 'A on b' bindings.
Task-number: QTCREATORBUG-2642
Reviewed-by: Erik Verbruggen
Christian Kamm [Thu, 11 Nov 2010 15:08:32 +0000 (16:08 +0100)]
QmlJS: Local-file completion for url properties.
Task-number: QTCREATORBUG-2619
Reviewed-by: Erik Verbruggen
Christian Kamm [Thu, 11 Nov 2010 15:04:55 +0000 (16:04 +0100)]
QmlJS: Add a UrlValue.
This will allow distinguishing mere strings from urls and allow
different completion.
Reviewed-by: Erik Verbruggen