OSDN Git Service
con [Fri, 17 Dec 2010 16:01:09 +0000 (17:01 +0100)]
Compile fix for Mac.
con [Fri, 17 Dec 2010 16:00:53 +0000 (17:00 +0100)]
Merge branch '2.1'
Conflicts:
src/plugins/coreplugin/basemode.cpp
src/plugins/coreplugin/basemode.h
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/projectexplorer/buildconfigdialog.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
src/plugins/qmldesigner/designercore/include/modelutilities.h
src/plugins/qmldesigner/designercore/include/nodeinstance.h
src/plugins/qmldesigner/designercore/include/propertymetainfo.h
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
src/plugins/qmldesigner/designercore/model/modelutilities.cpp
src/plugins/snippets/inputwidget.cpp
src/plugins/snippets/snippetscompletion.cpp
src/plugins/snippets/snippetscompletion.h
src/plugins/snippets/snippetspec.cpp
src/plugins/snippets/snippetsplugin.cpp
src/plugins/snippets/snippetswindow.cpp
src/plugins/snippets/snippetswindow.h
src/plugins/texteditor/snippetsparser.cpp
src/tools/qml/qmldom/main.cpp
tests/manual/trk/runner.cpp
tests/manual/trk/trkolddevice.cpp
tests/manual/trk/trkolddevice.h
tests/manual/trk/trkserver.cpp
con [Thu, 16 Dec 2010 13:03:05 +0000 (14:03 +0100)]
Show Qt Creator resources in Locator on Mac
con [Thu, 16 Dec 2010 10:49:47 +0000 (11:49 +0100)]
Some API beautification in action container.
Done-with: Daniel Molkentin
Friedemann Kleint [Fri, 17 Dec 2010 15:04:33 +0000 (16:04 +0100)]
Debugger[New CDB]: Support MSVC2008 std::deque as well.
con [Fri, 17 Dec 2010 15:01:08 +0000 (16:01 +0100)]
License headers.
Robert Loehning [Fri, 17 Dec 2010 13:06:08 +0000 (14:06 +0100)]
L10n: Improved German translations
%1 contains the error message, not the hostname.
Other typos fixed as well.
Reviewed-by: ossi
Christian Kandeler [Fri, 17 Dec 2010 12:17:35 +0000 (13:17 +0100)]
Maemo: Improve file selection dialog for publishing.
- Make sure file names are completely visible.
- Show hidden files.
- Pre-unselect files of types unlikely to be included in the package.
Friedemann Kleint [Fri, 17 Dec 2010 14:34:18 +0000 (15:34 +0100)]
Debugger[New CDB]: Add std::deque.
hjk [Fri, 17 Dec 2010 13:13:49 +0000 (14:13 +0100)]
debugger: remove accidentally committed debug output
hjk [Fri, 17 Dec 2010 12:49:49 +0000 (13:49 +0100)]
debugger: adjust sizes of some well-known columns in some views
hjk [Fri, 17 Dec 2010 12:22:53 +0000 (13:22 +0100)]
bineditor: allow copying also if selection is "backwards"
hjk [Fri, 17 Dec 2010 12:19:28 +0000 (13:19 +0100)]
bineditor: code cosmetics
hjk [Fri, 17 Dec 2010 12:07:17 +0000 (13:07 +0100)]
debugger: don't retrieve the stack if we know we will continue stepping
Sergey Belyashov [Fri, 17 Dec 2010 11:27:19 +0000 (12:27 +0100)]
Russian translation update
Merge-request: 228
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Fri, 17 Dec 2010 11:02:23 +0000 (12:02 +0100)]
debugger: reality check, adjust FIXME comment re. use of gdb 6.8
hjk [Fri, 17 Dec 2010 10:30:32 +0000 (11:30 +0100)]
debugger: remove a bit of stackview flicker by using the 80 ms timer
hjk [Thu, 16 Dec 2010 18:06:33 +0000 (19:06 +0100)]
debugger: introduce the concept of a 'Location', used by gotoLocation
hjk [Thu, 16 Dec 2010 16:58:43 +0000 (17:58 +0100)]
debugger: more tracepoint stuff
Friedemann Kleint [Fri, 17 Dec 2010 11:00:44 +0000 (12:00 +0100)]
Debugger[New CDB]: Add more fine-grained settings for events/break.
Add options to break on Cpp Exceptions, thread creation, etc.
Pawel Polanski [Fri, 17 Dec 2010 10:46:52 +0000 (11:46 +0100)]
Symbian: Make error concerning capabilities prettier
Pawel Polanski [Fri, 17 Dec 2010 09:33:08 +0000 (10:33 +0100)]
Symbian: Fixed crash related to the not responding TRK
Task-number: QTCREATORBUG-3349
Kai Koehne [Fri, 17 Dec 2010 09:18:34 +0000 (10:18 +0100)]
QmlDebugger: Also log messages from JSDebugger to debug console
Kai Koehne [Fri, 17 Dec 2010 07:39:25 +0000 (08:39 +0100)]
QmlDebugger: Improving debug log output
Friedemann Kleint [Fri, 17 Dec 2010 09:11:57 +0000 (10:11 +0100)]
Debugger[New CDB]: Improve and enable auto-detection.
Also take over symbol path of the old CDB engine on
auto-detect.
Christian Kandeler [Thu, 16 Dec 2010 17:33:30 +0000 (18:33 +0100)]
Maemo: Fix "make distclean" step for publishing.
Task-number: QTCREATORBUG-3343
Christian Kandeler [Thu, 16 Dec 2010 17:03:48 +0000 (18:03 +0100)]
Maemo: Fix newlines in debian files when publishing.
The build server does not like CRLF.
Christian Kandeler [Thu, 16 Dec 2010 15:45:08 +0000 (16:45 +0100)]
Maemo: Add a hint to the publishing wizard's upload page.
This should help people realize they need to explicitly request
upload rights.
Christian Kandeler [Thu, 16 Dec 2010 14:44:02 +0000 (15:44 +0100)]
Maemo: Fix detection of valid icon in publishing code.
Task-number: QTCREATORBUG-3342
Christian Kandeler [Thu, 16 Dec 2010 13:46:24 +0000 (14:46 +0100)]
Remove annoying warnings when loading Creator
The proper fix would be to support the QMAKE_SUBSTITUTES variable.
Christian Kandeler [Thu, 16 Dec 2010 12:06:15 +0000 (13:06 +0100)]
Maemo: Fix file removal problem on Windows.
Apparently, we can't delete read-only files.
Task-number: QTCREATORBUG-3343
Thomas Hartmann [Thu, 16 Dec 2010 16:51:58 +0000 (17:51 +0100)]
compilefix
Thomas Hartmann [Thu, 16 Dec 2010 16:47:39 +0000 (17:47 +0100)]
fixes warnings
Thomas Hartmann [Thu, 16 Dec 2010 16:46:38 +0000 (17:46 +0100)]
QmlDesigner.propertyEditor: code cleanup for property editing
Instead of duplicating the code from QmlEditorWigets we now subclass
and expose the gradient editing to qml.
The adaptor class is called GradientLineQmlAdaptor.
Kai Koehne [Thu, 16 Dec 2010 16:26:25 +0000 (17:26 +0100)]
QmlDebugger: Log activity of Observer in debugger log
Kai Koehne [Thu, 16 Dec 2010 15:31:10 +0000 (16:31 +0100)]
QmlJSDebugger: Remove confusing status messages
Clean up status messages logged in the debugger log.
Kai Koehne [Thu, 16 Dec 2010 15:20:21 +0000 (16:20 +0100)]
QmlJSDebugger: Don't mark failing connection attempt as swarning
We're trying multiple times to connect, and it's just normal that
the first tries will fail (because the app isn't initialized yet),
so don't log it as a warning.
Friedemann Kleint [Thu, 16 Dec 2010 14:49:08 +0000 (15:49 +0100)]
Debugger[New CDB]: Dump QHash/QMultiHash/QSet.
Introduce new Symbol group node for fake map nodes.
Iterate over QHash and extract keys, values for QSet/QHash.
Thomas Hartmann [Thu, 16 Dec 2010 13:45:30 +0000 (14:45 +0100)]
QmlDesigner: adding meego and symbian plugin to .pro
Thomas Hartmann [Thu, 16 Dec 2010 13:36:46 +0000 (14:36 +0100)]
QmlDsigner.properyEditor: cleanup
Removing unused files.
Thorbjørn Lindeijer [Tue, 14 Dec 2010 13:34:57 +0000 (14:34 +0100)]
Avoid skipping the closing parenthesis when completing with '('
When the user types '(' then he'll likely also type the matching ')',
in which case skipping the automatic closing parenthesis is annoying
because you would end up with two of them.
Reviewed-by: Roberto Raggi
hjk [Thu, 16 Dec 2010 12:32:47 +0000 (13:32 +0100)]
debugger: fix display of C style 'typedef struct X { ... } X;' types.
hjk [Thu, 16 Dec 2010 12:02:59 +0000 (13:02 +0100)]
debugger: start with some infrastructure for tracepoint support
Kai Koehne [Thu, 16 Dec 2010 12:20:58 +0000 (13:20 +0100)]
QmlOutline: Make QTC_ASSERT more meaningful
Split up QTC_ASSERT to maybe find out why, from times to times,
the original assert fails.
Tobias Hunger [Thu, 16 Dec 2010 11:10:56 +0000 (12:10 +0100)]
GDB: Fix detection of python for GDB on windows
Task-number: QTCREATORBUG-3375
Reviewed-by: hjk
Thomas Hartmann [Thu, 16 Dec 2010 11:59:05 +0000 (12:59 +0100)]
QmlDesigner.designModeWidget: fix style of error tooltip
DocumentWarningWidget is now derived from Utils::FakeToolTip and follows
the Qt Creator styling.
Thomas Hartmann [Thu, 16 Dec 2010 11:57:59 +0000 (12:57 +0100)]
QmlDesigneritemLibrary: relax condition for entriesForType()
>= is makes more sense for providing icons etc...
Thomas Hartmann [Thu, 16 Dec 2010 11:56:37 +0000 (12:56 +0100)]
QmlDesigner.nodeInstanceView: further optimizes import changes
This patch delays the restart of the pupped by 200ms when an import changes.
Kai Koehne [Thu, 16 Dec 2010 11:37:47 +0000 (12:37 +0100)]
Qt4ProjectManager: Fix crash when loading $QTDIR/src/src.pro
Guard access to pointer, which happens to be 0. The regression
was most likely introduced by
057591e0dd.
hjk [Thu, 16 Dec 2010 11:32:04 +0000 (12:32 +0100)]
debugger: make connection list count formally correct
Task-number: QTCREATORBUG-2785
hjk [Thu, 16 Dec 2010 11:07:12 +0000 (12:07 +0100)]
debugger: move memory related context menu items of l&w to submenu
Roberto Raggi [Thu, 16 Dec 2010 11:25:51 +0000 (12:25 +0100)]
Added semantic checks for stray semicolons and topldevel empty declarations.
Friedemann Kleint [Thu, 16 Dec 2010 11:17:54 +0000 (12:17 +0100)]
Debugger[New CDB]: Fix stepping issues, forced shutdown, values.
- Do not report start-up trap as stop reason should one trigger
while stepping.
- Set current frame to first usable frame, avoiding disassembly
while stepping
- Kill process in case of forced shutdown with pending (long)
commands.
- SymbolGroupValue: Do a quick check for accessible values
and mark failure as 'invalid'.
- Introduce flag indicating existence of simple dumpers to types.
Roberto Raggi [Thu, 16 Dec 2010 11:05:48 +0000 (12:05 +0100)]
Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers.
Roberto Raggi [Thu, 16 Dec 2010 10:33:19 +0000 (11:33 +0100)]
Added missing #include directive.
Roberto Raggi [Thu, 16 Dec 2010 10:25:28 +0000 (11:25 +0100)]
Compile fix for pedantic C++ compilers.
Get rid of all those ugly stray semicolons. They are not valid C++.
Thomas Hartmann [Thu, 16 Dec 2010 10:03:07 +0000 (11:03 +0100)]
QmlDesigner.properyEditor: fix hovering for reset button
Thomas Hartmann [Thu, 16 Dec 2010 10:02:23 +0000 (11:02 +0100)]
QmlDesigner.itemLibrary: the meego import is com.meego
com.Meego is incorrect
Thomas Hartmann [Thu, 16 Dec 2010 10:01:22 +0000 (11:01 +0100)]
QmlDesigner.itemLibrary: improve speed of import changes
removing first and adding afterwards is significanty faster, since
the big component plugin is absent after the remove.
Thomas Hartmann [Thu, 16 Dec 2010 09:59:59 +0000 (10:59 +0100)]
QmlDesigner.itemLibrary: show Wait Cursoer during import change
hjk [Thu, 16 Dec 2010 09:44:21 +0000 (10:44 +0100)]
debugger: hot fix for not activated editors while stepping
hjk [Thu, 16 Dec 2010 09:18:51 +0000 (10:18 +0100)]
debugger: merge the 'Change Format for {Object,Type}' l&w context menu entries
Leena Miettinen [Thu, 16 Dec 2010 09:35:42 +0000 (10:35 +0100)]
Doc: add information about Qt Quick Designer
Reviewed-by: Thomas Hartmann
Reviewed-by: Carsten Owerfeldt
Leena Miettinen [Wed, 15 Dec 2010 11:40:18 +0000 (12:40 +0100)]
Doc: publishing Qt Content for Maemo devices on Ovi Store
Reviewed-by: Christian Kandeler
Tobias Hunger [Thu, 9 Dec 2010 16:17:20 +0000 (17:17 +0100)]
Git: Have version selection dialog default to HEAD
... if a repository is set.
Thomas Hartmann [Wed, 15 Dec 2010 16:14:14 +0000 (17:14 +0100)]
QmlDesigner.model: changing order of notifications for imports
The node instance view is now updated first
Thomas Hartmann [Wed, 15 Dec 2010 16:13:37 +0000 (17:13 +0100)]
QmlDesigner.nodeInstanceView: also adding an import restarts the process
We should ad some timer/queue so that not every single change to imports
restarts qmlpupped but the chages/updates get compressed.
Thomas Hartmann [Wed, 15 Dec 2010 16:12:01 +0000 (17:12 +0100)]
QmlDesigner.navigator: imports now update the NavigatorTreeView
Thomas Hartmann [Wed, 15 Dec 2010 16:11:27 +0000 (17:11 +0100)]
QmlDesigner.formEditorView: adding reset() by imports
changing imports now resets the form editor
Thomas Hartmann [Wed, 15 Dec 2010 15:18:34 +0000 (16:18 +0100)]
QmlDesigner.itemLibrary: avoid unnecessary signals
Thomas Hartmann [Wed, 15 Dec 2010 15:16:42 +0000 (16:16 +0100)]
QmlDesigner.itemLibrary: allow entry names used twice
Use name + category for identification needed some refactoring.
Thomas Hartmann [Wed, 15 Dec 2010 15:13:01 +0000 (16:13 +0100)]
QmlDesigner.navigatorModel: fixes asserts
Friedemann Kleint [Wed, 15 Dec 2010 16:01:03 +0000 (17:01 +0100)]
Debugger[New CDB]: Do not add begin twice for QList<Large>.
Factor out some utilities for hashes.
Christian Kandeler [Wed, 15 Dec 2010 15:50:57 +0000 (16:50 +0100)]
Maemo: Fix remote debugging.
Was broken by
1e362b0f8b0dfd712337df35cd26c5dc98dfc294.
Christian Kandeler [Wed, 15 Dec 2010 15:37:21 +0000 (16:37 +0100)]
Maemo: Fix remote debugging.
Was broken by
77e3bfe8451343be5478027154a027cbcfe4b778.
Christiaan Janssen [Wed, 15 Dec 2010 15:12:10 +0000 (16:12 +0100)]
QmlDebugger: removed "Reload" button on live preview error
Reviewed-by: Kai Koehne
Roberto Raggi [Wed, 15 Dec 2010 14:11:59 +0000 (15:11 +0100)]
Introduced CPlusPlus::SymbolNameVisitor and CPlusPlus::SnapshotSymbolVisitor.
hjk [Wed, 15 Dec 2010 13:48:03 +0000 (14:48 +0100)]
debugger: change 'Format' to 'Display' in the l&w context menu
hjk [Wed, 15 Dec 2010 13:14:01 +0000 (14:14 +0100)]
bineditor: extend selection by 1 if cursor is left of anchor.
Feels more natural.
Reviewed-by: ck
hjk [Wed, 15 Dec 2010 13:08:25 +0000 (14:08 +0100)]
bineditor: don't draw blinking cursor when we have a selection
Reviewed-by: ck
hjk [Wed, 15 Dec 2010 12:52:25 +0000 (13:52 +0100)]
bineditor: visualize data differences after updates
Reviewed-by: ck
Friedemann Kleint [Wed, 15 Dec 2010 13:07:48 +0000 (14:07 +0100)]
Debugger[New CDB]: Fix flag handling and expanding of list children.
Suppress repetitive invocation of dumper evaluation.
Use parseWatchData() as does gdb.
Thomas Hartmann [Wed, 15 Dec 2010 12:31:07 +0000 (13:31 +0100)]
QmlDesigner.itemlibrary: fix case for meego import
Kai Koehne [Wed, 15 Dec 2010 12:06:39 +0000 (13:06 +0100)]
QmlCppDebugging: Make sure command line args have spaces in between
Thomas Hartmann [Wed, 15 Dec 2010 11:23:12 +0000 (12:23 +0100)]
QmlDesigner.subComponentManager: remove watcher from files
We use the text editors meta info system now.
Thomas Hartmann [Wed, 15 Dec 2010 10:23:34 +0000 (11:23 +0100)]
QmlDesigner.subComponentManager: crash fix
Avoid adding an item a second time to the item library.
Thomas Hartmann [Wed, 15 Dec 2010 10:22:30 +0000 (11:22 +0100)]
QmlDesigner.navigator: crash fix
I also changed qHash(modelNode) to modelNode.internalId().
Task-Nr: QTCREATORBUG-3387
Friedemann Kleint [Wed, 15 Dec 2010 10:01:01 +0000 (11:01 +0100)]
Debugger[New CDB]: Linked lists containers/container child expansion.
Introduce node hierarchy and move nodes to a separate file.
Introduce reference nodes that point to additional symbols and
symbols within the symbol tree (make deeply nested linked list
elements visible as array elements). Properly name container
elements as array elements 0..n. Fix pre-expansion of complex
dumpers.
hjk [Wed, 15 Dec 2010 08:35:31 +0000 (09:35 +0100)]
debugger: comment cosmetics
hjk [Wed, 15 Dec 2010 08:34:02 +0000 (09:34 +0100)]
debugger: move sanity check from DebuggerRunControl::start to Factory::create
hjk [Wed, 15 Dec 2010 08:17:31 +0000 (09:17 +0100)]
debugger: fix wrong assert when no engine could be constructed
hjk [Tue, 14 Dec 2010 17:35:09 +0000 (18:35 +0100)]
bineditor: remove flicker by using cached old data
Friedemann Kleint [Tue, 14 Dec 2010 15:52:53 +0000 (16:52 +0100)]
Compile warnings.
Thomas Hartmann [Tue, 14 Dec 2010 15:52:29 +0000 (16:52 +0100)]
QMlDesigner.itemLibrary: adds an import manager/filter
We create a special sidebar item for the item library that contains a
ToolButton.
The ToolButton manages the imports for components.
Thomas Hartmann [Tue, 14 Dec 2010 15:50:34 +0000 (16:50 +0100)]
QmlDesigner.model: clears the meta info cache for import changes
If an import changes we have to delete the cache for the meta info.
Thomas Hartmann [Tue, 14 Dec 2010 15:48:13 +0000 (16:48 +0100)]
QmlDesigner.itemlibrary: gives Meego label a default text
Pawel Polanski [Tue, 14 Dec 2010 15:19:44 +0000 (16:19 +0100)]
If capabilities inside pro files do not match the dev cert an error is generated (SymbianOS)
Christiaan Janssen [Tue, 14 Dec 2010 15:21:47 +0000 (16:21 +0100)]
QmlDebugger: Fixing debugid hashes
Reviewed-by: Kai Koehne
hjk [Tue, 14 Dec 2010 15:14:21 +0000 (16:14 +0100)]
qtversionmanager: initialize m_isBuildUsingSbsV2
Done by Milian Wolff
hjk [Tue, 14 Dec 2010 15:10:19 +0000 (16:10 +0100)]
debugger: code cosmetics