Commit Graph

7508 Commits

Author SHA1 Message Date
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Tobias Hunger
d2235489e8 Add accessor for (versioned) .user-file
* Add version number to .user-file.
 * Upgrade it from old versions.

Reviewed-by: dt
2010-02-01 12:23:15 +01:00
Tobias Hunger
788b294a30 Make project use toMap/fromMap to save state
* That is what everybody else is using now.

Reviewed-by: dt
2010-02-01 12:23:14 +01:00
Tobias Hunger
4ee223d45d Add a id() method to projects
* This makes it easier to distinguish projects in the
   userfileaccessor
2010-02-01 12:23:14 +01:00
Tobias Hunger
51fb280b9e Remove prefix code from Persistentsettings.
Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations
Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Tobias Hunger
16a7d5daa2 Make use of ProjectConfiguration in the BuildConfigurations
* Make use of the ProjectConfiguration base class in the
   BuildConfigurations and update the factories accordingly.

Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Tobias Hunger
1726688434 Make use of ProjectConfiguration class in BuildSteps
* Use new BuildSteps interface (as seen in ProjectConfiguration).
 * Use new factory to construct/clone/restore them.

Reviewed-by: dt
2010-02-01 12:23:12 +01:00
Tobias Hunger
c410d268db Move EditorSettings over to new save/restore scheme
Reviewed-by: dt
2010-02-01 12:23:12 +01:00
hjk
533a85a62a debugger: in trk communication one needs to acknowledge the loading of 'really
shared' libraries but not of 'static' dlls.
2010-02-01 12:17:55 +01:00
hjk
805b0a9cc1 debugger: trk log output cosmetic 2010-02-01 12:17:55 +01:00
Roberto Raggi
4880ae5b94 Don't activate the completion when the token under cursor is a comment or a string literal. 2010-02-01 11:55:19 +01:00
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
Thomas Hartmann
237ae78d0b QmlDesigner.propertyEditor: fixing qml warnings 2010-01-29 15:57:14 +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
hjk
d00fba8e2b debugger: work around 'optimized out' function parameters 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
Sergey Belyashov
07da7ccfdf Russian translation update
Merge-request: 105
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-01-29 15:25:43 +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
Nigel Hietala
a2d4495968 Fixed border issue with property pane tab 2010-01-29 14:30:27 +02:00
Christian Kamm
a49f313c0c Drop implicit directory imports, implement renamed directory imports. 2010-01-29 13:22:57 +01:00
Nigel Hietala
018a64e130 Tweak the mouse pressed colour 2010-01-29 14:09:45 +02: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
fc4d82d29d Extend test case to include "." as directory 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