OSDN Git Service
Oswald Buddenhagen [Wed, 10 Mar 2010 09:32:26 +0000 (10:32 +0100)]
Merge remote branch 'origin/1.3'
Conflicts:
share/qtcreator/translations/qtcreator_ru.ts
Sergey Belyashov [Tue, 9 Mar 2010 13:19:35 +0000 (16:19 +0300)]
Fix bug QTCREATORBUG-834
Friedemann Kleint [Wed, 10 Mar 2010 09:21:52 +0000 (10:21 +0100)]
DesignMode/Qt Designer clean-up Part V: Renaming
Re-introduce FormWindowEditor as IEditor used for
Designer. Use SharedTools::WidgetHost directly
for embedding into FormEditorStack, doing the
geometry-changed handling in there as well.
Roberto Raggi [Tue, 9 Mar 2010 13:28:23 +0000 (14:28 +0100)]
Fixed possible crash when asking for the icon of a top-level symbol (e.g. the global namespace).
Jens Bache-Wiig [Tue, 9 Mar 2010 18:31:06 +0000 (19:31 +0100)]
Fix text eliding on progress bars
We need this for translations.
I also added the label to the tool tip.
hjk [Tue, 9 Mar 2010 16:49:50 +0000 (17:49 +0100)]
debugger: remove irrelevant comment containing a reminder
hjk [Tue, 9 Mar 2010 16:37:36 +0000 (17:37 +0100)]
debugger: empty list of fetched variables at the end of the full cycle
The original logic was faulty but worked better in the presence of the
original "extra layoutChanged()" hack which is replaced now.
hjk [Tue, 9 Mar 2010 15:44:36 +0000 (16:44 +0100)]
fakevim: fix some indentation when tabs are not expanded
hjk [Tue, 9 Mar 2010 15:12:08 +0000 (16:12 +0100)]
fakevim: adjust visual tabwidth
Thorbjørn Lindeijer [Tue, 9 Mar 2010 16:17:11 +0000 (17:17 +0100)]
Simplify finding the best match for switching to definition
Also make sure it searches for the best match in all files that define
potential matching definitions.
Alexander Anokhin [Tue, 9 Mar 2010 12:53:27 +0000 (13:53 +0100)]
Fixed switch from declaration to definition
Added compatibility scores to functions - candidates to switch to
Merge-request: 121
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Erik Verbruggen [Tue, 9 Mar 2010 16:35:24 +0000 (17:35 +0100)]
Fixed QTCREATORBUG-745.
Fixed crash in FindUsages on a dirty file in a large project, which is saved
while the FindUsages is still running.
dt [Tue, 9 Mar 2010 16:30:49 +0000 (17:30 +0100)]
Fix crash for Custom Executable RunConfiguation with qml projects
Custom Executable RunConfiguation assumed that there is always a active
buildconfiguration which is simply not true for qml projects.
Also fix a small bug that the executable was not searched in the full
environment but only in the build environment.
Reviewed-By: Tobias Hunger
Jens Bache-Wiig [Tue, 9 Mar 2010 16:13:13 +0000 (17:13 +0100)]
Updated warning and error icons
Lasse Holmstedt [Tue, 9 Mar 2010 16:04:09 +0000 (17:04 +0100)]
Fixed faulty init of Qml run config
Friedemann Kleint [Tue, 9 Mar 2010 16:01:34 +0000 (17:01 +0100)]
Design mode/Qt Designer clean-up, part III: Resources.
Move resource code to new ResourceHandler class and
instantiate it on the form window.
Kai Koehne [Tue, 9 Mar 2010 15:37:05 +0000 (16:37 +0100)]
QmlDesigner: Rename log files to start with qmldesiger-
Kai Koehne [Tue, 9 Mar 2010 15:20:24 +0000 (16:20 +0100)]
QmlDesigner: Move log files to /tmp (Mac OS X)
Kai Koehne [Tue, 9 Mar 2010 15:14:47 +0000 (16:14 +0100)]
Fix logic for configuring qt private headers
Friedemann Kleint [Tue, 9 Mar 2010 14:48:01 +0000 (15:48 +0100)]
Design mode/Qt Designer: clean-up Part II: Fix undo.
Re-introduce FormEditorFile that delegates dirty handling to the form
window. Change DesignerXmlEditable to be an IEditor that embeds
TextEditable so that the PlainTextEditor can work with it, but delegates
relevant functionality to FormEditorFile.
Centralize all form window creation code that was scattered around
in FormEditorW::createEditor() and have that return a struct Editor
data, which is passed to FormEditorStack.
Update the text editor only on open/createNew/switch away from design
mode.
Tobias Hunger [Tue, 9 Mar 2010 14:03:52 +0000 (15:03 +0100)]
Add overlay icon in windows if text is empty
... not if it is null.
Tobias Hunger [Tue, 9 Mar 2010 11:44:10 +0000 (12:44 +0100)]
Do not disable combobox in addtarget dialog
Christiaan Janssen [Tue, 9 Mar 2010 13:37:57 +0000 (14:37 +0100)]
QmlDesigner.Navigator: Fixing drag and drop target
hjk [Tue, 9 Mar 2010 13:35:32 +0000 (14:35 +0100)]
debugger: make helper compilable with Qt 4.4
ck [Tue, 9 Mar 2010 13:01:59 +0000 (14:01 +0100)]
Maemo: First attempt at packaging. Disabled for now.
Jens Bache-Wiig [Tue, 9 Mar 2010 12:35:53 +0000 (13:35 +0100)]
Fix tool tips for target selector
Using non capitalized text this time as this is
what we have decided to standardize on for future versions.
hjk [Tue, 9 Mar 2010 11:25:43 +0000 (12:25 +0100)]
debugger: Sort process ID column numerically in "Attach to process" dialog
hjk [Tue, 9 Mar 2010 10:08:12 +0000 (11:08 +0100)]
debugger: replace a workaround to update the [+] marker when items by a less intrusive one
hjk [Mon, 8 Mar 2010 14:28:56 +0000 (15:28 +0100)]
debugger: always remove the extra nesting level for 'this'
Kai Koehne [Tue, 9 Mar 2010 11:21:22 +0000 (12:21 +0100)]
QmlDesigner: Disable switching to Component elements for the Alpha
Changing anything in the submodel right now crashes, and it seems
it will take some time to fix this.
Reviewed-by: Thomas Hartmann
Kai Koehne [Tue, 9 Mar 2010 11:17:52 +0000 (12:17 +0100)]
QmlDesigner: Fix StatesView for switching subcomponents
Reviewed-by: Thomas Hartmann
Kai Koehne [Tue, 9 Mar 2010 11:11:40 +0000 (12:11 +0100)]
QmlDesigner: Make loop more explicit
Kai Koehne [Tue, 9 Mar 2010 10:53:35 +0000 (11:53 +0100)]
Fix compilation warnings
Jens Bache-Wiig [Tue, 9 Mar 2010 10:14:19 +0000 (11:14 +0100)]
Improve focus and keyboard interaction with projectselector
This kills the event filter since it is not really neccessary.
Most combo boxes should be disabled by default now. I Removed
redundant focus widgets from the keyboard chain and I
indicate that the list has focus by saturation.
Friedemann Kleint [Tue, 9 Mar 2010 09:26:20 +0000 (10:26 +0100)]
Design mode/Qt Designer: Clean up the widget part of it.
- Remove shared subwindow reparenting from EditorWidget, make EditorWidget
inherit FancyMainWindow. and use just once instance of it instead of
per-editor ones.
- Embedded FormEditorStack into EditorWidget as a centralwidget.
- Changed FormWindowEditor's base class from IEditor to SharedTools::FormWindowHost
(Widget) to be embedded into FormEditorStack (no need to be an IEditor),
Remove Designer::Internal::FormWindowHost which had little functionality.
- Add Design Mode widget to FormEditorW which has FakeToolBar and EditorWidget
(single instance) in a vertical layout.
- Removed ProxyAction class handling dock view toggle actions of several EditorWidgets
(no longer necessary since there is just once instance). Moved "View menu" to bottom.
- Started to make FakeToolBar work as a single instance listening on changing
xml editors
- Include-file/slot connection clean-up.
Kai Koehne [Tue, 9 Mar 2010 08:50:39 +0000 (09:50 +0100)]
QmlJsEditor: Fix support for .qmlproject files
Tell QmlJsEditor about the QmlProject namespace and it's content. This
enables auto-completion, and prevents the editor from underlining all
elements as errors.
Reviewed-by: Christian Kamm
Robert Loehning [Mon, 8 Mar 2010 19:20:28 +0000 (20:20 +0100)]
Reserving needed amount of memory before copying.
Robert Loehning [Mon, 8 Mar 2010 19:19:33 +0000 (20:19 +0100)]
Fixed crash when trying to copy large binary file
Reviewed-by: Oswald Buddenhagen
Task-number: QTCREATORBUG-484
Thomas Hartmann [Mon, 8 Mar 2010 16:40:09 +0000 (17:40 +0100)]
QmlDesigner.propertyEditor: removing maximum height
Thomas Hartmann [Mon, 8 Mar 2010 16:39:25 +0000 (17:39 +0100)]
QmlDesigner.propertyEditor: fixing crashes in expression editing
Thomas Hartmann [Mon, 8 Mar 2010 16:38:41 +0000 (17:38 +0100)]
QmlDesigner.propertyEditor: closing expression editing on enter/return
Thomas Hartmann [Mon, 8 Mar 2010 16:37:55 +0000 (17:37 +0100)]
QmlDesigner: adding ExpressionEditor to basicwidgets
Thomas Hartmann [Mon, 8 Mar 2010 15:05:22 +0000 (16:05 +0100)]
QmlDesigner: tweaking of pasting into the visual designer
Erik Verbruggen [Mon, 8 Mar 2010 16:34:32 +0000 (17:34 +0100)]
Added more newlines to the .dot file for the AST.
Christiaan Janssen [Mon, 8 Mar 2010 16:33:56 +0000 (17:33 +0100)]
QmlDesigner.Navigator: LineInput now covers the whole item row
Erik Verbruggen [Mon, 8 Mar 2010 16:31:14 +0000 (17:31 +0100)]
More symbol dumping.
Erik Verbruggen [Mon, 8 Mar 2010 15:42:14 +0000 (16:42 +0100)]
Pimped the ast dumping and added symbol dumping.
Jens Bache-Wiig [Mon, 8 Mar 2010 14:05:55 +0000 (15:05 +0100)]
Fix examples failing to open
After fixing the sidebar to use delayed update,
code that relied on setCurrentItem could break
since the state was not set asyncronously.
This fixes it by only making mouseClick delayed,
while setCurrentIndex works as before when set
programatically.
Reviewed-by: Lasse Holmstedt
Friedemann Kleint [Mon, 8 Mar 2010 14:04:58 +0000 (15:04 +0100)]
Design mode: Suppress warning about top level spacers.
Improve
c5d6c139c1c8258a62ee512af265c2d51c9cdd5d.
Friedemann Kleint [Mon, 8 Mar 2010 14:03:12 +0000 (15:03 +0100)]
Revert "Design mode: Suppress warning about top level spacers."
This reverts commit
c5d6c139c1c8258a62ee512af265c2d51c9cdd5d.
Lasse Holmstedt [Mon, 8 Mar 2010 13:54:24 +0000 (14:54 +0100)]
Fixed focus issues with F4 edit/design switch
Reviewed-by: kkoehne
hjk [Mon, 8 Mar 2010 12:14:23 +0000 (13:14 +0100)]
debugger: really don't use curses on windows
hjk [Mon, 8 Mar 2010 12:33:07 +0000 (13:33 +0100)]
debugger: fix display of QContainer<T>::NestedType
hjk [Mon, 8 Mar 2010 11:25:36 +0000 (12:25 +0100)]
debugger: next attempt at fixing the "can't open items in locals view" issue.
hjk [Mon, 8 Mar 2010 11:23:40 +0000 (12:23 +0100)]
debugger: removed unused variables
Jens Bache-Wiig [Mon, 8 Mar 2010 13:39:38 +0000 (14:39 +0100)]
Disable project selector combo box when not needed
When we only have one option available, it makes no sense to
enable the combo box.
Lasse Holmstedt [Mon, 8 Mar 2010 13:36:44 +0000 (14:36 +0100)]
QML project executable file to default to lowercase .qml file
Use a lowercase .qml file found in project tree if no current file is
selected. This way we don't have to disable run controls if there are
some files to execute.
Reviewed-by: kkoehne
Friedemann Kleint [Mon, 8 Mar 2010 13:10:31 +0000 (14:10 +0100)]
Design mode: Suppress warning about top level spacers.
Thomas Hartmann [Mon, 8 Mar 2010 12:55:19 +0000 (13:55 +0100)]
QmlDesigner: crash fix
See BAUHAUS-435
Inside a modification group/transaction we disable undo/redo
Roberto Raggi [Mon, 8 Mar 2010 11:21:42 +0000 (12:21 +0100)]
Show the token only in leaf nodes.
Lasse Holmstedt [Mon, 8 Mar 2010 11:16:30 +0000 (12:16 +0100)]
Show different tooltips for run/debug actions when no project selected
Task-number: QTCREATOR-191
Reviewed-by: dt
Roberto Raggi [Mon, 8 Mar 2010 11:12:58 +0000 (12:12 +0100)]
Initial work on an AST dumper.
That will be pretty helpful to understand what's going wrong with
templates.
Martin Aumüller [Mon, 8 Mar 2010 10:44:43 +0000 (11:44 +0100)]
fakevim: by default, startofline is on in vim
Merge-request: 126
Reviewed-by: hjk <qtc-committer@nokia.com>
Martin Aumüller [Mon, 8 Mar 2010 10:44:43 +0000 (11:44 +0100)]
fakevim: 'cw' invoked on a sequence of space should just change the spaces
Merge-request: 126
Reviewed-by: hjk <qtc-committer@nokia.com>
Martin Aumüller [Mon, 8 Mar 2010 10:44:43 +0000 (11:44 +0100)]
fakevim: 'I' should enter insert mode even when not in visual mode
Merge-request: 126
Reviewed-by: hjk <qtc-committer@nokia.com>
hjk [Fri, 5 Mar 2010 17:24:32 +0000 (18:24 +0100)]
debugger: also show file names in 'sources' view that cannot be resolved
ck [Mon, 8 Mar 2010 10:18:23 +0000 (11:18 +0100)]
Maemo: Make it possible to have more than one run configuration.
Kai Koehne [Mon, 8 Mar 2010 09:53:48 +0000 (10:53 +0100)]
QmlDesigner: Update states editor icons when element is removed
Schedule a redraw of the states icons when an element is removed from
the model.
Task-number: BAUHAUS-460
Reviewed-by: Christiaan Janssen
Lasse Holmstedt [Mon, 8 Mar 2010 08:47:45 +0000 (09:47 +0100)]
Context Help support for Bauhaus
Task-number: BAUHAUS-451
Reviewed-by: kkoehne
Oswald Buddenhagen [Fri, 5 Mar 2010 19:13:00 +0000 (20:13 +0100)]
define EPROTO fallback for openbsd
Oswald Buddenhagen [Fri, 5 Mar 2010 18:45:17 +0000 (19:45 +0100)]
fix solaris compile ... finally.
Christiaan Janssen [Fri, 5 Mar 2010 16:22:27 +0000 (17:22 +0100)]
QmlDesigner.StatesEditor: Showing message box when wrong state name is entered
Christiaan Janssen [Fri, 5 Mar 2010 16:17:01 +0000 (17:17 +0100)]
QmlDesigner.MetaInfo: renamed subcomponents group
Thiago Macieira [Fri, 5 Mar 2010 14:24:39 +0000 (15:24 +0100)]
Use __builtin__.dir instead of dir in Python
Somehow, some gdb define a string with the name 'gdb' and we can't
find where. But be on the safe side and use the builtin function
always.
Reviewed-By: hjk
hjk [Fri, 5 Mar 2010 15:01:56 +0000 (16:01 +0100)]
debugger: work on QAbstractItemModel dumper (still defuct)
hjk [Fri, 5 Mar 2010 12:25:00 +0000 (13:25 +0100)]
debugger: disable currently broken QAbstractItemModel dumper
hjk [Fri, 5 Mar 2010 12:03:50 +0000 (13:03 +0100)]
debugger: namespace new manual test
kh1 [Fri, 5 Mar 2010 15:06:41 +0000 (16:06 +0100)]
Lazy start the full text search indexer. Fix missing progress for more
the one run of the indexer.
Reviewed-by: ck
ck [Fri, 5 Mar 2010 15:06:47 +0000 (16:06 +0100)]
Maemo: Make deployment timestamps per host.
Reviewed-by: kh1
con [Fri, 5 Mar 2010 14:18:43 +0000 (15:18 +0100)]
Revert "Fix unit tests for gcc parser"
This reverts commit
a797b1f9c101c4e619c4e37a809e992814e7e7a9.
con [Fri, 5 Mar 2010 14:18:23 +0000 (15:18 +0100)]
Revert "Improve parsing of linker problems"
This reverts commit
6b247542262396bda6ffaedc949221c3fc13e02d.
con [Fri, 5 Mar 2010 13:30:08 +0000 (14:30 +0100)]
Avoid pulling in the svg plugin.
con [Fri, 5 Mar 2010 12:49:27 +0000 (13:49 +0100)]
Sometimes the progress bar would show a 50% green bar in the beginning.
QtConcurrent seems to sometimes take some time before the
progress information is initialized. This change fixes the appearance
for that case.
con [Fri, 5 Mar 2010 11:55:04 +0000 (12:55 +0100)]
A bit more efficient adding/removing of file watchers.
Each call of addPath(s) removePath(s) potentially is locking and
unlocking a mutex, so do it for all paths at once.
con [Fri, 5 Mar 2010 11:54:43 +0000 (12:54 +0100)]
Also patch version number in README
Erik Verbruggen [Fri, 5 Mar 2010 14:24:38 +0000 (15:24 +0100)]
Fixed string escaping when writing QML properties.
dt [Fri, 5 Mar 2010 12:55:47 +0000 (13:55 +0100)]
Fix FileManager after recent commit
Temporary files should not be watched also fix a few corner cases where
the fixedname of IFile change without the file name changing.
(Oh the fun of symlinks.)
It's more consistent now, though I haven't gone through all the
implications of IFile's who's fixedName change
dt [Fri, 5 Mar 2010 12:16:05 +0000 (13:16 +0100)]
SubmitFileEditor should emit signals
dt [Fri, 5 Mar 2010 12:08:04 +0000 (13:08 +0100)]
Fix buildmanager state handling
dt [Tue, 2 Mar 2010 12:03:43 +0000 (13:03 +0100)]
Remove work around again 4.2.0
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
dt [Tue, 2 Mar 2010 10:55:56 +0000 (11:55 +0100)]
Fix cmake wizard not showing after a file change
dt [Mon, 1 Mar 2010 16:28:46 +0000 (17:28 +0100)]
Ask for saving when using the context menu
dt [Thu, 25 Feb 2010 13:08:41 +0000 (14:08 +0100)]
Remove old code
dt [Fri, 26 Feb 2010 12:09:00 +0000 (13:09 +0100)]
Remove unused code emptyProject
dt [Fri, 26 Feb 2010 11:50:11 +0000 (12:50 +0100)]
Remove qtextended_integration
Christian Kamm [Fri, 5 Mar 2010 14:43:31 +0000 (15:43 +0100)]
Don't add the default arguments when completing function definitions.
Fixes QTCREATORBUG-787
Reviewed-by: Erik Verbruggen
Kai Koehne [Fri, 5 Mar 2010 14:11:05 +0000 (15:11 +0100)]
QmlDesigner: Fix crash when opening a .qml file with states
This fixes an assert in QGraphicsScene because of
overlapping deferred calls of _q_processDirtyItems & _q_emitUpdated.
Both used to be queued in the same event loop:
_q_emitUpdated call queued with "calledEmitUpdated=true"
_q_processDirtyItems call queued
-> Event loop runs
_q_emitUpdated runs, setting "calledEmitUpdated=false"
_q_processDirtyItems runs, asserting because of !calledEmitUpdated
This fix forces the event loop to run between the queueing of
_q_emitUpdated & _q_processDirtyItems, effectively separating
both calls.
Task-number: BAUHAUS-459
Reviewed-by: Christiaan Janssen
Marius Storm-Olsen [Fri, 5 Mar 2010 13:59:51 +0000 (14:59 +0100)]
Don't draw column margin twice
The last line is even blended, which slows things down.
Reviewed-by: Thorbjørn Lindeijer
(caused by wrong merge of
ab3d3cf413955afabe845bd80676cd468ebbaa80)
Marius Storm-Olsen [Fri, 5 Mar 2010 11:33:33 +0000 (12:33 +0100)]
Enable suppressing syntax and setting a foreground color on disabled blocks
If the foreground color for the disabled text is different than the normal
text foreground, that's an indication that the user wants the disabled
block to be colored differently. If so, disable the syntax highlighting
and set uniform colors for the block.
If the foreground colors are identical apply full syntax highlighting in
the disabled block too. Some people want that.
Reviewed-by: Thorbjørn Lindeijer
Thorbjørn Lindeijer [Fri, 5 Mar 2010 10:50:37 +0000 (11:50 +0100)]
Added syntax highlighted code to clipboard as HTML when copying
The generated HTML is not the prettiest HTML in the universe, but it
does the job. When copying code from Qt Creator to Microsoft Office or
OpenOffice.org, the syntax highlighting is now preserved. The code also
pastes as preformatted text.
Reviewed-by: mae
Task-number: QTCREATORBUG-727