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
be1f662104 QmlOutline: Make QTC_ASSERT more meaningful 
Split up QTC_ASSERT to maybe find out why, from times to times,
the original assert fails.
 2010-12-16 13:22:19 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Roberto Raggi
ea5d923fe0 Don't waste time rehighlighting all the files opened in Creator. 2010-12-14 15:06:01 +01:00
Leandro Melo
1175705bfc Snippets: Make it easier for plugins to add snippets groups 
Groups are no longer enum values but identified from snippet providers.
 2010-12-08 17:22:13 +01:00
Leandro Melo
44ffd76e8b Snippets: Rename a method in the snippet editor. 2010-12-08 17:22:10 +01:00
Leandro Melo
a997749522 Snippets: Set auto-completers. 2010-12-08 17:22:09 +01:00
Leandro Melo
de527d060d Snippets: Set indenters. 2010-12-08 17:22:08 +01:00
Leandro Melo
7528c6d617 Snippets: Feature enhancement start... 
Provide an interface so users can create/edit/remove snippets.
 2010-12-08 17:22:07 +01:00
con
519b544f62 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2010-12-08 10:57:21 +01:00
Christian Kamm
060e02a678 QmlJS completion: Fix segfault. 
Reviewed-by: Lasse Holmstedt
 2010-12-07 16:34:26 +01:00
Kai Koehne
33d66233b5 QmlWizards: Use 'QtQuick 1.0' namespace 
Use the 'QtQuick 1.0' namespace introduced in 4.7.1. This makes them in
line with the examples/demos we ship in the SDK, but breaks for 4.7.0
(e.g. N900).

Task-number: QTCREATORBUG-3243
 2010-12-07 11:27:30 +01:00
con
773343f396 Delay widget creation of options pages till their category is shown 
Also add the alternative way: IOptionsPageProvider, which states
a category, and is asked for a list of options pages for that
category when it is shown.

Task-number: QTCREATORBUG-3131
 2010-12-06 11:18:58 +01:00
con
a9c803d310 Version bump. 2010-12-02 10:38:04 +01:00
con
c598118d5b Update the filter matches for the settings dialog. 
Task-number: QTCREATORBUG-2936
 2010-12-01 18:48:40 +01:00
Leandro Melo
df12df8c89 Fix QML auto completer 2010-12-01 14:33:20 +01:00
Christian Kamm
dfedba3074 QmlJS editor: Fix automatic quote insertion. 
The new multiline string literals mixed things up.

Task-number: QTCREATORBUG-3244
Reviewed-by: Roberto Raggi
 2010-12-01 12:00:56 +01:00
Leandro Melo
ea8cb4764b Editors: Move auto-completion code out of the editor 
This is basically a continuation of the commits which
refactor code out of the base text editor. For instance,
36fa1de4c6 and
3a684586fa.

Also removed the doXXXX() forwarding methods.
 2010-12-01 09:07:15 +01:00
Christian Kamm
4cb87c3e08 QmlJS: Don't trigger completion for '/' outside string literals. 
Reviewed-by: Roberto Raggi
 2010-11-30 11:02:42 +01:00
Christian Kamm
5927137d13 Export QmlJSEditorEditable. 
Rubber-stamped-by: Friedemann Kleint
 2010-11-25 15:16:31 +01:00
Christian Kamm
05831a8ea5 QmlJS: Fix binding and scoping function expressions. 
Reviewed-by: Erik Verbruggen
 2010-11-25 15:06:44 +01:00
Christian Kamm
34093064fe QmlJS: Make evaluator understand expression statements. 
Reviewed-by: Erik Verbruggen
 2010-11-25 15:06:44 +01:00
Christian Kamm
740eb6a987 QmlJS: Implement context help and tooltips for properties. 2010-11-17 14:50:14 +01:00
Christian Kamm
aa2d9e6dd6 QmlJS: Return owning object from lookupMember. 2010-11-17 14:50:13 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
Leandro Melo
1800e98ef1 Tooltips: Fix brief description for QML elements 
The brief description was not being shown. The help id for a
QML element is something like QML.Item while the extraction
mark is simply Item.

Reviewed-by: Thomas Hartmann
Reviewed-by: con
 2010-11-17 11:17:54 +01:00
Christian Kamm
5f196cf5b8 QmlJS: Make follow symbol work with member properties. 
A full evaluate() call resolves the property and continues to the
underlying type. If we use Evaluate::reference() instead, we only the
first step is done and we can get at the source location if a
ASTPropertyReference is returned.

