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
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Friedemann Kleint
77008bc45f Exported Header cleanup: QmlJSEditor 
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-02 11:10:27 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor. 
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
 2010-11-01 16:29:45 +01:00
con
59c301a8c8 Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget. 
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
 2010-11-01 14:55:37 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
 2010-11-01 12:11:03 +01:00
Friedemann Kleint
722e48c2b3 TextEditor: Some exported header cleanup. 
Remove internal markers from exported headers,
introduce private class for BaseTextDocument.

Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2010-10-29 15:20:10 +02:00
Kai Koehne
ac263ef261 QmlOutline: Speed up updates 
Guard the incremental updates with beginResetModel/endResetModel

This gives better overall performance then passing the incremental
updates to the views.

Tested-by: Lasse Holmstedt
 2010-10-29 09:41:07 +02:00
Christian Kamm
592396c254 QmlJS: Fix member completion at the end of a nested object definition. 
The parser's error recovery generates three nested object definitions
for code like
Item { Item { font } }
where the innermost definition corresponds to 'font }' and has an empty
lbrace token.

If we create a Range for this recovered definition, code completion will
fail for 'font.'.

Task-number: QTCREATORBUG-2767
Reviewed-by: Roberto Raggi
 2010-10-27 11:32:24 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
Friedemann Kleint
791bb483fd Debugger/JS Code model: Set environment for QML tools correctly. 
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
(cherry picked from commit f1fb0bddb1)
 2010-10-26 19:35:05 +02:00
Friedemann Kleint
f1fb0bddb1 Debugger/JS Code model: Set environment for QML tools correctly. 
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
 2010-10-26 15:39:37 +02:00
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
 2010-10-25 11:27:30 +02:00
Kai Koehne
c7e47f53bc QmlOutline: Don't use LookupContext due to performance issues 
Creating a LookupContext can be sloooow for large projects. We create
one instance for every update in the Outline to get the right icons.

Take a shortcut here and just use the element name directly, ignoring
packages names etc.

This is a hot fix for 2.1, a following patch will change the Icon
retrieval API accordingly.

Reviewed-by: Roberto Raggi
Task-number: QTCREATORBUG-2859
 2010-10-22 13:51:22 +02:00
Thomas Hartmann
24a76a73a9 fix warnings 
Reviewed-by: Marco Bubke
 2010-10-21 17:14:27 +02:00
Thomas Hartmann
0a043df690 QmlJsEditor: fixes warning 
Reviewed-by: Lasse Holmstedt
 2010-10-21 16:12:57 +02:00
Thomas Hartmann
408214486f QuickToolBar: reduce usage of lookup context 
Getting the lookup context is expensive. So it is now done only
on user interaction.




Reviewed-by: Roberto Raggi
 2010-10-21 15:42:26 +02:00
Thomas Hartmann
ff5eb00643 QuickToolBar: do not show QuickToolBar as tooltip anymore. 
Most users perceived this as a bug and found it annoying in
practice. So this feature gets removed.

Reviewed-by: Roberto Raggi
 2010-10-21 15:42:26 +02:00
Christian Kamm
5e4fe5260b QmlJS: Fix newly parsed document not being added to the snapshot copy. 
This was the root cause of several issues with scoping and import
resolution. For instance, finding the components that instantiate a
component that's opened in the editor failed; leading to code
completion missing valid entries.

Reviewed-by: Erik Verbruggen
Reviewed-by: Roberto Raggi
 2010-10-19 11:57:42 +02:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
 2010-10-18 20:59:12 +02:00
Christian Kamm
836366c187 QmlJS: Force a semantic check when library information changes. 
Task-number: QTCREATORBUG-2640
Reviewed-by: Roberto Raggi
 2010-10-15 10:09:40 +02:00
Christian Kamm
a9b4a25a68 QmlJS: Simplify document and library updating. 
It is now guaranteed that the ModelManager's snapshot will be updated
before the documentChanged/libraryInfoChanged signals are emitted.
Whether the updated document/library is already in the snapshot or not
was undefined before.

Task-number: QTCREATORBUG-2640
Reviewed-by: Roberto Raggi
 2010-10-15 10:06:59 +02:00
Christian Kamm
a30c016189 QmlJS: Fix several crashes when UiQualifiedId::name is 0. 
Task-number: QTCREATORBUG-2737
Reviewed-by: Kai Koehne
 2010-10-14 15:15:56 +02:00
Christian Kamm
ef96363560 QmlJS: Fix plugin dumpers running all the time if dump fails. 
Task-number: QTCREATORBUG-2733
Reviewed-by: Kai Koehne
 2010-10-14 15:15:44 +02:00
