OSDN Git Service
Thomas Hartmann [Fri, 10 Dec 2010 21:46:18 +0000 (22:46 +0100)]
QmlDesigner.formEditor: wire up instancesCompleted() to tools
Thomas Hartmann [Fri, 10 Dec 2010 21:01:55 +0000 (22:01 +0100)]
QmlDesigner.itemlibrary: filter item library by imports
Only show items that are available and use requiredImport for filtering
dt [Fri, 10 Dec 2010 18:02:19 +0000 (19:02 +0100)]
Remove debug output
dt [Fri, 10 Dec 2010 18:01:01 +0000 (19:01 +0100)]
Qt4ProjectManager: Fix disabling runconfigurations on parse
Turns out to be a oversight
Thomas Hartmann [Fri, 10 Dec 2010 17:27:09 +0000 (18:27 +0100)]
QmlDesigner: compile fix
Thomas Hartmann [Fri, 10 Dec 2010 16:57:42 +0000 (17:57 +0100)]
QmlDesigner.itemLibrary: turn the item library into a full view.
This is more consistent with the whole architecture and allows
the item library to listen to imports.
Friedemann Kleint [Fri, 10 Dec 2010 16:17:55 +0000 (17:17 +0100)]
Debugger[New CDB]: First stab at containers.
Set up infrastructure for having 'fake' children in a symbolgroup
that merely reference others. Print inames correctly, do index
bookkeeping accordingly, adapt visitor.
Prototypically implement complex dumpers for array-type containers.
adding children as additional symbols.
Thomas Hartmann [Fri, 10 Dec 2010 14:33:20 +0000 (15:33 +0100)]
QMlDesigner.navigator: visualize unknown types
Types unknown to the metasystem get the red line now and a questionmark icon.
Thomas Hartmann [Fri, 10 Dec 2010 10:38:58 +0000 (11:38 +0100)]
QmlDesigner.rewriter: fix Qt/QtQuick import issue
The Qt import was removed in the QtQuick case.
Christian Kamm [Fri, 10 Dec 2010 14:42:34 +0000 (15:42 +0100)]
C++: Add quick fix for Q_PROPERTY.
At the moment, it inserts implementations inline.
Done-with: Leandro Melo
con [Fri, 10 Dec 2010 13:49:06 +0000 (14:49 +0100)]
Dropping project blocks other programs (like file explorer).
We have to delay or drop event handling, so the Qt code that delivers
the event can return control. The commit also prevents dropping another
file while we are currently already handling a drop.
Task-number: QTCREATORBUG-3344
dt [Fri, 10 Dec 2010 13:20:53 +0000 (14:20 +0100)]
Environment Model: Fix addVariable
Kai Koehne [Fri, 10 Dec 2010 12:19:55 +0000 (13:19 +0100)]
QmlProject: Store 'run current file' in settings
Store the artifical 'CurrentFile' in the settings as the mainFile, cause
leaving it empty translates to 'use file from project'.
Kai Koehne [Fri, 10 Dec 2010 12:09:28 +0000 (13:09 +0100)]
QmlObserver: Fix automatic compilation with latest patches
Don't enumerate all files to be copied any more, but copy whole
subdirectory tree.
Kai Koehne [Fri, 10 Dec 2010 11:27:33 +0000 (12:27 +0100)]
Update qmlobserver with latest qmlviewer patches
Update qmlobserver with changes in qmlviewer until
376e636eccedb8d8bb.
hjk [Fri, 10 Dec 2010 11:41:44 +0000 (12:41 +0100)]
debugger: structural cleanup remote debugging
Use virtual function instead of if/qobject_cast cascades.
hjk [Fri, 10 Dec 2010 09:01:29 +0000 (10:01 +0100)]
debugger: find better separation between runcontrol and engine
hjk [Fri, 10 Dec 2010 08:37:31 +0000 (09:37 +0100)]
debugger: minor cleanup
hjk [Fri, 10 Dec 2010 08:23:32 +0000 (09:23 +0100)]
debugger: the DebuggerRunControlFactory could be internal
hjk [Wed, 8 Dec 2010 17:23:10 +0000 (18:23 +0100)]
debugger: remove displayDebugger() from the plugin interface
hjk [Wed, 8 Dec 2010 17:19:49 +0000 (18:19 +0100)]
debugger: make the mode an automatically released object
Roberto Raggi [Fri, 10 Dec 2010 10:50:36 +0000 (11:50 +0100)]
Improved follow symbol under cursor when searching for macro definitions.
Reviewed-by: Christian Kamm
con [Fri, 10 Dec 2010 10:09:55 +0000 (11:09 +0100)]
Merge remote branch 'origin/2.1'
dt [Thu, 9 Dec 2010 18:02:15 +0000 (19:02 +0100)]
FlatModel: Fix sorting
Mea culpa
Friedemann Kleint [Fri, 10 Dec 2010 09:47:51 +0000 (10:47 +0100)]
Debugger[New CDB]: Work on recoding char *-pointers.
Latin1/Ucs4. Append hex dump in case non-printable
characters show in default output.
Roberto Raggi [Fri, 10 Dec 2010 09:47:57 +0000 (10:47 +0100)]
Try to get the right overload when switching from a declaration to its definition.
Roberto Raggi [Fri, 10 Dec 2010 09:32:46 +0000 (10:32 +0100)]
Added some initial support for function overloading.
dt [Thu, 9 Dec 2010 19:08:53 +0000 (20:08 +0100)]
Remove debugging output again
dt [Thu, 9 Dec 2010 19:08:10 +0000 (20:08 +0100)]
EnvironmentModel: Fix crash on clicking add twice
Task-Nr: QTCREATORBUG-3336
dt [Thu, 9 Dec 2010 18:53:49 +0000 (19:53 +0100)]
Session Manager: Set corrrect window title after unloading last project
Task-Nr: QTCREATORBUG-3337
Friedemann Kleint [Thu, 9 Dec 2010 16:04:43 +0000 (17:04 +0100)]
Debugger[New CDB]: Pass formatting parameters.
Pass around formatting parameters as structure.
Prototypically implement formatting of char *-Pointers
as UTF8.
Transfer registers and modules only if dock window is visible.
Thomas Hartmann [Thu, 9 Dec 2010 15:43:03 +0000 (16:43 +0100)]
QmlDesigner: adding Meego plugin
Thomas Hartmann [Thu, 9 Dec 2010 15:42:47 +0000 (16:42 +0100)]
QmlDesigner: adding Symbian plugin
Thomas Hartmann [Thu, 9 Dec 2010 15:42:09 +0000 (16:42 +0100)]
QmlDesigner.metaInfo: crashfix
getNearestQmlObjectValue() might be 0 if qmldump could not dump the
C++ object.
Thomas Hartmann [Thu, 9 Dec 2010 15:41:14 +0000 (16:41 +0100)]
QmlDesigner.itemLibrary: add requiredImport
Thomas Hartmann [Thu, 9 Dec 2010 15:39:15 +0000 (16:39 +0100)]
QmlDesigner.dragAndDrop: properly add imports
Imports have to be added before transaction starts.
Thomas Hartmann [Thu, 9 Dec 2010 15:38:28 +0000 (16:38 +0100)]
QmlDesigner.dragAndDrop: crashfix
dragNode might be invalid!
Thomas Hartmann [Thu, 9 Dec 2010 13:19:37 +0000 (14:19 +0100)]
QmlDesigner.propertyEditor: optimize startup
The QApplication::processEvents(); slowed it down.
Rectangle and Text is enough.
Thomas Hartmann [Thu, 9 Dec 2010 13:18:55 +0000 (14:18 +0100)]
QmlDesigner.itemLibrary: always show Qml Components first
Also we do translate "Qml Components" anymore since it might get confusing
and all the other categories do not get translated, either.
Tobias Hunger [Thu, 9 Dec 2010 15:41:02 +0000 (16:41 +0100)]
Git: Stop debug message
Tobias Hunger [Thu, 9 Dec 2010 15:37:37 +0000 (16:37 +0100)]
Git: Bring iexisting editors to foreground
If we have some git operation in an editor already: Bring that to
the foreground.
Tobias Hunger [Thu, 9 Dec 2010 14:53:45 +0000 (15:53 +0100)]
Git: Allow for pretty format selection in git show
Allow for pretty format selection in git show.
Save selected value and default to "email".
Task-number: QTCREATORBUG-3341
Marco Bubke [Thu, 9 Dec 2010 15:09:37 +0000 (16:09 +0100)]
QmlDesigner: Add component complete feature
This notifies the views if the instance has be really instanced.
Pawel Polanski [Thu, 9 Dec 2010 11:03:44 +0000 (12:03 +0100)]
Certificate management should not throw exceptions when loading Dev Certificates
Task-number: QTCREATORBUG-3323
Reviewed-by: Tobias Hunger
dt [Wed, 8 Dec 2010 17:57:31 +0000 (18:57 +0100)]
ProjectExplorer, FlatModel: Crash fix
sortNodes only ensured a partial ordering, we need a total ordering.
Reviewed-By: con
Task-Nr: QTCREATORBUG-3317
Task-Nr: QTCREATORBUG-3302
Marco Bubke [Thu, 9 Dec 2010 12:46:09 +0000 (13:46 +0100)]
Add qtpromaker to gitignores
Marco Bubke [Thu, 9 Dec 2010 12:44:02 +0000 (13:44 +0100)]
QmlDesigner.NodeInstances: Revert to base state for every state change
This is a woukround and should be fixed later.
Christian Kamm [Thu, 9 Dec 2010 12:20:13 +0000 (13:20 +0100)]
QmlJS indenter: Fix for expressions starting with numbers or strings.
Reviewed-by: Roberto Raggi
con [Thu, 9 Dec 2010 10:37:58 +0000 (11:37 +0100)]
Recent files should remember the editor type as well.
Task-number: QTCREATORBUG-1785
Leandro Melo [Thu, 9 Dec 2010 10:24:01 +0000 (11:24 +0100)]
Snippets: Replace forward declaration by include
Avoid issues with QXmlStream* classes on Mac.
Reviewed-by: con
Tobias Hunger [Thu, 9 Dec 2010 09:41:13 +0000 (10:41 +0100)]
Qt4: Simplify makestep
* Remove unnecessary member variable.
Friedemann Kleint [Thu, 9 Dec 2010 08:49:23 +0000 (09:49 +0100)]
Symbian CODA: Add ping for serial, handle reading long messages.
Some renaming and cleanup.
Christian Kamm [Thu, 9 Dec 2010 08:41:43 +0000 (09:41 +0100)]
QmlJS: Set default import paths in constructor.
Also, remove the import path of the Qt that Creator was built with. It
might make things seem to work on built-from-source Creators that will
fail when Creator is shipped.
Reviewed-by: Erik Verbruggen
Thomas Hartmann [Wed, 8 Dec 2010 17:19:57 +0000 (18:19 +0100)]
QmlDesigner: fixes warnings
Thomas Hartmann [Wed, 8 Dec 2010 17:19:40 +0000 (18:19 +0100)]
QmlDesigner.statesEditorView: crash fix
fixes crash on shutdown
hjk [Wed, 8 Dec 2010 17:14:48 +0000 (18:14 +0100)]
debugger: the mainwindow does not have to be in the plugin object pool
Thomas Hartmann [Wed, 8 Dec 2010 17:12:34 +0000 (18:12 +0100)]
QmlDesigner: compile fix
hjk [Wed, 8 Dec 2010 16:56:20 +0000 (17:56 +0100)]
debugger: remove superflous namespace qualifications
hjk [Wed, 8 Dec 2010 16:54:16 +0000 (17:54 +0100)]
debugger: fix crash on exit
Order matters.
Marco Bubke [Wed, 8 Dec 2010 15:46:25 +0000 (16:46 +0100)]
QmlDesigner: Refactor states editor
Reviewed-By: Thomas Hartmann
Leandro Melo [Wed, 8 Dec 2010 15:05:48 +0000 (16:05 +0100)]
Snippets: Remove the snippets manager
Let the collection itself be the singleton.
Leandro Melo [Mon, 6 Dec 2010 10:30:28 +0000 (11:30 +0100)]
Snippets: Add include
Leandro Melo [Fri, 3 Dec 2010 14:55:51 +0000 (15:55 +0100)]
Snippets: Make it flexible for adding builtin snippets
Instead of in one XML embedded as a resource, now builtin
snippets can be specified on any XML distributed under share.
Leandro Melo [Thu, 2 Dec 2010 16:15:35 +0000 (17:15 +0100)]
Snippets: Correct top-left/bottom-right when emiting dataChanged
Leandro Melo [Thu, 2 Dec 2010 16:02:23 +0000 (17:02 +0100)]
Snippets: Make it easier for plugins to add snippets groups
Groups are no longer enum values but identified from snippet providers.
Leandro Melo [Mon, 29 Nov 2010 16:25:01 +0000 (17:25 +0100)]
Snippets: Track begin of first selection
Since in the snippets overlay the selections are created with
ExpandBegin the interest is mostly in detecting when the first one
moved to the left (for example, when an undo is performed right
after inserting the snippet). However, this tracking doesn't need
to necessarily be associated with that flag.
Leandro Melo [Wed, 24 Nov 2010 10:04:24 +0000 (11:04 +0100)]
Snippets: Add more use-cases
- Restored removed built-in snippets.
- Revert a built-in snippet.
- Reset the snippets collection.
Leandro Melo [Tue, 23 Nov 2010 10:31:57 +0000 (11:31 +0100)]
Snippets: Move code from the manager to the collection.
Reloading and synchronizing are now directly accessible from
the collection interface.
Leandro Melo [Mon, 22 Nov 2010 14:09:27 +0000 (15:09 +0100)]
Snippets: Do not update content on window deactivation
Leandro Melo [Tue, 9 Nov 2010 10:53:42 +0000 (11:53 +0100)]
Snippets: Rename a method in the snippet editor.
Leandro Melo [Tue, 9 Nov 2010 10:44:49 +0000 (11:44 +0100)]
Snippets: Set auto-completers.
Leandro Melo [Mon, 8 Nov 2010 10:45:39 +0000 (11:45 +0100)]
Snippets: Enable editor's parentheses matching.
Leandro Melo [Mon, 8 Nov 2010 10:42:07 +0000 (11:42 +0100)]
Snippets: Set indenters.
Leandro Melo [Wed, 3 Nov 2010 09:05:37 +0000 (10:05 +0100)]
Snippets: Make text snippets available to all groups.
And mark the completion item as a snippet.
Leandro Melo [Tue, 2 Nov 2010 14:35:42 +0000 (15:35 +0100)]
Snippets: Synchronize editing of equivalent variables inside snippets.
When editing one variable from a code snippet, all other variables
with the same name are updated accordingly.
Leandro Melo [Wed, 27 Oct 2010 15:38:22 +0000 (17:38 +0200)]
Snippets: Feature enhancement start...
Provide an interface so users can create/edit/remove snippets.
Leandro Melo [Wed, 8 Dec 2010 16:20:45 +0000 (17:20 +0100)]
Compile fix.
Thomas Hartmann [Wed, 8 Dec 2010 16:09:58 +0000 (17:09 +0100)]
QmlDesigner.nodeInstances: changing ordering of notification
This avoids flickering, since parentChanged now
comes after property changed.
Thomas Hartmann [Wed, 8 Dec 2010 15:10:32 +0000 (16:10 +0100)]
QmlDesigner.dragAndDrop: optimize drag and drop behaivour
We select now after the drop event.
Some fixes for the out of process stuff.
Thomas Hartmann [Wed, 8 Dec 2010 09:08:53 +0000 (10:08 +0100)]
QmlDesigner.itemLibrary: simplification
hjk [Wed, 8 Dec 2010 13:08:35 +0000 (14:08 +0100)]
debugger: make memory view updatable
Task-number: QTCREATORBUG-3242
hjk [Wed, 8 Dec 2010 11:43:11 +0000 (12:43 +0100)]
debugger: split debuggeragents.{h,cpp} int {memory,disassembler}agent.{h,cpp}
Friedemann Kleint [Wed, 8 Dec 2010 15:50:40 +0000 (16:50 +0100)]
Symbian/CODA: Add infrastructure for serial communication.
Add USB protocol and chunking.
Oswald Buddenhagen [Wed, 8 Dec 2010 15:13:11 +0000 (16:13 +0100)]
fix navigation
Reviewed-by: Leena Miettinen
Oswald Buddenhagen [Wed, 8 Dec 2010 15:01:31 +0000 (16:01 +0100)]
add fixnavi target for convenience
Oswald Buddenhagen [Wed, 8 Dec 2010 13:46:26 +0000 (14:46 +0100)]
fix fixing of navigation with multiple files
Alessandro Portale [Wed, 8 Dec 2010 15:07:09 +0000 (16:07 +0100)]
Fixing several issues in folder deployment
- Also copying paths when doing in-source build,
and not copying paths if source and target differ
- Quote paths in order to support white spaces
- Tolerate forward slashes as input paths
Task-Number: QTCREATORBUG-3203
Reviewed-By: ck
Merge-request: 226
Kai Koehne [Fri, 3 Dec 2010 16:04:29 +0000 (17:04 +0100)]
QmlProject: Add mainFile property
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.
The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!
Task-number: QTCREATORBUG-3249
Kai Koehne [Fri, 3 Dec 2010 13:32:21 +0000 (14:32 +0100)]
QmlProject: Add autotest for Files element
Jarek Kobus [Wed, 8 Dec 2010 11:24:03 +0000 (12:24 +0100)]
Update Polish translations
Task-number: QTCREATORBUG-3313
Christian Kamm [Wed, 8 Dec 2010 12:50:24 +0000 (13:50 +0100)]
C++ indenter: Fix for access declarations and initializer lists.
Reviewed-by: Erik Verbruggen
Leena Miettinen [Wed, 8 Dec 2010 11:28:17 +0000 (12:28 +0100)]
Doc: opening projects
Task-number: QTCREATORBUG-2426
Reviewed-by: Tobias Hunger
Leena Miettinen [Tue, 7 Dec 2010 17:05:14 +0000 (18:05 +0100)]
Doc: replace build example with a Qt Quick application
Reviwed-by: Carsten Owerfeldt
Leena Miettinen [Tue, 7 Dec 2010 10:58:14 +0000 (11:58 +0100)]
Doc: fix link to previous page
con [Wed, 8 Dec 2010 10:39:16 +0000 (11:39 +0100)]
Add method to get all the visible "top level" editors in splits.
Christian Kandeler [Wed, 8 Dec 2010 10:20:44 +0000 (11:20 +0100)]
Maemo: Add GUI element to set project description.
Sergey Belyashov [Wed, 8 Dec 2010 10:02:39 +0000 (11:02 +0100)]
Fixed Russian translation of word "Comment"
Merge-request: 2184
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
con [Wed, 8 Dec 2010 09:57:21 +0000 (10:57 +0100)]
Merge remote branch 'origin/2.1'
Conflicts:
doc/qtcreator.qdoc
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
src/plugins/qt4projectmanager/qmakestep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
Kai Koehne [Wed, 8 Dec 2010 08:05:44 +0000 (09:05 +0100)]
README: QmlJSInspector does not require private headers any more
QmlJSInspector does not depend on Qt private headers being available
any more: The needed private API files have been copied into the
QtCreator source repo.
con [Tue, 7 Dec 2010 15:48:57 +0000 (16:48 +0100)]
Mac: Fix opening ui files in external designer