feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,589 Commits 108 Branches 368 Tags
afea900b966d202435292cb15101ee71b9299f19
Commit Graph

1464 Commits

Author SHA1 Message Date
Kai Koehne
ecf2a703e2 QmlJSEditor: Moving QmlOutlineModel to it's own class 2010-07-12 14:46:29 +02:00
Thomas Hartmann
74610a9137 QmlDesigner: change interface for context pane 2010-07-09 16:10:09 +02:00
Kai Koehne
65ef113367 QmlJSEditor: Fix compilation warning (gcc) 
Reviewed-by: Christian Kamm
(cherry picked from commit 3281a9e691)
 2010-07-09 16:08:58 +02:00
Thorbjørn Lindeijer
b4cecd6ec8 Allow certain characters to also trigger the completion 
Now you can type characters like ., ( and : to complete the selected
item, depending on the type of the completion item.

Task-number: QTCREATORBUG-271
Reviewed-by: Roberto Raggi
 2010-07-09 15:52:09 +02:00
Kai Koehne
0f8a491e7a Make sure current index is always visible in Outline QTreeViews 2010-07-09 15:27:32 +02:00
Roberto Raggi
8acde74d79 Forked QSyntaxHighlighter from Qt 4.7. 
We need our very own syntax highlighter in Qt Creator.
 2010-07-09 14:47:18 +02:00
Olivier Goffart
905f2e629b Merge remote branch 'origin/master' into qmljsinspector 
Conflicts:
	src/plugins/qmlinspector/qmlinspector.cpp
 2010-07-08 16:13:14 +02:00
Friedemann Kleint
c96c375a57 Windows compile fix. 2010-07-08 15:23:22 +02:00
Roberto Raggi
d70fe1eb61 Introduced QmlJS::LookupContext. 2010-07-08 14:50:25 +02:00
Kai Koehne
02923cf258 Support Outline sidebar for QML files 2010-07-08 14:02:51 +02:00
Kai Koehne
ebe388ee92 QmlJSEditor: Signal that new semanticInfo is available 
Will be used in QmlJSOutline.
 2010-07-08 14:02:51 +02:00
Lasse Holmstedt
9a81759101 manually applied changes from qmlinspector to qmljsinspector 2010-07-08 11:36:26 +02:00
Roberto Raggi
ef5aaa0368 Renamed QmlJS::Document::documentRevision(). 2010-07-07 17:52:46 +02:00
hjk
100d8bad6e qmljseditor: enable setting breakpoints using the mouse in the ExtraArea 2010-07-07 13:56:39 +02:00
Thomas Hartmann
5a971334ef qmlsjeditor: activate context pane 2010-07-07 13:09:57 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
 2010-06-30 14:25:09 +02:00
Kai Koehne
3281a9e691 QmlJSEditor: Fix compilation warning (gcc) 
Reviewed-by: Christian Kamm
 2010-06-29 09:35:18 +02:00
Christian Kamm
01a5953575 QmlJS: Fix slots not being offered for completion. 2010-06-28 10:14:13 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
Christian Kamm
123607ad70 QmlJS: Make variables in imported JS documents show up in completion. 
Filtering them out has long since become unnecessary. It was used back
when JS files were sourced from Script elements - there they'd only
make the functions available. Now functions and variables are imported.

Task-number: QTCREATORBUG-1735
Reviewed-by: Erik Verbruggen
 2010-06-25 13:34:45 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
Christian Kamm
6cf98e281a QmlJS: Change completion ordering to put properties above snippets. 
Task-number: QTCREATORBUG-1715
 2010-06-24 10:34:07 +02:00
Christian Kamm
c7c7e52cf6 QmlJS: Fix explicit ordering of code completion items. 
The relevance member is already used by the CompletionCollector. Instead
I introduced the 'order' member to store a value used for the sorting
of completion items.

Reviewed-by: Erik Verbruggen
 2010-06-24 10:34:07 +02:00
Christian Kamm
16b4e4e91f QmlJS: Fix import path handling in the model manager. 
Previously, the model manager always had exactly one import path - but
you can open more than one Qml project at once. Now, we store the union
of all import paths in the model manager.

Reviewed-by: Roberto Raggi
 2010-06-22 13:25:22 +02:00
Roberto Raggi
eb749ec3a2 Generalized the changeset operations. 2010-06-22 12:13:30 +02:00
Christian Kamm
acbf3925f5 QmlJS: Revert to supplying a xml file for builtin type information. 
It'll be much saver to move to the qmldump based functionality once
it has been moved into Qt.

Essentially reverts: 45415783e7

Reviewed-by: Erik Verbruggen
 2010-06-21 15:12:20 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
Christian Kamm
55f9645cb7 QmlJS: Remove unused 'using' declarations from quick fix code. 
Reviewed-by: Erik Verbruggen
 2010-06-18 09:44:26 +02:00
Thorbjørn Lindeijer
16989185df Prefer static to anonymous namespace for global functions 2010-06-16 17:43:46 +02:00
Christian Kamm
7bf0ff8dc2 Merge branch '2.0' 
Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
 2010-06-15 14:37:46 +02:00
Christian Kamm
983ed48ae3 QmlJS: Don't unnecessarily store the multiline comment state. 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
(backport of 70448b016d)
 2010-06-15 14:34:18 +02:00
Christian Kamm
70448b016d QmlJS: Don't unnecessarily store the multiline comment state. 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
 2010-06-15 14:29:45 +02:00
Thorbjørn Lindeijer
173cdff56c Merge branch '2.0' 
Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-15 13:22:33 +02:00
Thorbjørn Lindeijer
83dba068ce Avoid triggering indent for electric characters in comments and strings 
In comments and strings, electric characters have no syntactical
significance and the unnecessary automatic reindent can be annoying.

Reviewed-by: Erik Verbruggen
 2010-06-15 12:25:01 +02:00
Thorbjørn Lindeijer
a6e5298591 Fixed handling of text wrapping and a text layout corner case 
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.

In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.

Reviewed-by: mae
 2010-06-15 12:25:01 +02:00
Erik Verbruggen
05639e4688 Merge branch 'origin/2.0' (early part) 2010-06-15 11:30:51 +02:00
Erik Verbruggen
e5b9c76f27 Added C-style comment folding. 
This is a "back-port" for 57f2b3e44d from master
into 2.0.

Done-with: ckamm
 2010-06-15 11:27:07 +02:00
Erik Verbruggen
54ea41af47 Removed implicit change set and related utility methods. 2010-06-15 10:22:28 +02:00
Erik Verbruggen
81c7f4f166 Removed qDebug. 2010-06-14 18:10:03 +02:00
Erik Verbruggen
f3faf34db9 Removed implicit change set and related utility methods. 2010-06-14 17:16:45 +02:00
Thorbjørn Lindeijer
6875a50d27 Don't pass QChar as const & since it's just a unsigned short 
Reviewed-by: ogoffart
 2010-06-14 16:10:35 +02:00
Erik Verbruggen
41bb1a8b86 Added refactoring action to create component from object definition. 2010-06-14 15:03:10 +02:00
Erik Verbruggen
297b281ced Added infrastructure to change multiple files at once. 2010-06-14 15:03:10 +02:00
Erik Verbruggen
61d6d83062 Removed left-over from prior move. 2010-06-14 11:47:24 +02:00
con
2e10016210 Version update to match the planned version naming. 2010-06-11 16:41:11 +02:00
con
9250d0007d Version update to match the planned version naming. 2010-06-11 16:37:10 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-11 16:30:39 +02:00
kh1
1b6ad08795 Move help manager into core. 
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
 2010-06-11 13:11:37 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
Christian Kamm
373bfb05e7 QmlJS: On completion, avoid adding : or . again if already present. 2010-06-10 11:33:04 +02:00