Reviewed-by: Erik Verbruggen
 2010-11-16 15:30:54 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1' 
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
 2010-11-15 19:03:18 +01:00
Tobias Hunger
e85bfa7073 Windows: Fix some warnings 2010-11-15 17:51:54 +01:00
Christian Kamm
8d59cff401 QmlJS: Add wizard for creating new js files. 
Task-number: QTCREATORBUG-3070
 2010-11-15 14:03:16 +01:00
Christian Kamm
f7a077b1fa QmlJS: Avoid infinite loop with recursive prototypes. 2010-11-15 10:36:22 +01:00
Kai Koehne
e35c53e7f8 QmlWizards: Unify templates 
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).

Reviewed-by: Alessandro Portale
 2010-11-12 13:54:54 +01:00
Christian Kamm
2a038e30f7 QmlJS: Enable file name completion in imports. 
Task-number: QTCREATORBUG-3067
Reviewed-by: Roberto Raggi
 2010-11-12 13:51:12 +01:00
con
ff2dc588b7 Don't show GLSL or QML tools menus while they don't offer anything 2010-11-12 13:48:03 +01:00
Christian Kamm
42e49fcc4f QmlJS: Add missing null check for completion in string literals. 2010-11-12 11:12:34 +01:00
Christian Kamm
02dd995dad QmlJS: Don't autoinsert ' in string literals. 
Task-number: QTCREATORBUG-2155
Reviewed-by: Roberto Raggi
 2010-11-12 11:07:04 +01:00
Christian Kamm
efb3d22c92 QmlJS: Complete '{' instad of ':' at the end of 'A on b' bindings. 
Task-number: QTCREATORBUG-2642
Reviewed-by: Erik Verbruggen
 2010-11-12 10:54:20 +01:00
Christian Kamm
fca62bbd5d QmlJS: Local-file completion for url properties. 
Task-number: QTCREATORBUG-2619
Reviewed-by: Erik Verbruggen
 2010-11-12 10:35:51 +01:00
Thomas Hartmann
7b179fea73 QuickToolBar: critical bugfix 
The protype chain is cached in m_prototypes,
but the type might have changed.
We have to check for this case.

Reviewed-by: Lasse Holmstedt
 2010-11-11 16:33:13 +01:00
Kai Koehne
74f13467c1 QmlOutline: Only show first line of annotation 
Fix the artifacts when the annotations contain a multi-line string.

Task-number: QTCREATORBUG-2889
Reviewed-by: erikv
 2010-11-11 12:48:29 +01:00
Erik Verbruggen
6a5f06d463 Retain id when creating a component from an object. 
Task-number: QTCREATORBUG-2666
Reviewed-by: Christian Kamm
 2010-11-11 12:12:21 +01:00
Christian Kamm
f366754462 Move shared code to a new QmlJSTools plugin. 
Reviewed-by: Thomas Hartmann
 2010-11-11 11:49:10 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Leandro Melo
fb46c31934 Plain text editor: Make sure user setting about folding markers is used 
It was being reset based on the highlighter definitions.

Consider some refactoring with the related options as well to avoid
overriding user's settings.

Done-with: Thorbjorn Lindeijer
 2010-11-10 16:05:10 +01:00
Christian Kamm
60bafeb81d QmlJS: Highlighter now marks capitalized identifiers as types. 
Task-number: QTCREATORBUG-2658
Reviewed-by: Roberto Raggi
 2010-11-10 11:08:36 +01:00
Christian Kamm
c6b688d4e6 QmlJS: Fix code model update when project filelist changes. 
Task-number: QTCREATORBUG-2986
Reviewed-by: Roberto Raggi
 2010-11-09 14:31:36 +01:00
Leandro Melo
36fa1de4c6 Editors: Refactor auto-complete code out of the editors for better reusability. 
Reviewed-by: Thorbjorn Lindeijer
 2010-11-09 11:01:47 +01:00
Leandro Melo
3a684586fa Editors: Refactor indenters out of the editors for better reusability. 
Reviewed-by: ckamm
 2010-11-05 14:28:38 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build 
... instead of running a sed script over a lot of files on each
version increment.
 2010-11-03 17:47:41 +01:00
Oswald Buddenhagen
e160f071ce centralize addition of pluginspecs to OTHER_FILES 2010-11-03 17:47:41 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments 
Krazy was complaining about those.
 2010-11-03 12:45:34 +01:00