feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,875 Commits 108 Branches 368 Tags
a6213ba901b83d03788401ad5324c8452d7afe29
Commit Graph

1107 Commits

Author SHA1 Message Date
Christian Kandeler
4b4e591ff6 SSH: Add test for remote process execution. 
Task-number: QTCREATORBUG-2706
 2010-10-28 15:04:41 +02:00
hjk
912ad8989e debugger: remove a two more cases of the RVO bug 
Reviewed-by: dt
Task-number: QTCREATORBUG-2921
 2010-10-27 17:52:53 +02:00
hjk
26339061e3 debugger: add python dumpers for __m128 2010-10-26 10:41:11 +02:00
hjk
d599dc1f0f debugger: add manual test for default constructed QTextCursor 2010-10-26 10:41:11 +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
Bill King
2ede8e3c16 tests: get tst_codegen running again, if not passing yet. 2010-10-21 14:52:56 +10:00
Bill King
524a9ac4a8 tests: more test project cleanup 2010-10-21 14:49:58 +10:00
Christian Kamm
e7a6bae170 C++ indenter: Add autotest for C++0x 'for' statement. 
Reviewed-by: trustme
 2010-10-20 10:51:13 +02:00
Bill King
d95f3324c7 tests: remove unnecessary TARGET = tst_$$TARGET 
"CONFIG += testcase" does this for us, and is the proper way to do this.
 2010-10-20 15:03:01 +10:00
Bill King
5217ca8096 tests: get qmldesigner coretest running again 2010-10-20 14:57:07 +10:00
Bill King
54c8a2e5b5 Tests: Get autotests compiling again. 2010-10-20 14:16:04 +10: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
dt
552a2d0226 Merge remote branch 'origin/2.1' 2010-10-12 18:09:25 +02:00
hjk
88ba37f80f debugger: add explanation to "Type format" manual test 
Reviewed-by: Friedemann Kleint
 2010-10-12 11:55:59 +02:00
hjk
403364018a debugger: fix typos in complex watcher handling 
Reviewed-by: Friedemann Kleint
 2010-10-12 10:57:13 +02:00
Bill King
9293453ced Merge branch '2.1' 
Conflicts:
	tests/auto/fakevim/fakevim.pro
 2010-10-12 10:01:27 +02:00
Leandro Melo
2d245f8194 Generic highlighter: Fix autotest. 
Reviewed-by: Bill King
 2010-10-11 16:49:52 +02:00
hjk
41ee5dcc52 fakevim: make autotests compile 2010-10-11 16:22:23 +02:00
Bill King
ef516bf46a Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline 2010-10-11 15:57:29 +02:00
Bill King
aeecc6067b autotests: removed as it's unuseably out of date 2010-10-11 15:57:18 +02:00
Christian Kandeler
a48139b8d0 SSH: Fix SshConnection::error signal connections. 
I recently changed the signal argument, but forgot to update
some of the points of use.

Reviewed-by: kh1
 2010-10-11 15:43:00 +02:00
con
d2a91ed1a0 Use the encoding settings when doing multi-file searches. 
Task-number: QTCREATORBUG-65
 2010-10-11 14:25:22 +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
6d0f0c7cd3 debugger: fix auto tests 
Reviewed-by: Friedemann Kleint
 2010-10-11 12:35:30 +02:00
hjk
373da663a4 debugger: compile fix for manual test 2010-10-08 14:56:17 +02:00
hjk
f3dfc8915d debugger: add python dumper for QFixed 
Reviewed-by: Alessandro Portale
 2010-10-08 14:26:44 +02:00
