feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
11,711 Commits 108 Branches 368 Tags
c2a334671617d9f90e9513c1de45b5bf39dba04a
Commit Graph

419 Commits

Author SHA1 Message Date
Christian Kamm
c2a3346716 Fix autotest build for cplusplus based tests. 
Reviewed-by: Roberto Raggi
 2010-07-06 13:50:24 +02:00
Christian Kamm
793ef6a694 C++ indenter: Fix 'else' indentation in GNU style. 2010-07-06 09:44:35 +02:00
Bill King
c9710052bb Fix autotests so that they're compiling again. 2010-07-06 14:37:45 +10:00
Christian Kamm
19db6c9826 C++ indenter: Make building custom styles easier, fix style issues. 
Keep more information by using enter() instead of turnInto() when moving
from a *_start to *_open.
 2010-07-05 13:49:12 +02:00
Christian Kamm
88f2e340bd C++: Introduce the new CodeFormatter. 
Done-with: Erik Verbruggen
 2010-07-02 16:13:12 +02:00
Christian Kamm
dc7894d8e5 Tests: Fix typeprettyprinter. 
Done-with: Erik Verbruggen
 2010-06-29 11:15:10 +02:00
Christian Kamm
2b1d8f743c Tests: Fix ChangeSet test - now use start,end instead of start,length. 
The ChangeSet api was changed in
eb749ec3a2
 2010-06-29 10:56:16 +02:00
Kai Koehne
b9aa3e9b6c Qml autotests: Fix compilation errors 2010-06-29 10:10:08 +02:00
Erik Verbruggen
112b713343 Fixed test after changing the AST representation of the postfix expression. 2010-06-25 13:20:24 +02:00
con
af44136e22 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
 2010-06-24 11:40:22 +02:00
Erik Verbruggen
e7088e9c42 Fixed autotests. 2010-06-23 12:45:22 +02:00
Alexis Menard
64839753f2 QML WebKit component is now named QtWebKit 
Reviewed-by:Christiaan Janssen
 2010-06-23 11:37:41 +02:00
Leandro Melo
15faf23e07 Generic highlighter: Indentation based code folding. 2010-06-21 16:10:42 +02:00
Leandro Melo
20eeca15ce Generic highlighter: Code folding support. 2010-06-18 16:31:42 +02:00
Leandro Melo
81955e045e Generic highlighter: Renaming a couple of methods. 2010-06-18 16:31:42 +02:00
Leandro Melo
4fb1507187 Generic highlighter: Correcting how the engine keeps track of spaces. 
Unit test cases were also created for this.
 2010-06-18 16:31:41 +02:00
Leandro Melo
749e97db2b Fixing unit test due to change in the Highlighter's constructor. 2010-06-16 09:10:57 +02:00
Leandro Melo
b57a161101 Generic highlighter: Small re-writings. 2010-06-14 14:48:36 +02:00
Leandro Melo
5f342df123 Generic highlighter: More unit tests for the engine. 2010-06-14 14:48:35 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-11 16:30:39 +02:00
Kai Koehne
644f98483a QmlDesigner: Fix import handling in rewriter 
Task-number: BAUHAUS-602
Reviewed-by: Erik Verbruggen
 2010-06-10 15:15:31 +02:00
con
df357d7819 Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-06-10 15:00:28 +02:00
con
b0040dc858 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
 2010-06-10 15:00:16 +02:00
Tobias Hunger
5d5f647f3d Fix preprocessor directives 
* The standard says all preprocessor directives have to start
   at column 0.
 2010-06-10 13:28:14 +02:00
Erik Verbruggen
2de4a98ce0 Fixed id syncing when and id gets removed from the QML source. 
Task-number: BAUHAUS-780
Reviewed-by: kkoehne
 2010-06-10 11:18:50 +02:00
Kai Koehne
190fdf360c QmlDesigner: Add test case for Rewriter not removing Ids form model 
Task-number: BAUHAUS-780
 2010-06-10 10:26:32 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.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/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/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/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.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/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
