Roberto Raggi
d514949ad5
Removed obsolete code.
2010-02-01 11:41:15 +01:00
Roberto Raggi
cd9d13acac
Simplified triggerCompletion().
2010-02-01 11:40:29 +01:00
Roberto Raggi
18e0777e41
Sort lower case items before upper case items in QML/JS completion.
...
Done with: Thorbjorn
2010-02-01 11:33:26 +01:00
Erik Verbruggen
7b462f1b08
Fixed a modification call into the model when inline components got loaded.
2010-02-01 11:07:04 +01:00
Oswald Buddenhagen
75b42f18d8
Merge remote branch 'origin/1.3'
...
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
4320314046
Merge branch 'origin/1.3' (early part)
...
Conflicts:
src/plugins/debugger/gdb/trkgdbadapter.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
src/plugins/texteditor/basetexteditor.cpp
2010-01-29 22:14:44 +01:00
Oswald Buddenhagen
a6ca348636
remove trailing whitespace
...
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Christiaan Janssen
3afe252e1f
QmlDesigner.StatesEditor: Moved the buttons around
2010-01-29 18:02:02 +01:00
Thomas Hartmann
d76cc24eab
QmlDesigner.propertyEditor: move widgets from Qt 4.6 to Bauhaus 1.0
...
We should not polute the Qml Qt 4.6 namespace
See BAUHAUS-322
2010-01-29 16:38:34 +01:00
hjk
0653843d47
debugger: implement stub for qThreadExtraInfo, add some debugging aid
2010-01-29 15:48:17 +01:00
hjk
67bf3f2333
debugger: fix recent regression (infinite loop on stack-list-locals)
2010-01-29 15:48:17 +01:00
Roberto Raggi
80b5a6b50a
Removed useless code.
2010-01-29 15:29:45 +01:00
Kai Koehne
a7550b22a5
Clean up #include order
2010-01-29 15:28:14 +01:00
Kai Koehne
3c0b352bd1
Turn WriteLogger assert into warning until we fixed causes
...
We should enable it again after we don't know of any errors any more.
2010-01-29 15:28:13 +01:00
Roberto Raggi
04161a4ced
Introduced QmlJSScanner::scanComments/setScanComments(onoff).
2010-01-29 15:05:22 +01:00
Roberto Raggi
fbbc27be32
Get rid off unused regexp QmlJSIndenter::label.
2010-01-29 15:01:49 +01:00
Roberto Raggi
206dafcd94
Removed unused code.
2010-01-29 14:58:41 +01:00
Christian Kamm
1ec6cbd913
Fix for renamed directory imports in the QML code model.
2010-01-29 13:36:41 +01:00
Christian Kamm
a49f313c0c
Drop implicit directory imports, implement renamed directory imports.
2010-01-29 13:22:57 +01:00
Christiaan Janssen
986d6d0164
QmlDesigner.navigator: No icons in the metatype system yet
2010-01-29 12:59:10 +01:00
Christiaan Janssen
913410c66a
QmlDesigner.navigator: New and cleaner look
2010-01-29 12:59:10 +01:00
Roberto Raggi
c35f7bbfcb
Check the bounding rect before drawing the rectangle.
...
Done with: Thomas
2010-01-29 12:29:33 +01:00
Kai Koehne
bafe4468aa
Add support for JavaScriptFiles and ImageFiles elements to .qmlproject
2010-01-29 12:15:47 +01:00
Kai Koehne
269506c99c
Add new JavaScriptFiles & ImageFiles element to .qmlproject file format
2010-01-29 12:15:47 +01:00
Kai Koehne
f3cf0c36cb
Adjust .qmlproject files generated by wizards to new format
2010-01-29 12:15:47 +01:00
Kai Koehne
5c16f706c6
Replace .qmlproject default editor with the .qml one
...
Extend logic for mimetype matching in QmlJsEditor: Also
handle sub-mimetypes like x-application-qmlproject, which
extends x-application-qml.
2010-01-29 12:14:42 +01:00
Kai Koehne
10dc30fa13
Add support for 'paths' property in QmlFiles element
2010-01-29 12:13:12 +01:00
Kai Koehne
01c22d803b
Also watch sub-directories for changes
2010-01-29 12:13:12 +01:00
Kai Koehne
2181a93a1b
Let QmlProjectItem return always absolute paths
...
We're converting the path to absolute ones in QmlProject anyway ...
2010-01-29 12:13:11 +01:00
Kai Koehne
20801bee30
Update project tree if .qmlproject file / included directories change
2010-01-29 12:13:11 +01:00
Kai Koehne
32ac14c27a
Wire up new project file format in Project Manager
...
Old format is still available as a fallback.
2010-01-29 12:13:11 +01:00
Kai Koehne
47155f8518
New qml based .qmproject file format
2010-01-29 12:13:11 +01:00
Erik Verbruggen
10f48384a0
Fixed AST code generator for const identifiers.
2010-01-29 12:08:47 +01:00
Roberto Raggi
922c607b4f
Highlight QML context types.
2010-01-29 11:53:41 +01:00
Roberto Raggi
913e248366
Fixed the indentation of if-else statements.
2010-01-29 11:31:41 +01:00
Roberto Raggi
c5f4983b0c
Highlight `import' keyword.
2010-01-29 11:23:06 +01:00
Roberto Raggi
14207aa856
Fixed highlihing of QML context keywords.
2010-01-29 11:20:42 +01:00
Roberto Raggi
272014a5d0
Mark the trailing whitespaces.
2010-01-29 10:50:16 +01:00
Roberto Raggi
020e7f5739
Mark also the whitespaces inside comments and string literals.
2010-01-29 10:32:00 +01:00
Roberto Raggi
4c2c5c02bb
Mark the white spaces using the VisualWhitespace format.
2010-01-29 10:26:33 +01:00
Roberto Raggi
d78e64dbf7
Fixed the highlihting of bindings and types.
2010-01-29 10:22:18 +01:00
Roberto Raggi
2dd5bebd12
Skip white spaces.
2010-01-29 09:48:21 +01:00
Wolfgang Beck
163b2ace2a
Remove ICheck project.
2010-01-29 14:08:02 +10:00
con
6a05f778af
Fix setting breakpoints in running application.
...
It's a hack. More proper solution to come.
Done-with: hjk
2010-01-28 18:26:06 +01:00
Thomas Hartmann
0ff51c1932
QmlDesigner.propertyEditor: refactoring of PropertyEditor
2010-01-28 17:51:16 +01:00
Thomas Hartmann
8582664c8e
QmlDesigner: fixes crash bug (WriteLocker)
...
ModelNode::addChildNode() crashed
2010-01-28 17:51:16 +01:00
Erik Verbruggen
b7cbc9b0c1
Removed methods which always returned a constant (false).
2010-01-28 17:05:26 +01:00
Friedemann Kleint
4ec51219ed
Trk: Fix source code scanning tool issues.
...
showing up in Qt.
2010-01-28 17:04:05 +01:00
Roberto Raggi
7360976861
Removed the extra frame around our completion box when compiling for Q_WS_MAC.
...
Yeah, now it looks as bad as the native completion widget :)
Reported by Nigel.
2010-01-28 16:57:37 +01:00
mae
b932615ca0
fix smart backspace handling
...
The smart backspace handling required a preceeding
non empty text block. In this case, the fix introduces
a standard backspace (deletePreviousCharacter).
Reviewed-by: dt
2010-01-28 16:29:53 +01:00