OSDN Git Service
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
mae [Wed, 10 Nov 2010 11:26:18 +0000 (12:26 +0100)]
Extend camel-case cursor movement
Fix small issue with forward movement, and overwrite deleting to start
or end of word (normally Ctrl+Delete and Ctrl+Backspace)
Reviewed-by: Erik Verbruggen
hjk [Wed, 10 Nov 2010 11:23:40 +0000 (12:23 +0100)]
debugger: remove declaration of unneeded DebuggerCore::instance() method
hjk [Wed, 10 Nov 2010 11:13:42 +0000 (12:13 +0100)]
debugger: the slots are not needed in the debugger core interface
hjk [Wed, 10 Nov 2010 11:11:11 +0000 (12:11 +0100)]
debugger: add debuggercore.h
hjk [Wed, 10 Nov 2010 10:39:01 +0000 (11:39 +0100)]
debugger: refactoring of the plugin interface
There's some 'external' and some 'internal' part now. Other plugins
are only supposed the external interface.
Christian Kandeler [Wed, 10 Nov 2010 10:15:19 +0000 (11:15 +0100)]
Maemo: Don't try to re-run run control when run configuration is gone.
Quick fix for 2.1.
Proper fix is to copy all relevant information at run control creation time.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=203698
Reviewed-by: dt
Christian Kamm [Wed, 10 Nov 2010 10:06:59 +0000 (11:06 +0100)]
QmlJS: Highlighter now marks capitalized identifiers as types.
Task-number: QTCREATORBUG-2658
Reviewed-by: Roberto Raggi
Christian Kamm [Wed, 10 Nov 2010 09:34:47 +0000 (10:34 +0100)]
QmlJS: Fix incorrect completion inside 'Item\n{ ... }'.
The newline made the linizer add an automatic semicolon after Item,
causing the completion context finder to not recognize it as an object
definition.
Task-number: QTCREATORBUG-2658
Reviewed-by: Roberto Raggi
mae [Tue, 9 Nov 2010 14:19:14 +0000 (15:19 +0100)]
Support camel-case for word-wise movement
This was DevDay's 3rd most requested feature
Done-with: Erik Verbruggen
Bill King [Wed, 10 Nov 2010 01:11:07 +0000 (11:11 +1000)]
make compile
Arvid Ephraim Picciani [Tue, 9 Nov 2010 17:11:28 +0000 (18:11 +0100)]
correct accidentally commited qDebug
Alright, move on, nothing to see here. *whistle*
Arvid Ephraim Picciani [Tue, 9 Nov 2010 17:05:52 +0000 (18:05 +0100)]
lldb: use Icore::resourcePath() to find lldb
Arvid Ephraim Picciani [Tue, 9 Nov 2010 14:00:07 +0000 (15:00 +0100)]
Actually run breakpoint insertion
Thomas Hartmann [Tue, 9 Nov 2010 15:44:48 +0000 (16:44 +0100)]
QmlDesigner: fix memory leak
Reviewed-by: Kai Koehne
Leandro Melo [Tue, 9 Nov 2010 15:01:58 +0000 (16:01 +0100)]
Generic highlighter: Add Creator's share folder in the fallback definitions search.
This leaves the code prepared if we decide to ship some of the Kate XMLs (still
a pending decision). In this case the installer needs to be "notified" and the
Kate files put in the repo.
An addition check for actual XML files in the searched directories is also added.
Reviewed-by: con
Reviewed-by: Thorbjorn Lindeijer
Christian Kamm [Tue, 9 Nov 2010 14:07:04 +0000 (15:07 +0100)]
QmlDump: Don't try to build if it can't succeed.
Fixes trying to build qmldump for device Qt versions and removes the
follow-up warning about it not being possible.
Task-number: QTCREATORBUG-3046
Reviewed-by: Lasse Holmstedt
Reviewed-by: Kai Koehne
Christian Kamm [Tue, 9 Nov 2010 13:29:43 +0000 (14:29 +0100)]
QmlJS: Fix code model update when project filelist changes.
Task-number: QTCREATORBUG-2986
Reviewed-by: Roberto Raggi
Arvid Ephraim Picciani [Fri, 8 Oct 2010 10:14:51 +0000 (12:14 +0200)]
Experimental lldb engine host
Friedemann Kleint [Tue, 9 Nov 2010 11:56:26 +0000 (12:56 +0100)]
Debugger: Clean up shared pri.
Jarek Kobus [Tue, 9 Nov 2010 11:51:46 +0000 (12:51 +0100)]
Update Polish translations
hjk [Tue, 9 Nov 2010 11:50:46 +0000 (12:50 +0100)]
debugger: move the breakpoint hash to the private structure
Friedemann Kleint [Tue, 9 Nov 2010 11:40:36 +0000 (12:40 +0100)]
Debugger: Move cdbsymbolpathlisteditor to shared for new CDB engine.
Kai Koehne [Tue, 9 Nov 2010 11:32:33 +0000 (12:32 +0100)]
QmlObserver: Fix compilation if no private headers are installed
Use the copy of the qdeclarativedebughelper_p.h that we have in
qtcreator instead.
Reviewed-by: Christiaan Janssen
Arvid Ephraim Picciani [Mon, 8 Nov 2010 17:55:32 +0000 (18:55 +0100)]
Asynchronous breakpoint handling
hjk [Tue, 9 Nov 2010 09:23:10 +0000 (10:23 +0100)]
debugger: code cosmetics
Friedemann Kleint [Tue, 9 Nov 2010 10:58:22 +0000 (11:58 +0100)]
Debugger: Pop up log window in case error is logged.
Regression from 2.0.1
Rubber-stamped-by: hjk
Acked-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com>
Leandro Melo [Tue, 9 Nov 2010 09:36:02 +0000 (10:36 +0100)]
Editors: Continue refactoring indenters out of the editors.
This is pretty much a complement of commit
3a684586fabf103b8e09cef31a18ffae1fd9f0c7,
which is an attempt to make editors and indenters a bit more decoupled.
Reviewed-by: Thorbjorn Lindeijer
Leandro Melo [Mon, 8 Nov 2010 15:11:26 +0000 (16:11 +0100)]
Editors: Refactor auto-complete code out of the editors for better reusability.
Reviewed-by: Thorbjorn Lindeijer
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
Bill King [Tue, 9 Nov 2010 04:53:21 +0000 (14:53 +1000)]
make compile against 4.7 mainline
Christian Kandeler [Mon, 8 Nov 2010 17:14:09 +0000 (18:14 +0100)]
Maemo: Fix SFTP channel leak.
Reviewed-by: dt
hjk [Mon, 8 Nov 2010 17:00:57 +0000 (18:00 +0100)]
debugger: introduce enum for breakpoint states
hjk [Mon, 8 Nov 2010 16:43:31 +0000 (17:43 +0100)]
debugger: rename 'stop/quit' to exitDebugger
hjk [Mon, 8 Nov 2010 15:29:00 +0000 (16:29 +0100)]
debugger: simplify remoteCommand logic
hjk [Mon, 8 Nov 2010 15:17:59 +0000 (16:17 +0100)]
debugger: some cleanup after the model/view reorganization
hjk [Mon, 8 Nov 2010 14:57:40 +0000 (15:57 +0100)]
debugger: less indirections when opening files
Christian Kandeler [Mon, 8 Nov 2010 16:29:03 +0000 (17:29 +0100)]
Qt4ProjectManager: Omit .pro file warning if that is requested.
Normally, we print a debug message about INSTALLS += var
with var.files being empty.
Don't do this if var.CONFIG contains "no_check_exist".
Friedemann Kleint [Mon, 8 Nov 2010 16:20:40 +0000 (17:20 +0100)]
Build system: Fix warning when loading qtcreator.pro into Qt Creator.
Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Mon, 8 Nov 2010 16:15:33 +0000 (17:15 +0100)]
Debugger: Make Gdbmi threads parsing code re-usable.
Adapt watchutils code for new engine.
Acked-by: hjk
Alessandro Portale [Mon, 8 Nov 2010 15:43:18 +0000 (16:43 +0100)]
Forgotten change in
2a7336b4d661466f31ee487b95ec44d54df88792
Call the new QmlApplicationViewer::showExpanded();
Task-Number: QTCREATORBUG-2979
Reviewed-By: dt
Arvid Ephraim Picciani [Mon, 8 Nov 2010 15:03:59 +0000 (16:03 +0100)]
Add CLang support to DisassemblerViewAgent
hjk [Mon, 8 Nov 2010 14:50:13 +0000 (15:50 +0100)]
debugger: remove indirection through view for selectThread()
hjk [Mon, 8 Nov 2010 14:41:44 +0000 (15:41 +0100)]
debugger: move more gui bit from engine to plugin
Kai Koehne [Mon, 8 Nov 2010 13:55:50 +0000 (14:55 +0100)]
ApplicationOutput: Also linkify qml errors without column.
I didn't manage to find one regular expression that matches both lines with and
without column correctly. Instead use two distinct ones ...
Task-number: QTCREATORBUG-3022
hjk [Mon, 8 Nov 2010 14:32:18 +0000 (15:32 +0100)]
debugger: another compile fix
Kai Koehne [Fri, 5 Nov 2010 14:00:34 +0000 (15:00 +0100)]
Application Output: Fix linkification of files in shadow builds / deployment folders
Try to map absolute paths pointing to files in shadow build directory
/ on the device to the respective files in the project directory.
Task-number: QTCREATORBUG-2371
Reviewed-by: dt
hjk [Mon, 8 Nov 2010 14:29:21 +0000 (15:29 +0100)]
debugger: compile fix for threadshandler
hjk [Mon, 8 Nov 2010 14:19:13 +0000 (15:19 +0100)]
debugger: kill command handler & company
Erik Verbruggen [Mon, 8 Nov 2010 14:14:39 +0000 (15:14 +0100)]
Fixed in-source builds for custom QML extension plug-ins.
Check if the output directory is different from the source dir. If so,
do the copying magic (shadow build), otherwise skip it (in-source build).
Task-number: QTCREATORBUG-3034
Reviewed-by: Alessandro Portale
Reviewed-by: Oswald Buddenhagen
con [Mon, 8 Nov 2010 14:05:18 +0000 (15:05 +0100)]
Make extension system tests work in new location
con [Mon, 8 Nov 2010 13:36:26 +0000 (14:36 +0100)]
Move extension system auto tests.
con [Mon, 8 Nov 2010 13:08:41 +0000 (14:08 +0100)]
Make extension system tests running again.
con [Mon, 8 Nov 2010 13:08:06 +0000 (14:08 +0100)]
Fix size of dialog for downloading highlighting definitions.
con [Mon, 8 Nov 2010 13:07:25 +0000 (14:07 +0100)]
Avoid that anyone using action manager has to explicitly include uniqueidmanager
Arvid Ephraim Picciani [Mon, 8 Nov 2010 13:18:37 +0000 (14:18 +0100)]
Add stream operators for debugger transport types
Reviewed-by: hjk
Jarek Kobus [Mon, 8 Nov 2010 13:27:02 +0000 (14:27 +0100)]
Compile
Christian Kandeler [Mon, 8 Nov 2010 13:10:43 +0000 (14:10 +0100)]
Maemo: Don't interpret plugins as static libraries in deployment view.
Reviewed-by: Thorbjørn Lindeijer
Jarek Kobus [Mon, 8 Nov 2010 13:01:50 +0000 (14:01 +0100)]
Support completion in profile editor
Task-number: QTCREATORBUG-2110
Thomas Hartmann [Mon, 8 Nov 2010 13:03:17 +0000 (14:03 +0100)]
QmlDesigner.propertyEditor: crash fix
We have to check if an AuxiliaryData actually exists.
Reviewed-by: Kai Koehne
Pawel Polanski [Mon, 8 Nov 2010 12:37:44 +0000 (13:37 +0100)]
qmake error/warning parser has been improved
hjk [Fri, 5 Nov 2010 18:38:40 +0000 (19:38 +0100)]
debugger: more handler/window refactoring
hjk [Fri, 5 Nov 2010 16:02:27 +0000 (17:02 +0100)]
debugger: convert threads model
Tobias Hunger [Mon, 8 Nov 2010 10:28:54 +0000 (11:28 +0100)]
Make sure we do not get "//" in the QMake path
Task-number: QTCREATORBUG-2990
Roberto Raggi [Mon, 8 Nov 2010 10:29:44 +0000 (11:29 +0100)]
Fixed regression when completing function templates.
Reviewed-by: Erik Verbruggen
Kai Koehne [Mon, 8 Nov 2010 08:41:40 +0000 (09:41 +0100)]
DebugHelpers: Use static QRegExp for performance reasons
Reviewed-by: Bill King
Kai Koehne [Wed, 3 Nov 2010 09:44:40 +0000 (10:44 +0100)]
QmlApp template: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (
b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...
The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.
Bill King [Mon, 8 Nov 2010 05:39:23 +0000 (15:39 +1000)]
helpplugin: another attempt at getting pulse compiling
Bill King [Mon, 8 Nov 2010 05:08:41 +0000 (15:08 +1000)]
help plugin: Make compile on windows/under pulse