feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
12,111 Commits 108 Branches 368 Tags
0cfcb27ac9e3ef0c5d6f9d70fb9e3b43ac0bea09
Commit Graph

93 Commits

Author SHA1 Message Date
Olivier Goffart
9a1d97707a Merge branch 'qmljsinspector' 
Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h
 2010-07-14 15:41:27 +02:00
Lasse Holmstedt
8936292dc2 modified selection to accept items without id's 
also cleaned up old stuff
 2010-07-14 15:30:54 +02:00
Lasse Holmstedt
4ecad983ec added multiselection from editor to qml viewer 2010-07-14 15:30:53 +02:00
Kai Koehne
fe82dd7ff7 QmlOutline: Make sure tree view is always expanded 2010-07-14 13:34:18 +02:00
Kai Koehne
5aea93028f Add position to navigation history when navigating through outline 2010-07-14 12:55:58 +02:00
Kai Koehne
ce32f25ba3 QmlOutline: Show icons for known types 2010-07-14 11:40:11 +02:00
Kai Koehne
df037e1f42 QmlJSEditor: Fix typo 2010-07-13 11:45:10 +02:00
Kai Koehne
1510ad5aa1 QmlJSEditor: Adapt method/variable names 2010-07-13 11:45:10 +02:00
Kai Koehne
8d48c51175 QmlJSEditor: Delay update of outline by 150 ms 2010-07-13 11:45:10 +02:00
Kai Koehne
2bafdb71a2 QmlJSEditor: Rename documentRevision() to editorRevision() 
In line with QmlJS::Document::editorRevision() and
CPPEditor::editorRevision()

Reviewed-by: Roberto Raggi
 2010-07-13 11:45:10 +02:00
Kai Koehne
2e1a36963e QmlJSEditor: Delay synchronization of cursor2outline selection by 150ms 2010-07-12 17:03:49 +02:00
Kai Koehne
503f720f85 Outline: Make recalculation of current model index more robust 2010-07-12 16:40:43 +02:00
Kai Koehne
5e3bc834f4 QmlTextEditor: Remove root decoration from outline combo box 2010-07-12 15:49:03 +02:00
Kai Koehne
94264617bf QmlJSEditor: Use QmlOutline model also in combo box 
The drop down combo box and the Outline in the sidebar now share
the same model.
 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
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
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
Kai Koehne
3281a9e691 QmlJSEditor: Fix compilation warning (gcc) 
Reviewed-by: Christian Kamm
 2010-06-29 09:35:18 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +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
Roberto Raggi
eb749ec3a2 Generalized the changeset operations. 2010-06-22 12:13:30 +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
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
297b281ced Added infrastructure to change multiple files at once. 2010-06-14 15:03:10 +02:00
Roberto Raggi
726c3345c4 Moved qmljsmodelmanagerinterface.h 2010-06-10 11:59:27 +02:00
hjk
0ee6115998 qmljshighlighter: un-templatize setFormats() 
This is used excatly once.

ReviewedBy: Kai Koehne
 2010-06-04 11:17:55 +02:00
Roberto Raggi
21073563a4 Introduced quickfix support for QML/JS files. 2010-06-03 15:52:50 +02:00
mae
7c82944750 Fix qml autocompletion on Enter 
Only insert necessary newlines

Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
 2010-05-26 19:21:32 +02:00
mae
154b312de6 Fix qml autocompletion on Enter 
Only insert necessary newlines

Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476
 2010-05-26 19:19:42 +02:00
Christian Kamm
62141475e3 QmlJS: Potentially fix hard-to-reproduce crash in JS completion. 
* Context::build was potentially dangerous. Link and ScopeBuilder
  went out of scope before their results stopped being used.
* ScopeBuilder: If no function scope object was found, don't add it.

Reviewed-by: Erik Verbruggen
 2010-05-19 14:23:08 +02:00
Lasse Holmstedt
fe48286ecc Made Qt Quick Designer editor opening modal 
If you're in Design mode, any new editors will open in design mode
as well. If you're in Edit mode, new editors will open in Edit mode.

Task-number: BAUHAUS-609
 2010-04-26 14:27:49 +02:00
Lasse Holmstedt
21fbbc2c15 Added preview menu and shortcuts for qt quick (Ctrl+Alt+R) 
This was needed since we cannot start stuff otherwise without a project

Task-number: BAUHAUS-450
Reviewed-by: kkoehne
 2010-04-23 13:20:44 +02:00
Christian Kamm
3067f441df QmlJS: Fix switch statement indentation. 
Task-number: QTCREATORBUG-756
 2010-04-21 10:52:07 +02:00
Erik Verbruggen
124bb7aad7 Emit extra signals to have the task manager show issues on project-load. 2010-04-16 13:09:44 +02:00
Erik Verbruggen
d88eaff481 Hooked up the QML task manager again. 
The QML task manager behaviour is to show warnings/errors for _saved_ files
only.
 2010-04-16 12:55:00 +02:00
Christian Kamm
9220929375 QmlJSEditor: Prevent an infinite parsing loop with invalid qml/js files. 
Reviewed-by: Erik Verbruggen
 2010-04-16 11:32:49 +02:00
Christian Kamm
173fad0d3f QmlJSEditor: Force a semantic rehighlight when a dependency changes. 
Since the revision of the current document doesn't change, we don't
get rid of errors due to missing dependencies otherwise.

Reviewed-by: Kai Koehne
 2010-04-06 12:38:07 +02:00
Christian Kamm
5ae67214a1 QmlJSEditor: Don't trigger a reparse when dependencies change. 
A semantic rehighlight suffices. This should avoid some parsing cycles
introduced earlier.

Reviewed-by: Roberto Raggi
 2010-04-01 15:49:02 +02:00
Christian Kamm
9408378a24 QmlJSEditor: Fix file/directory imports for qml files not in a project. 
Reviewed-by: Roberto Raggi
 2010-03-31 14:55:35 +02:00
Roberto Raggi
4ee8a199af Introduced Document::isQmlDocument() and Document::isJSDocument(). 2010-03-29 12:56:25 +02:00
Erik Verbruggen
ca6f735204 Fixed renaming when the cursor is at the end of the ID. 
Task-number: QTCREATORBUG-909.
Reviewed-by: Thorbjørn
 2010-03-25 14:57:15 +01:00
Lasse Holmstedt
b14a208273 Made debugger menu items disabled in QML inspector mode 2010-03-18 17:02:26 +01:00