OSDN Git Service
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.
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
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
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.
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
con [Tue, 7 Dec 2010 15:48:57 +0000 (16:48 +0100)]
Mac: Fix opening ui files in external designer
Friedemann Kleint [Wed, 8 Dec 2010 08:08:59 +0000 (09:08 +0100)]
L10n: Update more German translations.
Task-number: QTCREATORBUG-3312
hjk [Wed, 8 Dec 2010 06:57:20 +0000 (07:57 +0100)]
bineditor: add a facility to invalidate the cache from the outside
This is necessary to handle "live updates". Originally done by ck.
hjk [Tue, 7 Dec 2010 16:34:43 +0000 (17:34 +0100)]
vcsmanager: coding convention
hjk [Tue, 7 Dec 2010 16:28:03 +0000 (17:28 +0100)]
vcsmanager: add comment to currently dead code
Christian Kandeler [Tue, 7 Dec 2010 17:30:36 +0000 (18:30 +0100)]
Maemo: Manage project's display name for package manager.
Task-number: QTCREATORBUG-3063
Christian Kandeler [Tue, 7 Dec 2010 16:33:55 +0000 (17:33 +0100)]
Maemo: Check some meta information before publishing.
dt [Tue, 7 Dec 2010 16:50:58 +0000 (17:50 +0100)]
Qmlprojectplugin: work again
Splitted up patches wrongly
Thomas Hartmann [Tue, 7 Dec 2010 16:33:27 +0000 (17:33 +0100)]
QmlDesigner.rewriter: We use QmlJSCheck now to validate the document
We check the qml file/document now with QmlJSCheck.
We explicitly disable checking of qml types.
Thomas Hartmann [Tue, 7 Dec 2010 16:31:53 +0000 (17:31 +0100)]
QmlJSCheck: adding more checks
We are checking for duplicate ids and duplicate property definitions now.
Thomas Hartmann [Tue, 7 Dec 2010 13:26:00 +0000 (14:26 +0100)]
QmlDesigner.model: nice qDebug output for ModelNode
Thomas Hartmann [Tue, 7 Dec 2010 13:25:32 +0000 (14:25 +0100)]
QmlDesigner.nodeInstances: fixing isValid for NodeInstance
We have to check also for the ModelNode, but we also have to avoid
recursion.
Reviewed-by: Marco Bubke
Thomas Hartmann [Tue, 7 Dec 2010 13:23:46 +0000 (14:23 +0100)]
QmlDesigner.model: properly detach from views
Properly detach from rewriter view and node instance view
on model destruction.
Reviewed-by: Marco Bubke
hjk [Mon, 6 Dec 2010 13:12:38 +0000 (14:12 +0100)]
Replace BaseMode convenience class by individual implementation.
Using the convienience class does not really save code and adds another
needless level in the hierarchy. This affects the three remaining BaseMode
users: Help, ProjectExplorer and HelloWorld.
dt [Mon, 6 Dec 2010 15:28:01 +0000 (16:28 +0100)]
Header cleanup
dt [Mon, 6 Dec 2010 15:25:11 +0000 (16:25 +0100)]
Coding style
dt [Mon, 6 Dec 2010 15:24:29 +0000 (16:24 +0100)]
coding style
dt [Thu, 25 Nov 2010 17:40:02 +0000 (18:40 +0100)]
Qt4ProjectManager: Fix Maemo runconfiguration isEnabled
Reviewed-By: hunger
dt [Thu, 25 Nov 2010 17:38:54 +0000 (18:38 +0100)]
Qt4ProjectManager: Fix Qt4RunConfiguration::isEnabled()
Reviewed-By: hunger
Christian Kamm [Tue, 7 Dec 2010 15:33:22 +0000 (16:33 +0100)]
QmlJS completion: Fix segfault.
Reviewed-by: Lasse Holmstedt
Erik Verbruggen [Tue, 7 Dec 2010 15:20:46 +0000 (16:20 +0100)]
Improved switching between method declarationand definition.
Reviewed-by: Roberto Raggi
dt [Tue, 7 Dec 2010 14:41:26 +0000 (15:41 +0100)]
Qt4ProjectManager: set the displayname and icon on creating new projects
This code is still needed.
Jarek Kobus [Tue, 7 Dec 2010 14:28:44 +0000 (15:28 +0100)]
Handle property nonlinear wizards
Reviewed-by: dt <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-2511
Pawel Polanski [Tue, 7 Dec 2010 14:20:09 +0000 (15:20 +0100)]
Information about the time that took the CODA to process a command.
Christian Kandeler [Tue, 7 Dec 2010 14:05:36 +0000 (15:05 +0100)]
Maemo: Fix path to exectuable in desktop file when publishing.
Friedemann Kleint [Tue, 7 Dec 2010 14:19:35 +0000 (15:19 +0100)]
Windows compile fix.
Christian Kamm [Tue, 7 Dec 2010 13:30:17 +0000 (14:30 +0100)]
C++ indenter: Don't use label indent when typing 'Type:'.
It could easily be followed by another colon.
Reviewed-by: Roberto Raggi
dt [Tue, 7 Dec 2010 12:27:52 +0000 (13:27 +0100)]
Qt4ProjectManager: Actually add the qt4targetfactory to the object pool
Makes Creator useable again :)
dt [Mon, 6 Dec 2010 15:15:41 +0000 (16:15 +0100)]
ProjectExplorer: Move ITargetFactory to object pool
Makes multiple target factories per project possible
Reviewed-By: hunger
dt [Mon, 6 Dec 2010 12:29:18 +0000 (13:29 +0100)]
Qt4: Move Qt4Target and Qt4BC out of the Internal namespace
Reviewed-By: hunger
Thomas Hartmann [Thu, 2 Dec 2010 14:15:14 +0000 (15:15 +0100)]
QmlDesigner.propertyEditor: fix opacity slider bug
The granularity of the slider was to fine.
So 1 could be a rounded 0.99.
Task-number: QTCREATORBUG-3035
Reviewed-by: Marco Bubke
Thomas Hartmann [Thu, 2 Dec 2010 14:13:45 +0000 (15:13 +0100)]
QmlDesigner.nodeInstances: crash fix
PathView creates problems and we do not properly support it anyway.
We just create a dummy instance, instead.
Task-number: QTCREATORBUG-3251
Reviewed-by: Marco Bubke
con [Tue, 7 Dec 2010 11:25:20 +0000 (12:25 +0100)]
compatVersion has nothing to do with Qt Creator version.
Nicolas Arnaud-Cormos [Tue, 7 Dec 2010 11:24:30 +0000 (12:24 +0100)]
Update the template for Qt Creator plugin.
Make it more consistant with the current plugins:
* plugin class use the Plugin template instead of Impl
* add a pluginconstants.h file
* use the new pluginspec.in file
Merge-request: 216
Reviewed-by: con <qtc-committer@nokia.com>
Sami Tikka [Tue, 7 Dec 2010 11:26:42 +0000 (12:26 +0100)]
VCS: Support nested repositories
Find correct version control to use in a repo inside another repo (e.g.
SVN checkout inside a git repo)
Merge-request: 224
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
con [Tue, 7 Dec 2010 09:53:42 +0000 (10:53 +0100)]
Coding style.
Friedemann Kleint [Tue, 7 Dec 2010 10:28:21 +0000 (11:28 +0100)]
L10n: Update German translations.
Task-number: QTCREATORBUG-3305
Friedemann Kleint [Tue, 7 Dec 2010 10:22:39 +0000 (11:22 +0100)]
Debugger[CDB]: Fix crash when printing large arrays.
Terminate string buffer correctly.
Reviewed-by: dt
Task-number: QTCREATORBUG-3271
Kai Koehne [Tue, 30 Nov 2010 15:23:22 +0000 (16:23 +0100)]
QmlWizards: Use 'QtQuick 1.0' namespace
Use the 'QtQuick 1.0' namespace introduced in 4.7.1. This makes them in
line with the examples/demos we ship in the SDK, but breaks for 4.7.0
(e.g. N900).
Task-number: QTCREATORBUG-3243
Friedemann Kleint [Tue, 7 Dec 2010 10:05:25 +0000 (11:05 +0100)]
Symbian[CODA-client]: Copy files in chunks. Fix usage information.
Leandro Melo [Tue, 7 Dec 2010 08:26:39 +0000 (09:26 +0100)]
Gen. highlighter: Improve performance (delimiters)
Make lookup for a delimiter a bit faster.
Leandro Melo [Mon, 6 Dec 2010 18:20:37 +0000 (19:20 +0100)]
Gen. highlighter: Improve performance (reg. exp.)
Cache matches of the RegExprRule to avoid unnecessary calls.
This is essentially the same optimization existent in Kate.
A colateral effect of this implementation is a mechanism to
notify the rules when a progress (highlight of the current
line) is finished.
Thomas Hartmann [Tue, 7 Dec 2010 09:10:11 +0000 (10:10 +0100)]
QmlDesigner.navigator: fixes shown properties
Some enums have the same typname as QDeclarative items.
We have to check for this case.
Bill King [Mon, 6 Dec 2010 23:41:48 +0000 (09:41 +1000)]
Fixes compile
con [Mon, 6 Dec 2010 16:21:03 +0000 (17:21 +0100)]
Make it possible to specify shortcuts for Locator filters.
Task-number: QTCREATORBUG-1147
con [Mon, 6 Dec 2010 16:38:42 +0000 (17:38 +0100)]
Fix crash when using settings dialog filter.
Introduced by
773343f396adb765e3b1837b3d961045e2a10056
Need to ensure widget creation when filtering, because the translated
strings from the widgets are used for key words.
Arvid Ephraim Picciani [Mon, 6 Dec 2010 17:15:53 +0000 (18:15 +0100)]
lldb: remove incorrect running hints from step funcs
the target eventloop emits the correct events when stepping,
(running followed by stop)
its up to the Debuggerruncontrol to fix the raceconditions.
emiting events artificially just makes it worse
Christian Kandeler [Mon, 6 Dec 2010 17:15:11 +0000 (18:15 +0100)]
Mobile wizards: Scale Maemo icon if necessary and approved by user.
Arvid Ephraim Picciani [Mon, 6 Dec 2010 16:59:53 +0000 (17:59 +0100)]
lldb: spit out canonical path for frame source
Thomas Hartmann [Mon, 6 Dec 2010 16:45:51 +0000 (17:45 +0100)]
QmlDesigner.metaSystem: optimizations
Improved caching. Using of hash instead of a list...
Thomas Hartmann [Mon, 6 Dec 2010 16:44:54 +0000 (17:44 +0100)]
QmlDesigner.model: leading '_' is allowed for ids
Thomas Hartmann [Mon, 6 Dec 2010 16:44:25 +0000 (17:44 +0100)]
QmlDesigner.dragAndDrop: fix
This is just a hotfix. We have to find a way to properly
sync with the out of process node instances.
Thomas Hartmann [Mon, 6 Dec 2010 16:43:30 +0000 (17:43 +0100)]
QmlDesigner.itemLibary: keep track of version
We have to define a version for the item library.
Before 4.7 was hardcoded.
Slight update of the itemlibrary.
Thomas Hartmann [Mon, 6 Dec 2010 16:42:05 +0000 (17:42 +0100)]
QmlDesigner.nodeinstanes: crash fix
We have to check if there is a model. Might be detached, already!
Thomas Hartmann [Mon, 6 Dec 2010 16:41:24 +0000 (17:41 +0100)]
QmlDesigner.statesEditorView: Crash fix
The removed node is propably not a state.
Thomas Hartmann [Mon, 6 Dec 2010 16:40:45 +0000 (17:40 +0100)]
QmlDesigner: crashfix
The model() might be deleted already!
Thomas Hartmann [Mon, 6 Dec 2010 16:40:12 +0000 (17:40 +0100)]
QmlDesigner.propertyEditor: fix for webview
Handle different packages
Thomas Hartmann [Mon, 6 Dec 2010 16:39:08 +0000 (17:39 +0100)]
QmlDesigner.propertyEditor: only show writable properties
Thomas Hartmann [Mon, 6 Dec 2010 16:38:45 +0000 (17:38 +0100)]
QmlDesigner.propertyEditor: crashfix
When the property editor is closed before the timer runs out,
now the timer is deleted.
Before we accessed a dangling pointer.
Thomas Hartmann [Mon, 6 Dec 2010 16:37:17 +0000 (17:37 +0100)]
QmlDesigner.navigator: small fix
Do now show any dot properties in the Navigator
Thomas Hartmann [Mon, 6 Dec 2010 16:36:35 +0000 (17:36 +0100)]
QmlDesigner.propertyEditor: support for smooth
Support for smooth in all items
Leena Miettinen [Mon, 6 Dec 2010 16:13:40 +0000 (17:13 +0100)]
Doc: deploy configurations
Publishing to Ovi Store
Reviewed-by: Tobias Hunger
Reviewed-by: Pawel Polanski
Leena Miettinen [Mon, 6 Dec 2010 16:11:45 +0000 (17:11 +0100)]
Doc: explain build, run, and deploy configurations
Reviewed-by: Tobias Hunger
Leena Miettinen [Mon, 6 Dec 2010 15:58:03 +0000 (16:58 +0100)]
Doc: fix typo
Leena Miettinen [Thu, 2 Dec 2010 13:16:34 +0000 (14:16 +0100)]
Doc: add Windows 7 to OS list
Task-number: QTCREATORBUG-3140
Reviewed-by: Robert Loehning
Friedemann Kleint [Mon, 6 Dec 2010 16:07:18 +0000 (17:07 +0100)]
Symbian/CODA client: Add put/install/stat modes.
Christian Kandeler [Mon, 6 Dec 2010 14:28:16 +0000 (15:28 +0100)]
Maemo: Let user set default key file.
Task-number: QTCREATORBUG-3276
Christian Kandeler [Mon, 6 Dec 2010 13:27:12 +0000 (14:27 +0100)]
Maemo: Fix logic in device configurations dialog.
Don't do anything when the "emulator" or "hardware" buttons are
clicked and are already checked.
Christian Kandeler [Mon, 6 Dec 2010 13:19:02 +0000 (14:19 +0100)]
Maemo: Add some keyboard shortcuts to dialog.
dt [Mon, 6 Dec 2010 11:45:05 +0000 (12:45 +0100)]
ProjectExplorer: Move configWidget from Project to Target
Reviewed-By: hunger
dt [Mon, 6 Dec 2010 11:18:38 +0000 (12:18 +0100)]
Output parsers: Make target specific code pseudo generic
Introduce IOutputParser::setWorkingDirectory and
IOutputParser::hasFatalErrors()
Reviewed-By: hunger
dt [Mon, 6 Dec 2010 11:05:11 +0000 (12:05 +0100)]
Adding Target::supportsTargetId()
Reviwed-By: hunger
dt [Tue, 23 Nov 2010 18:08:18 +0000 (19:08 +0100)]
Qt4ProjectManager: Remove special casing symbian in Qt4BC:makefile
I have no idea why we did that...
Reviewed-By: hunger
dt [Tue, 23 Nov 2010 16:38:49 +0000 (17:38 +0100)]
Qt4ProjectManager: qmakestep saner target check
Reviewed-By: hunger
dt [Thu, 21 Oct 2010 13:09:41 +0000 (15:09 +0200)]
Fix Qt4TargetFactory to claim the correct target ids.
Reviewed-By: hunger
Jarek Kobus [Mon, 6 Dec 2010 13:07:59 +0000 (14:07 +0100)]
Fixes: Add "const &" when needed in "Go to slot"
So that now when you do "Go to slot" for "valueChanged(QString)"
signal the newly created slot will get (const QString &) decoration.
RevBy: Friedemann Kleint <qtc-committer@nokia.com>
Oswald Buddenhagen [Mon, 6 Dec 2010 13:00:37 +0000 (14:00 +0100)]
add empty virtual d'tor to AbstractMacroExpander
it has virtual functions, after all ...
Oswald Buddenhagen [Mon, 6 Dec 2010 12:49:41 +0000 (13:49 +0100)]
fix regular expressions for variable transformation
escape curly braces, as qregexp is a bit picky about that.
Oswald Buddenhagen [Mon, 6 Dec 2010 12:38:52 +0000 (13:38 +0100)]
don't forget to upgrade file version when using old user file
Friedemann Kleint [Mon, 6 Dec 2010 12:52:47 +0000 (13:52 +0100)]
Symbian: Start on a test client for CODA.
hjk [Mon, 6 Dec 2010 12:24:11 +0000 (13:24 +0100)]
debugger: make QObject dumper more robust for symbian
hjk [Mon, 6 Dec 2010 12:02:42 +0000 (13:02 +0100)]
debugger: remove unneeded declarations
Kai Koehne [Mon, 6 Dec 2010 08:47:43 +0000 (09:47 +0100)]
Core: Move Q_DECLARE_METATYPE for IEditor to ieditor.h
Fixes a gcc warning about different visibility of struct in files.
Reviewed-by: con
con [Mon, 6 Dec 2010 12:03:17 +0000 (13:03 +0100)]
Fix compilation of previous commit
hjk [Mon, 6 Dec 2010 10:06:18 +0000 (11:06 +0100)]
debugger: more uiswitcher cleanup
further disentangling of debugger dockwidget updates
remove unneeded variable
make updateDockWidgetSettings private
make dockwidget eventfilter slightly less heavy
dt [Fri, 3 Dec 2010 10:46:35 +0000 (11:46 +0100)]
Qt4ProjectManager: Force a qmake run on change in the deploy folder
On a change to the deployment folder, we need to run qmake again to
recreate the pkg file, we do that by setting a flag on all qmakesteps
for symbian and saving/restoring that flag.
Reviewed-By: hunger
Task-Nr: QTCREATORBUG-3062
Pawel Polanski [Mon, 6 Dec 2010 10:58:29 +0000 (11:58 +0100)]
If the cert file for Symbian is defined the initial location of key file is the cert's folder