hjk
0ad538ebfb debugger: test gcc RVO bug not too extensively 2010-10-08 13:50:04 +02:00
Erik Verbruggen
7334ed9ec4 C++: fixed translatable quick-fix strings. 2010-10-08 13:15:21 +02:00
Erik Verbruggen
192ca70649 C++ Parser: fix infinite loop when recovering from incorrect @selector expression. 2010-10-08 13:15:21 +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
Christian Kamm
ed6585c312 C++ indenter: Add another ObjC test. 2010-10-06 15:39:53 +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
Christian Kandeler
1d3c08dabb SSH: Declare signal parameter with full namespace. 
Otherwise we can't sensibly declare slots with a matching parameter.
 2010-10-06 10:10:11 +02:00
Thomas Hartmann
f2ada23d26 QmlDesigner: using Qt 4.7 again 
We need to support the N900

Reviewed-by: Kai Koehne
 2010-10-06 09:47:13 +02:00
Christian Kandeler
d778af3b55 SSH: Finish Implementing SFTP test. 2010-10-05 16:10:24 +02:00
Christian Kandeler
3d90463dd4 SSH: Implement first half of SFTP test. 2010-10-05 16:10:24 +02:00
hjk
a504503289 fakevim: compile fix for manual test 
Reviewed-by: Friedemann Kleint
 2010-10-05 12:50:00 +02:00
Christian Kandeler
4578e32fe5 Tests: Start implementing more thorough SSH test. 2010-10-04 17:54:46 +02:00
Leandro Melo
f1e8e737c9 Tests: Add project with suggestions for testing the C++ tools. 2010-10-04 17:09:46 +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
Friedemann Kleint
ccecfd701e Debugger: Fix manual test. 
to work at least for debug-in-source builds.

Reviewed-by: hjk
Task-number: QTCREATORBUG-2546
 2010-10-04 12:19:28 +02:00
Alessandro Portale
e1aa293544 Qt Quick app wizard: Merge two .pri files into one 
As an project tree unclutter measure, we now append the
deployment.pri to the qmlapplicationviewer.pri while generating
the stub for Qt Quick Apps.

At the same tame we keep te Qt Mobile App wizard intact, which
continues to generate the deployment.pri file.

And we also keep the qmlapp/app.pro template functioning as
project, therefore we leave the include(../shared/deployment.pri)
in qmlapp/app.pro and let the wizard remove that incude.

Task-Number: QTCREATORBUG-2568
Reviewed-By: ck
 2010-10-04 10:54:25 +02:00
Thomas Hartmann
9a49ad003a QmlDesigner: using QtQuick 1.0 instead of Qt 4.7 
huge renaming from Qt to QtQuick
propertyeditor qml files moved from Qt to QtQuick
auotests fixed
files used in tests fixed

autotests pass

Task-number: QTCREATORBUG-2556

Reviewed-by: Kai Koehne
 2010-10-01 13:21:09 +02:00
Bill King
bbe790debe tests: make compile again 2010-10-01 11:32:36 +10:00
Christian Kamm
b58ebe7d29 QmlJS indenter: Fix incorrect indent after break/continue. 
Make sure to push a transitory state before leave(true) so it only
finishes the statement - and not the surrounding statement!

Reviewed-by: trustme
 2010-09-30 19:03:29 +02:00
hjk
9c31719c09 debugger: add manual test for QTextCursor and QTextDocument dumper 2010-09-28 09:35:59 +02:00
Erik Verbruggen
f39494e4c2 C++: make InsertionPointLocator ready for re-use. 
(cherry picked from commit 519f1d11947ff3109850e559fae868c4a55deb43)
 2010-09-27 19:07:15 +02:00
hjk
8672cbec8b debugger: add a manual QDate and QTime test 2010-09-27 13:24:57 +02:00
Christian Kamm
e20bfaed68 QmlJS indenter: Fix break/continue/throw in if statement without braces. 
Reviewed-by: Roberto Raggi
 2010-09-27 10:30:39 +02:00
Christian Kamm
b4bd5449f6 QmlJS indenter: Fix problem with object literals. 
Reviewed-by: Roberto Raggi
 2010-09-27 10:12:50 +02:00