hjk
|
2931a499e6
|
Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
2012-01-26 19:55:36 +01:00 |
|
Christian Kandeler
|
b46cdd3729
|
SSH: Adapt test to an earlier change.
Change-Id: I67504abe9b32443667497c29fb27b555cf5419fc
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
2012-01-20 13:58:55 +01:00 |
|
hjk
|
31600758de
|
all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
2011-11-03 10:33:19 +01:00 |
|
hjk
|
a322bd606f
|
Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
2011-07-06 11:14:01 +02:00 |
|
Oswald Buddenhagen
|
dc3c156cac
|
Merge branch '2.2'
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
|
2011-04-14 12:39:31 +02:00 |
|
hjk
|
8397663964
|
Update license.
|
2011-04-13 11:49:28 +02:00 |
|
Christian Kandeler
|
dc6874acb8
|
SSH: Adapt tests to API change.
|
2011-04-06 10:31:42 +02:00 |
|
Christian Kandeler
|
afa13623cd
|
SSH: Fix tests to adapt to new location (utils vs. core plugin).
|
2011-04-01 09:58:29 +02:00 |
|
Bill King
|
3593fe08ae
|
tests: add licence headers
|
2011-02-18 14:48:16 +01:00 |
|
Bill King
|
9293453ced
|
Merge branch '2.1'
Conflicts:
tests/auto/fakevim/fakevim.pro
|
2010-10-12 10:01:27 +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 |
|
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 |
|
Christian Kandeler
|
4578e32fe5
|
Tests: Start implementing more thorough SSH test.
|
2010-10-04 17:54:46 +02:00 |
|