feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,849 Commits 108 Branches 368 Tags
4c119b985aca8faae7e7fadf48c70619f29a17e5
Commit Graph

45 Commits

Author SHA1 Message Date
Tobias Hunger
b669ba9dce Subversion: Fix argument order when using --username and --password 
These need to go after the subcommand, not after the "svn"

Task-number: QTCREATORBUG-13066
Change-Id: Id3de0af8b7b2f07159d5ddb1af2e5fa00dd0dbb3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-06 17:08:24 +01:00
Tobias Hunger
2669813c77 Subversion: Offer to trust server certificate on import from SVN 
Task-number: QTCREATORBUG-3753
Change-Id: I60ae8cbefa494b0b530afed54bd51ce8df23e475
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-05 18:08:48 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
hjk
5f7e89d914 Vcs: Some naming re-organization 
Rename VcsCommand to VcsCommandTag, Command into VcsCommand
(Too generic to not mistake for Core::Command IMNSHO),
remove the now unneeded namespace qualification when not needed,
adjust surrounding code.

Change-Id: Iceb18a21e5e6dffa1a622241286f766985bb8d22
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-28 16:37:00 +02:00
hjk
351abd035b Vcs: Flatten the VcsBase::BaseCheckoutWizard hierarchy 
Following the new simple-factory pattern

Change-Id: Idceb7a339169af37a040f9da7d36d3fe22dfb347
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-18 17:06:59 +02:00
Orgad Shaneh
71b56d2b9c Some QString -> FileName transformation 
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-07-16 12:44:01 +02:00
Tobias Hunger
434ecd6215 Vcs: Use Utils::FileName where possible in the CheckoutWizards 
Change-Id: I7e90f2c3468099229620d6713b39b69d8dbe8ff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-26 11:45:08 +02:00
Tobias Hunger
8e126df545 BaseCheckoutWizard*: Move createCommand from factory into Wizard 
Change-Id: I0dcc931f279b59f0d6cf7afb553a2fed30baae7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-26 11:44:43 +02:00
Tobias Hunger
719d39d372 Vcs: Remove propertyPages from wizardFactory 
Change-Id: If9d3249818b024a1a873fd3f78190379c050ac66
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-26 11:44:32 +02:00
Tobias Hunger
dae8df0567 Vcs: Make checkout wizards work, even when VCS in unconfigured 
They used to grab the first page in the set of pages and that
is the VCS setup page if the VCS was not configured before the
wizard was started. Then the wizards just stopped.

Change-Id: I8ea5bc373c07fb5c68a4814396864de6b8413747
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-26 11:44:16 +02:00
Tobias Hunger
e9526eadb8 Vcs: Add method to create a Wizard to the WizardFactory and use it 
Implement it in all VCS that support this type of wizard

Change-Id: I78b0e4a37e6bf6b25d8cee4b1e96bcc76188047a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-26 11:44:00 +02:00
Tobias Hunger
67c2c77a99 Vcs: Append "Factory" to the variaus checkout wizards 
Change-Id: I571717a389c63f4f0371570e22d3f2a834e8b900
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-26 11:43:48 +02:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
jkobus
0f4808a629 Use VcsBaseClient::diff instead of svn's one 
The first step in cleaning a mess in VCS

Change-Id: I06ee1d9952cc91dc8f599f906d221850ffb0835b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-10-16 08:34:15 +02:00
hjk
49d0789e64 Cleanup IWizard interface and users 
Added 639 lines, removed 1391.

Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-24 09:57:32 +02:00
Orgad Shaneh
aefd61478a VCS: Replace AbstractCheckoutJob with Command 
Command now provides the same functionality. Deduplicate code.

Change-Id: I789f021050471281870b6ef6a81a94e66fbdf0c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-02 11:50:10 +02:00
Hugues Delorme
970131a8a7 Svn: refactor class SubversionSettings 
SubversionSettings now inherits VcsBase::VcsBaseClientSettings allowing
significant code factorization.

Change-Id: I6be1bde16ce9b3d1294dd859fe8b2c60cf68b9d0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:15:37 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Orgad Shaneh
7ffc4349f8 VCS: Allow use of base name for executable 
Actual path is found on startup and when setting is changed

Change-Id: If2cb0735953b9fb64df7425230c98efb384d9287
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-21 15:31:51 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-17 09:53:44 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
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
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
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
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Tobias Hunger
cceb0adbaa VCS: Use the configuration page in all the checkout wizards 
Task-number: QTCREATORBUG-3752
 2011-04-20 15:50:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Friedemann Kleint
cb33332311 VCS[git]: Add branch combo to the checkout wizard. 
Provide UI with manual refresh button in BaseCheckoutWizardPage.
Change ProcessCheckoutJob to be able to execute several steps.
Implement in git.
 2010-08-12 14:44:57 +02:00
Friedemann Kleint
310194cb9f VCS[svn]: Extract runSVN overload with username/password. 
to aid trac plugin implementation.
 2010-06-08 10:04:23 +02:00
Daniel Molkentin
c58fedbf45 Add icons for checkout and clone wizards. 2010-05-19 18:40:45 +02:00
Friedemann Kleint
9432070656 Fix clone wizard texts. 2010-05-17 13:01:45 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog 
Reviewed-by: Leena Miettinen
 2010-05-12 14:16:49 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +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
Friedemann Kleint
cbfa2c0191 Fixed translation glitches. 2009-07-31 16:41:12 +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