OSDN Git Service
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
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
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.
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>
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
Christian Kamm [Thu, 11 Nov 2010 13:22:30 +0000 (14:22 +0100)]
QmlJS: Determine whether cursor is inside a string literal.
Reviewed-by: Erik Verbruggen
Rhys Weatherley [Fri, 12 Nov 2010 00:23:46 +0000 (10:23 +1000)]
Build AST nodes from within the parser.
Rhys Weatherley [Thu, 11 Nov 2010 23:53:08 +0000 (09:53 +1000)]
Making GLSL AST nodes while preserving lineno info
Eventually we will need some way to locate an identifier's
definition, so add "lineno" to each AST node. May want to
change this to "position" later. The makeAstNode<T>() function
takes care of automatically decorating nodes with line numbers.
Rhys Weatherley [Thu, 11 Nov 2010 23:05:48 +0000 (09:05 +1000)]
Convert GLSL AST nodes into managed types
Oswald Buddenhagen [Thu, 11 Nov 2010 19:30:52 +0000 (20:30 +0100)]
don't save target path and working directory
they are initialized from the build configuration upon construction
Oswald Buddenhagen [Tue, 9 Nov 2010 10:55:04 +0000 (11:55 +0100)]
less code duplicattion
Erik Verbruggen [Thu, 11 Nov 2010 15:25:52 +0000 (16:25 +0100)]
Added more build products to ignore.
Roberto Raggi [Thu, 11 Nov 2010 14:43:16 +0000 (15:43 +0100)]
Handle parenthesized expressions.
Roberto Raggi [Thu, 11 Nov 2010 14:26:08 +0000 (15:26 +0100)]
Added missing files
Roberto Raggi [Thu, 11 Nov 2010 14:25:19 +0000 (15:25 +0100)]
Create AST nodes for multiplicative expressions.
Roberto Raggi [Thu, 11 Nov 2010 14:21:27 +0000 (15:21 +0100)]
There's nothing to do for the chain rules.
Roberto Raggi [Thu, 11 Nov 2010 14:11:24 +0000 (15:11 +0100)]
Count the number of toplevel declarations.
Roberto Raggi [Thu, 11 Nov 2010 14:05:42 +0000 (15:05 +0100)]
Introduced a simple memory pool.
Roberto Raggi [Thu, 11 Nov 2010 13:28:05 +0000 (14:28 +0100)]
Use only interned (unique) strings.
Christian Kamm [Thu, 11 Nov 2010 13:21:04 +0000 (14:21 +0100)]
Fix compile on windows.
con [Thu, 11 Nov 2010 11:53:02 +0000 (12:53 +0100)]
Fix ui language for custom wizards.
Introduces a ICore::userInterfaceLanguage method, which centralizes the
previous qApp property hack for help and designer integration.
Reviewed-by: Friedemann Kleint
Kai Koehne [Thu, 11 Nov 2010 12:07:57 +0000 (13:07 +0100)]
HelpPlugin: Compile fix for msvc2010
Make sure that help/helpmanager.h is before coreplugin/helpmanager.h
in the INCLUDEPATH.
Christian Kandeler [Thu, 11 Nov 2010 11:31:32 +0000 (12:31 +0100)]
Debugging/RemoteGdbAdapter: Add code to facilitate re-running.
Christian Kamm [Wed, 10 Nov 2010 14:11:17 +0000 (15:11 +0100)]
Qt4Project: Notify the QmlJS code model even without QML files.
Reviewed-by: Erik Verbruggen
Christian Kamm [Wed, 10 Nov 2010 14:07:53 +0000 (15:07 +0100)]
QmlJS: Move plugin dumping code and redump on file change.
Task-number: QTCREATORBUG-3047
Reviewed-by: Erik Verbruggen
Roberto Raggi [Thu, 11 Nov 2010 11:01:37 +0000 (12:01 +0100)]
Get rid of glsl.g.in and start working on the semantic actions.
Erik Verbruggen [Thu, 11 Nov 2010 11:09:15 +0000 (12:09 +0100)]
Retain id when creating a component from an object.
Task-number: QTCREATORBUG-2666
Reviewed-by: Christian Kamm
Christian Kandeler [Thu, 11 Nov 2010 11:08:13 +0000 (12:08 +0100)]
Maemo: Don't hold a reference to a run config in a run control.
Save all relevant information at run control creation time, so we can
re-run even without a project.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=203698
Thomas Hartmann [Thu, 11 Nov 2010 10:27:56 +0000 (11:27 +0100)]
Test: Extend QmlJS code model test.
Thomas Hartmann [Wed, 10 Nov 2010 15:38:41 +0000 (16:38 +0100)]
QmlObjectValue: bugifx for QmlObjectValue::propertyType()
We have to follow the prototype chain
Reviewed-by: Christian Kamm
Thomas Hartmann [Thu, 11 Nov 2010 10:11:48 +0000 (11:11 +0100)]
QmlJS: Resolve property types within package.
Reviewed-by: Christian Kamm
Christian Kamm [Thu, 11 Nov 2010 09:46:19 +0000 (10:46 +0100)]
QmlObjectValue: Add convenience functionality.
Added
hasLocalProperty()
hasProperty()
keysForEnum()
Reviewed-by: Christian Kamm
Thomas Hartmann [Wed, 10 Nov 2010 15:31:20 +0000 (16:31 +0100)]
QmlJS: Adding IntValue and RealValue
This allows to distinguish between int an real numbers
Reviewed-by: Christian Kamm
Thomas Hartmann [Wed, 10 Nov 2010 15:21:05 +0000 (16:21 +0100)]
Getting the QmlJsModelManager working stand alone
Getting the QmlJsModelManager working stand alone
for auto testing
Reviewed-by: Christian Kamm
Thomas Hartmann [Wed, 10 Nov 2010 15:10:18 +0000 (16:10 +0100)]
QmlJSEditor: update of qml-builtin-types.xml
Thomas Hartmann [Thu, 11 Nov 2010 09:29:32 +0000 (10:29 +0100)]
QmlJS: Dump isWritable and isPointer for types.
Reviewed-by: Christian Kamm
Thomas Hartmann [Tue, 19 Oct 2010 14:15:32 +0000 (16:15 +0200)]
QmlJS: Fixing type hierarchy for holes (non exported types)
Done-with: Christian Kamm
Christian Kamm [Thu, 14 Oct 2010 12:27:00 +0000 (14:27 +0200)]
Add simple stub non-functional autotest.
Done-with: Thomas Hartmann
Christian Kamm [Thu, 11 Nov 2010 09:05:05 +0000 (10:05 +0100)]
Move shared code to a new QmlJSTools plugin.
Reviewed-by: Thomas Hartmann
Erik Verbruggen [Thu, 11 Nov 2010 10:00:40 +0000 (11:00 +0100)]
Changed license template reading to use the global default encoding.
Task-number: QTCREATORBUG-3039
Reviewed-by: con
Erik Verbruggen [Thu, 11 Nov 2010 09:46:08 +0000 (10:46 +0100)]
Removed left-over from merge request: duplicate file encoding combo.
con [Wed, 10 Nov 2010 16:54:43 +0000 (17:54 +0100)]
Make git ignore the new generated build files
Rhys Weatherley [Thu, 11 Nov 2010 01:29:29 +0000 (11:29 +1000)]
AST nodes for GLSL parser
dt [Wed, 10 Nov 2010 16:00:07 +0000 (17:00 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/static.pro
src/plugins/cppeditor/cppeditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
src/plugins/qt4projectmanager/qtoutputformatter.cpp
src/plugins/texteditor/generichighlighter/highlightersettings.cpp
dt [Wed, 10 Nov 2010 15:56:39 +0000 (16:56 +0100)]
Revert "QmlApp template: Use new 4.7.1 API to enable qml debugging"
This reverts commit
424fcf8c040d0bbe36c1c3d75612d8805a76a770.
Roberto Raggi [Wed, 10 Nov 2010 15:30:35 +0000 (16:30 +0100)]
Include stdio and regenerated the parser.
Roberto Raggi [Wed, 10 Nov 2010 15:20:37 +0000 (16:20 +0100)]
Compile.
Leandro Melo [Wed, 10 Nov 2010 14:09:18 +0000 (15:09 +0100)]
Plain text editor: Make sure user setting about folding markers is used
It was being reset based on the highlighter definitions.
Consider some refactoring with the related options as well to avoid
overriding user's settings.
Done-with: Thorbjorn Lindeijer
Roberto Raggi [Wed, 10 Nov 2010 14:44:59 +0000 (15:44 +0100)]
Introduced a simple incremental lexer for GLSL.
Roberto Raggi [Wed, 10 Nov 2010 13:01:09 +0000 (14:01 +0100)]
Initial import of the GLSL editor plug-in.
Roberto Raggi [Wed, 10 Nov 2010 11:32:34 +0000 (12:32 +0100)]
Imported our new GLSL front-end.
hjk [Wed, 10 Nov 2010 13:30:19 +0000 (14:30 +0100)]
debugger: remove some dead code
hjk [Wed, 10 Nov 2010 11:53:33 +0000 (12:53 +0100)]
debugger: fix/clarify intention of the EngineSetupFailed state.
mae [Wed, 10 Nov 2010 11:53:45 +0000 (12:53 +0100)]
Extend camel-case cursor movement
We now have different actions to bind to (saves us an explicit option).
Small fixes to state machines.
Done-with: Erik Verbruggen
Jarek Kobus [Wed, 10 Nov 2010 11:50:02 +0000 (12:50 +0100)]
Support pkg-config in AddLibraryWizard
Reviewed-by: dt <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-2378
hjk [Wed, 10 Nov 2010 11:38:29 +0000 (12:38 +0100)]
debugger: remove recently introduced endless loop in resetLocation()
Friedemann Kleint [Wed, 10 Nov 2010 11:30:02 +0000 (12:30 +0100)]
Debugger: Compile Windows.
Thomas Hartmann [Wed, 10 Nov 2010 10:39:58 +0000 (11:39 +0100)]
QmlDesigner.itemLibrary: use pixelSize instead of pointSize as default.
Since all units in qml are usually pixels and mobile devices
usually have much higher dpi than desktop screens, specifing font sizes
in points is usually not what a user wants to do.
Reviewed-by: Kai Koehne
Thomas Hartmann [Wed, 10 Nov 2010 10:34:26 +0000 (11:34 +0100)]
QuickToolBar: refine gradient editing
This patch solves minor usablity issues
in the gradient editing.
Reviewed-by: Lasse Holmstedt