feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
24,819 Commits 108 Branches 368 Tags
bb66e5462682b8e9c5a334476db3dc44632c9723
Commit Graph

929 Commits

Author SHA1 Message Date
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
Erik Verbruggen
3ebc328498 C++: added quickfix to insert a method definition. 
Reviewed-by: Christian Kamm
 2010-09-30 12:19:39 +02:00
hjk
4389f02097 version bump 2.0.90 -> 2.0.91 2010-09-27 16:57:34 +02:00
Christian Kamm
8215a1d0c0 C++ indenter: Fix member initializer indent being hardcoded to 4. 
Task-number: QTCREATORBUG-2456
 2010-09-27 10:39:33 +02:00
Leandro Melo
0e0841dac9 Snippets: Show snippets after "corresponding" keywords. 
In some cases snippets have a description. Due to the sorting this
already places them after keywords. So this is just to be consistent
for all cases.
 2010-09-27 10:31:42 +02:00
Leandro Melo
cafcce0c37 Add support for C++ snippets. 2010-09-24 20:22:03 +02:00
Christian Kamm
17e0886c69 C++ indenter: Fix error recovery in function definitions. 
Task-number: QTCREATORBUG-1517
 2010-09-24 15:58:23 +02:00
Christian Kamm
dc58172b78 C++ indenter: Add some small error recovery. 2010-09-24 15:41:13 +02:00
Christian Kamm
d7bf4f515d C++ indenter: Fix indentation if template and class appear on one line. 
Task-number: QTCREATORBUG-2427
 2010-09-24 15:08:54 +02:00
Christian Kamm
be563abf68 C++ indenter: Simplify debugging by making dump() more verbose. 2010-09-24 15:08:54 +02:00
Erik Verbruggen
5ad1b35a76 Editor: cleanup special cases for snippets. 2010-09-24 13:02:44 +02:00
Erik Verbruggen
f6a99f6163 Editor: don't leave snippet mode when user pasts/completes. 2010-09-24 11:35:53 +02:00
Leena Miettinen
213051555f UI text - fix capitalization 2010-09-17 11:14:37 +02:00
Friedemann Kleint
bb13b69ec0 Further header cleanup. 
Introduce some more private classes for the coreplugin,
use header include convention
<QtModule/QClass>, de-qobjectify VariableManager.
 2010-09-16 14:59:05 +02:00
Leandro Melo
ce9038f6a2 Avoid function completion tootltip to go out of the screen. 
Task-number: QTCREATORBUG-2307
Reviewed-by: Thorbjorn Lindeijer
 2010-09-15 16:48:50 +02:00
Erik Verbruggen
39a03d2505 C++ Editor: Moved refactoring actions into sub-menu. 2010-09-15 14:35:12 +02:00
Christian Kamm
d68e9e1a4d C++ indenter: Fix curly brace placement for ANSI style. 
There was a bug in 5cd6ebfdfd which meant
no reindent of the current line was triggered for the opening curly
brace on a new line.

Task-number: QTCREATORBUG-2331
 2010-09-15 11:16:25 +02:00
Christian Kamm
e5cbb56fe7 C++ indenter: Fix for statement indentation and add test. 2010-09-15 11:16:25 +02:00