Commit Graph

27 Commits

Author SHA1 Message Date
hjk
6681d3edee vcs: s/VCS/Vcs/
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-09 10:55:41 +01:00
hjk
2eadc22023 vcsbase: style
Change-Id: I139d9d46605383f03215c80bd9e9fd965021b435
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-09 10:38:55 +01:00
Tobias Hunger
f696312368 Use internal namespace in VCSBase more consistently
Change-Id: I61de9796aaeb9484b44029c5f1d46e69834a04c3
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2011-12-08 14:44:04 +01:00
hjk
46eb49eafd projectmanager: re-organize New Project categories
Change-Id: Ie549f9843db985018af380eb6105e136f21989f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-18 17:50:06 +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
Daniel Teske
4e41308a0f Better error feedback on Open project
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995

Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-05 15:10:01 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +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
Friedemann Kleint
58111b2df2 API Documentation: Add VCSBase. 2011-03-28 14:19:17 +02:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +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
dt
d6bff094b2 vcsbase: Remove uneeded include 2010-10-04 15:10:01 +02:00
hjk
ade574cc45 coreplugin: remove unused return value from virtual void runWizard 2010-09-17 08:56:16 +02:00
Friedemann Kleint
c3eb4b6611 VCS: Windows slash display fixing spree.
Task-number: QTCREATORBUG-1795
2010-07-05 09:52:32 +02:00
Friedemann Kleint
a945f8b5fd ProjectManager: Make Open Project dialog open in default folder
Move open project dialog handling into ProjectExplorer and make it
use its list of project file patterns. Same in Checkout wizards.

Task-number: QTCREATORBUG-1759
Reviewed-by: dt
2010-06-28 14:34:30 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
4a46d0864b Rename IWizard::Kind --> IWizard::WizardKind, add some logic for which wizard kinds to collapse/expand. 2010-01-15 11:07:50 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint
0e554fac91 Wizards: Sort
Introduce new QString id() const-API and sort wizards by
[untranslated] category and id. Introduce respective constants.
Rubber-stamped-by: con <qtc-committer@nokia.com>
2009-11-27 10:33:24 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Alessandro Portale
80e26d86c9 Using QDir::toNativeSeparators 2009-08-05 09:17:26 +02:00
Friedemann Kleint
cbfa2c0191 Fixed translation glitches. 2009-07-31 16:41:12 +02:00
Friedemann Kleint
96940fa949 Gitorious wizard: Import CMake projects, look in src directory.
Remove unused code.
2009-07-27 09:22:26 +02:00
Friedemann Kleint
9e2f12c737 VCSBase: Add common functionality, make checkout use page lists.
Move GitClient::filterUntrackedFilesOfProject into submit editor.
Make checkout wizards use page lists for greater flexibility.
2009-07-21 11:14:48 +02:00
Friedemann Kleint
9f14b79cc6 Add a clone wizard for version control (base classes + git/svn).
Task-number: 244831
2009-07-17 17:19:23 +02:00