dt
552a2d0226 Merge remote branch 'origin/2.1' 2010-10-12 18:09:25 +02:00
Thomas Hartmann
3381c12cd5 QuickToolbar: fix keyboard shortcut for OS X 
Apple + Alt + Space is a reserved key at least on OS X 10.5.

Task-number: QTCREATORBUG-2628
Done-with:  Lasse Holmstedt
Reviewed-by:  Lasse Holmstedt
 2010-10-12 11:19:49 +02:00
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
 2010-10-11 14:16:33 +02:00
Kai Koehne
87ed874600 QmlOutline: Don't allow drag&drop when outline is out of sync 
The Outline is only updated (with a delay) if the current text is syntactically valid.
Prevent the outline from changing the text underneath via drag&drop if
the outline model is 'behind'.

Reviewed-by: Christian Kamm
 2010-10-08 15:51:56 +02:00
Thomas Hartmann
81c521eb01 QtQuickToolBar: enabling by hovering (ToolTip) 
The Quick ToolBar now also gets enabled by hovering on
an item defintion.
It is shown 1 second after the tooltip.


Reviewed-by: Christian Kamm
 2010-10-08 15:28:59 +02:00
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00
hjk
4f05687ed0 version bump: 2.0.91 -> 2.0.92 2010-10-07 15:05:56 +02:00
Leandro Melo
2d50925071 Create a reusable item delegate wich supports "annotations". 
Currently used by the QML outline and C++ type hierarchy.

Reviewed-by: kkoehne
Task-number: QTCREATORBUG-2583
 2010-10-06 15:40:01 +02:00
Thomas Hartmann
864ebf5bcd QtQuickToolbar: disabling tooltip hoovering 
This feature is not polished enough for the beta

Reviewed-by: dt
 2010-10-06 15:04:52 +02:00
Thomas Hartmann
fefc6cfe6d Using import Qt 4.7 (again) 
We have to support the  N900

Reviewed-by: dt
 2010-10-06 13:35:47 +02:00
Thomas Hartmann
defb9881b1 QmlWizards: use QtQuick 1.0 instead of Qt 4.7 
Reviewed-by: Kai Koehne
 2010-10-04 16:21:32 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
 2010-10-04 16:07:46 +02:00
Christian Kamm
70c189e2bd QmlJS: Fix instances of using lookupContext() on invalid info. 
Task-number: QTCREATORBUG-2594
Done-with: Thomas Hartmann
 2010-10-04 14:36:09 +02:00
Thomas Hartmann
4c185a9ac4 QmlDesigner.model: rename id is now a proper refactoring operation 
I an id is now changed in the navaigator or property editor,
we now use the qmljseditor to properly refactor.

Also I changed dynamic_cast to qobject_cast

Reviewed-by: Erik Verbruggen
 2010-09-30 17:43:19 +02:00
Erik Verbruggen
5e59605c1e QMLEditor: changed quickfix to only activate on the type id. 2010-09-30 16:12:54 +02:00
Christian Kandeler
dc73e7d1bc QML file wizard: Move to new category. 
Task-number: QTCREATORBUG-2510
Reviewed-by: Kai Koehne
 2010-09-30 15:45:12 +02:00
hjk
e6dd3ff5f0 version bump 2.0.91 -> 2.1.81 
Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway.
 2010-09-30 13:49:10 +02:00
Daniel Molkentin
5cf1aaf67d Fix compilation and initialization compile warnings. 
Reviewed-by: Alessandro Portale
 2010-09-29 19:35:25 +02:00
Thomas Hartmann
f5b4668fa5 QmlJsEditor: combine the Quick ToolBar with the toolTip 
1000ms after a tooltip is shown we now also show the quick toolbar

Reviewed-by: Erik Verbruggen
 2010-09-29 16:58:54 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools 
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
 2010-09-29 09:39:30 +02:00
Lasse Holmstedt
5d9858129a Compile qmldump with debugging helpers 
Must be compiled during runtime - otherwise, the app may not work
with Qt that is compiled with another compiler.

Reviewed-by: hjk
 2010-09-29 09:39:18 +02:00
Leena Miettinen
86dc1fb6e8 UI text - fix capitalization 2010-09-28 17:29:05 +02:00
Kai Koehne
1a2e16aebd QmlOutline: Show functions in outline 
Reviewed-by: Christiaan Janssen
(cherry picked from commit e871b7e330)
 2010-09-28 09:25:06 +02:00
hjk
4389f02097 version bump 2.0.90 -> 2.0.91 2010-09-27 16:57:34 +02:00
dt
299f139553 Revert "Remove the QmlJSEditor dependency from Qt4ProjectManager." 
This reverts commit f8c5001382.
 2010-09-27 15:56:37 +01:00
Leandro Melo
cafcce0c37 Add support for C++ snippets. 2010-09-24 20:22:03 +02:00