Kai Koehne
b17cd1fd85 QuickDesigner: Fix core test 
Since fa640f66db we're always switching to the base state when going
from state A to state B. Fix autotests accordingly.
 2010-06-04 09:53:33 +02:00
Kai Koehne
e5efa55a20 QuickDesigner: Fix compilation of QuickDesigner/core tests 
Commit 112df597db removed the definition, but not declaration of
test method.

Reviewed-by: erikv
 2010-06-04 09:53:33 +02:00
Leandro Melo
b97bfaa7f7 Generic highlighter: New unit tests for the highlighter engine. 2010-06-03 12:29:09 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
 2010-06-02 09:57:23 +02:00
Erik Verbruggen
112df597db Fixed default property discovery for custom QML components. 
Reviewed-by: Christian Kamm
 2010-05-31 12:21:12 +02:00
Erik Verbruggen
f840d9835d Removed invalid testcase. 
Reviewed-by: Christian Kamm
 2010-05-31 11:48:53 +02:00
Kai Koehne
f7ed1eb879 QuickDesigner: Make metainfo system robust for different version numbers 
With the inclusion of org.webkit 1.0 types some common ancestors are shared
with different version numbers. These used to override each other. With this
patch the hierarchy is preserved.

This commit includes several changes by Marco Bubke.

Reviewed-by: Marco Bubke
 2010-05-28 16:38:34 +02:00
Marco Bubke
27688270fd Load plugins at the beginning of the meta info initializing 
Reviewed-by: kkoehne
 2010-05-28 16:38:29 +02:00
hjk
a2bb9893a5 debugger: add another version string to the auto test 2010-05-28 15:48:20 +02:00
Oswald Buddenhagen
123937fb2a Merge remote branch 'origin/2.0' 2010-05-28 12:45:41 +02:00
hjk
5afeaa720d debugger: more robust version string parsing 
Fix for QTCREATORBUG-1490

Reviewed-By: Friedemann Kleint
 2010-05-27 15:55:01 +02:00
Thomas Hartmann
a49bbb4d15 QmlDesigner.test: adding qml files 2010-05-27 12:00:12 +02:00
Thomas Hartmann
251c259b60 QmlDesigner.autoTest: adds testComponentLoadingTabWidget 2010-05-27 11:48:04 +02:00
Thomas Hartmann
6e388a3941 QmlDesigner.autoTests: compilefix 
Reviewed-by: Kai Koehne
 2010-05-27 11:48:03 +02:00
hjk
ed018f691a qml auto test: add DEFINES+=QT_CREATOR 2010-05-27 11:12:31 +02:00
hjk
5805788290 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
 2010-05-27 11:11:53 +02:00
Erik Verbruggen
77bd9e2996 Fixed compression bugs in text refactoring. 
Task-number: BAUHAUS-729, BAUHAUS-731
 2010-05-26 12:42:53 +02:00
Erik Verbruggen
79cbc07b29 Fixed superfluous (and erroneous) semi-colon insertion. 
Bug: BAUHAUS-674
 2010-05-26 12:42:53 +02:00
Erik Verbruggen
e997f6de13 Fixed rewriter bug for subsequent reparent-in-out actions. 2010-05-26 12:42:53 +02:00
Friedemann Kleint
26b51e1638 Debugger: Fix compilation & test results of C++-library dumpers. 
Fix  breakage resulting from 3d852917187e29892529ab51d24c1a1177068a88
(Qt 4.7), remove obsolete 'saddr'-element.
 2010-05-26 09:32:10 +02:00
Thomas Hartmann
a952b9ba4e QmlDesigner.autoTests 
Integration tests

TestCore::testAnchorsAndRewriting
TestCore::testAnchorsAndRewritingCenter

Task-number: Bauhaus-109
 2010-05-25 17:51:19 +02:00
Erik Verbruggen
cedaebc315 Fixed superfluous (and erroneous) semi-colon insertion. 
Bug: BAUHAUS-674
 2010-05-25 17:32:39 +02:00
Erik Verbruggen
bfba256455 Fixed rewriter bug for subsequent reparent-in-out actions. 2010-05-25 17:00:53 +02:00