feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,085 Commits 108 Branches 368 Tags
23c22b7c66d818e3aa5ae537ce6e365b421b5801
Commit Graph

696 Commits

Author SHA1 Message Date
con
23c22b7c66 License headers, part 2 2010-12-17 17:14:20 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Thorbjørn Lindeijer
308b0be678 Avoid skipping the closing parenthesis when completing with '(' 
When the user types '(' then he'll likely also type the matching ')',
in which case skipping the automatic closing parenthesis is annoying
because you would end up with two of them.

Reviewed-by: Roberto Raggi
 2010-12-16 14:43:57 +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
8069c1745e Don't popup the automatic completion box when the identifier under cursor is a complete valid word. 2010-12-14 11:50:49 +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
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
hjk
b9f92c29a0 vcsmanager: coding convention 2010-12-08 07:58:23 +01:00
Leandro Melo
770a6a79f1 C++ editor: Don't sort global completions for performance reasons 
Reviewed-by: Roberto Raggi
 2010-12-06 11:56:43 +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
Christian Kamm
c5c4bacda9 C++ indenter: Fix labels. 
Reviewed-by: Roberto Raggi
 2010-12-01 10:22:41 +01:00
Oswald Buddenhagen
f3b5c98bf5 Merge remote branch 'origin/2.1' 2010-11-23 15:44:58 +01:00
Friedemann Kleint
e94990f15e Code model: Fix endless loop in AbstractEditorSupport::functionAt 
used by CDB debugger tooltip (introduced by
 A 354b9712e4).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Rubber-stamped-by: dt
 2010-11-22 15:10:20 +01:00
Christian Kamm
7a616d5896 C++ indenter: Align to next token instead of end of current. 
Task-number: QTCREATORBUG-3136
Reviewed-by: Erik Verbruggen
 2010-11-22 10:09:39 +01:00
Erik Verbruggen
a4cbd970e5 Changed license template reading to use the global default encoding. 
Task-number: QTCREATORBUG-3039

Reviewed-by: con
 2010-11-11 11:19:56 +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
Roberto Raggi
8959778083 Fixed regression when completing function templates. 
Reviewed-by: Erik Verbruggen
 2010-11-08 11:29:44 +01:00
Christian Kamm
d2468a4491 C++ indenter: Fix for GNU and Whitesmiths style switch statement. 
Task-number: QTCREATORBUG-2994
 2010-11-04 14:09:47 +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
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
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
Thorbjørn Lindeijer
2929c6a965 Disable "Insert space after function name" when autobrackets are off 
Reviewed-by: Jarek Kobus
Acked-by: dt
 2010-10-29 14:33:16 +02:00
Francois Ferrand
3b70e944a3 Support new keywords %MONTH% and %DAY% for C++ template file. 
Merge-request: 199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-10-28 12:13:47 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
Christian Kamm
6f19835fd8 C++ indenter: Ensure indent and padding are non-negative. 
Reviewed-by: Roberto Raggi
 2010-10-25 13:31:42 +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
Christian Kamm
5ac981a0ac C++ indenter: Fix indentation after namespace aliases. 
Task-number: QTCREATORBUG-2574
Reviewed-by: Roberto Raggi
 2010-10-19 12:49:43 +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
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00
Erik Verbruggen
4cebb668bf C++: check for header file without corresponding source file in quickfix. 
Reviewed-by: Christian Kamm
 2010-10-08 13:15:21 +02:00
Erik Verbruggen
ac9fc40645 C++ Editor: check for method existing decl/def when inserting new ones. 2010-10-08 13:15:20 +02:00
Erik Verbruggen
0555837c7f C++ Editor: prevent insertion of method definitions in header files. 2010-10-08 13:15:20 +02:00
Christian Kamm
7e3294a8ce C++ indenter: Don't get confused on 'for (a in b)'. 
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
(cherry picked from commit c2d890f65e)
 2010-10-08 13:09:26 +02:00
hjk
4f05687ed0 version bump: 2.0.91 -> 2.0.92 2010-10-07 15:05:56 +02:00
Christian Kamm
c2d890f65e C++ indenter: Don't get confused on 'for (a in b)'. 
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
 2010-10-06 15:35:01 +02:00
con
6c38618650 Cpp locator filters were not opening edit mode (if you were elsewhere), 
and the "current document" filter didn't jump to the column

Reviewed-by: Erik Verbruggen
 2010-10-05 17:14:25 +02:00
Leena Miettinen
9dfc5b1414 Doc - using advanced find to search for C++ symbols 
Fix UI text capitalization, edit text, and add screen shots.

Reviewed-by: con
 2010-10-05 10:26:26 +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
dt
61b4cb7ffa CMakeProjectManager: Add Ui completion 
That is get code completion without saving the file or building.

Task-Nr: QTCREATORBUG-1657
 2010-10-04 15:09:59 +02:00
dt
41ceaf2821 Ui Code Model Support: Refactor code in preparation for cmake support 2010-10-04 15:09:58 +02:00
Alessandro Portale
493710c2ac Do not scan "/" for include files 
The scanning phase was in some cases insanely long.
Reason was that Creator feeds wrong paths to the
CppModelManager, for example "/".

The scanning phase did what it was told to: scan that whole
Harddrive.

This patch makes sure that the scanning is not done for "/"

Done-With: Roberto
 2010-10-03 09:28:03 +02:00
Alessandro Portale
b9d3c1f54a No Samba while including files 
(The other Samba is meant. The slow one, not the nice one.)

Creator manages to feed the CppModelManager with all kinds of
wrong include paths. That is usually not a big issue as long
as that path is not a simple "/".

CppManager appended a separator to all incoming include paths.
And when the above "/" was passed in, we had (on my machine)
7 seconds of Samba Network lookup, multiple times during a
parse. And the sad thing was that my dear colleagues in the
Intranet did not even have the searched-for header files on
their shared folders.

This patch makes sure that a separator is only appended if
the path does not already end with one.

The real core of the issue (wrong include paths from Creator)
still needs to be fixed.

Done-with: Roberto Raggi
 2010-10-03 09:23:48 +02:00
Thorbjørn Lindeijer
9248e2cf46 Fixed compile on case-sensitive file systems 2010-09-30 14:02:35 +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