Eike Ziller
3c85058694
Update License
...
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2015-01-16 12:37:56 +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
4d082cee74
VcsBase: Use static pattern for VcsBaseOutputWindow
...
Also rename to VcsOutputWindow.
Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-08-27 12:12:15 +02:00
hjk
6431ab2c79
Use Qt 5's QStringList::join(QChar)
...
Less typing and less cycles than join(QString) where appropriate
Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-08-25 08:21:14 +02:00
Orgad Shaneh
aaa7cd5851
Git: Fix sha1 resolving when a branch is added from detached HEAD
...
Change-Id: I0d8ad988411256fc284b84f78be6f54362ab19ea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-06-24 11:25:10 +02:00
Orgad Shaneh
8cc909a84c
Git: Suppress command logging for tooltip display in branches dialog
...
Change-Id: I933a68c566a9acd40913ccc78363645572aa8ff8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-05-26 15:23:19 +02:00
Orgad Shaneh
642706dc44
VCS: Pass const values by references
...
Change-Id: I9749c0c76b810f3d5fee1aa8c5750dac5930cd3c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-05-06 15:32:52 +02:00
Orgad Shaneh
18906fac4f
Git: Protect against removal of the "Local Branches" node
...
... When a single local branch is being removed
Change-Id: I4321d045ebb6faaf5f864ff33cb4f34c15d2264b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-02-27 14:43:12 +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
Orgad Shaneh
4442a92729
Braces cleanup
...
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-11-14 08:13:52 +01:00
Orgad Shaneh
39755c09b9
Git: Only show Tags root node when tags are enabled and exist
...
Create it on demand. Remove on clear
Change-Id: Ic29e82a859f99b5d739c25be83aa6c40a1ee2cc8
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-22 12:38:54 +02:00
Orgad Shaneh
ea424a076c
Git: Use enums instead of numbers for branch root nodes
...
Change-Id: I52e9fce33c2a157389a88377e2f24695e8c3722d
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com >
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
2013-07-22 08:08:45 +02:00
Nikita Baryshnikov
61367fc6ab
Git: fix crash in branches dialog
...
When tags are not shown in branches dialog, selecting of any item in
branches list causes crash
Change-Id: I8bfb66202f486c175a14c59f17b43df21ff596ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-07-19 14:21:13 +02:00
Eike Ziller
ab0c3da08f
Merge remote-tracking branch 'origin/2.8'
...
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
Change-Id: I37e550646f877b50693043894976a693ac22ad5e
2013-07-11 08:02:41 +02:00
Orgad Shaneh
3eacb444e9
Git: Prevent another crash on checkout
...
Crash happens if the repository has a submodule with local
changes that requires updating (commit changed between current
branch and new branch)
Since we already refresh for every repo change, just add "expect"
for checkout and remove the code accessing the deleted index.
Change-Id: Ic464129a2f001e017244fdf719b282dcbd9dffa4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-10 12:51:06 +02:00
Orgad Shaneh
062b8f5d31
Git: Set remote-tracking branch
...
Task-number: QTCREATORBUG-8863
Change-Id: I06df735d85e2f9ed17c71385fed5057f8fc67d55
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-10 12:50:50 +02:00
Eike Ziller
a98fe15fe5
Merge remote-tracking branch 'origin/2.8' into HEAD
...
Conflicts:
qbs/pluginspec/pluginspec.qbs
Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Orgad Shaneh
2c21100725
Git: Disambiguate branch/tag names
...
Task-number: QTCREATORBUG-9700
Change-Id: I48e779fba65afc71ba13b426e526c3cb82070142
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-08 13:28:23 +02:00
Orgad Shaneh
b2a09f7b45
Git: Rename branchName -> fullName
...
The model can contain tags
Change-Id: I70a75534848232476447125801a5ca7e963bbdcc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-08 13:22:31 +02:00
Orgad Shaneh
ffdd317773
Git: Support remove/rename for tags
...
Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-08 12:43:13 +02:00
Orgad Shaneh
2103a4a96c
Git: Clear branches model when repository becomes empty
...
Change-Id: I78932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-07-04 17:59:49 +02:00
Orgad Shaneh
57a6f04ce6
Git: Prevent tracking tags
...
Change-Id: Iea935aa226b70de936653b7637b4b9bb5e9c64cf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-06-19 22:07:06 +02:00
Orgad Shaneh
11e7c706be
Git: Make tree layout consistent on add branch
...
Change-Id: I3b49d76ef0e3da9ab60d6859a8b8e18092794bbb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-06-19 22:06:22 +02:00
Orgad Shaneh
8ce981e673
Git: Fix false positive for tracking branch
...
Change-Id: Ib08b5b276708a5951ed421e674a10d4763032502
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-06-17 15:51:50 +02:00
Orgad Shaneh
744d5d51ab
Git: Display tracking branch for newly created branches
...
+ Get rid of a workaround done for retrieving sha
Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-06-17 13:51:27 +02:00
Orgad Shaneh
1686e314bd
Git: Use log instead of show to display commit without diff
...
Change-Id: I12ff53e3375470704fb6aafa6ec0a3eaadd9aadb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-06-17 11:20:43 +02:00
Orgad Shaneh
e9443ff51f
Git: Show tracking branch on Branches dialog
...
Simplify branch model parsing a bit
Change-Id: Id9e41c6c2769397d6eee3ab74de4afbb94111e25
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
2013-06-14 13:50:50 +02:00
Petar Perisin
93e51c186a
Git: make ensureStash dialog more clear.
...
Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-04-19 07:48:27 +02:00
Petar Perisin
7c6bb25248
Git: Also show tags in the branches dialog
...
Change-Id: I74e010af7bff046647ac75e731a87867ff34b0f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-04-11 17:06:24 +02:00
Friedemann Kleint
9393335c1d
Clean headers in Git.
...
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.
Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-04-05 15:10:02 +02:00
Oswald Buddenhagen
1fda2111d4
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +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
Orgad Shaneh
cf5f109b68
Git: Remove "Branch" from synchronousCheckoutBranch
...
Other refs can also be checked out using this function
Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-24 13:25:06 +01:00
Orgad Shaneh
5551c1e906
Git: Introduce StashGuard
...
Offers the user to stash changes (if relevant), stores
the results and pops the stash when it goes out of scope
(unless disabled)
Change-Id: Ibc0d2a5d3e3c953062fb17ecba903ca814524837
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-24 12:32:26 +01:00
Orgad Shaneh
e463c56c32
Git: Fix calls to ensureStash
...
Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-23 17:56:57 +01:00
Tobias Hunger
b6a9d58f69
Git: Fix issues in the branch dialog
...
* Split part/next/last into a 'part' node and a 'next/last' node
instead of 'part/next' and 'last' node. This is closer to what git does.
* Fix some model-issues along the way;)
* Unhighlight remote checked-out branches again once they are no longer
the current one.
* Remove stale nodes after removing a branch. When removing 'first/next'
kind of branches, do not keep a empty 'first' in the tree.
Task-number: QTCREATORBUG-8518
Change-Id: Ia5650540aa58354aaab513199c8622392bdbd37f
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
2013-01-23 14:11:47 +01:00
Petar Perisin
b7faf4d674
Git: added custom message to EnsureStash popup
...
Better overview in stash dialog.
Change-Id: Icb6d3f8e2e068882e661e017ce8a0bb00ec6dba5
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-17 11:18:28 +01:00
Orgad Shaneh
5abce3ab9f
Git: Make branch lookup more robust
...
It might fail because a particular branch points to an invalid commit.
We don't want that to prevent display of all other branches.
Change-Id: I8fe427735351fc458c99396dc1f9d77bc948468e
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-07 17:48:27 +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
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
Orgad Shaneh
0ef2f65b0e
Git: Do not fail on add branch when no tracking branch selected
...
Change-Id: Icf278e4969ca98a8081d6a12be08e61670c8dbaa
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-06-04 11:28:17 +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
Friedemann Kleint
e2ace515e2
Version control: Compile with QT_NO_CAST_FROM_ASCII.
...
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-01-31 11:26:52 +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
Tobias Hunger
fab53ac364
Replace Q_ASSERTs with QTC_ASSERTs
...
or even with QTC_CHECKs.
Change-Id: I6df67f088bb2f944f0a1abd751fdb192db2be298
Reviewed-by: hjk <qthjk@ovi.com >
2012-01-13 14:34:22 +01:00
Tobias Hunger
80a6230144
Add some const
...
Change-Id: I81173280ad3e76ef62e4aefaf6914c54cfa1eac3
Reviewed-by: hjk <qthjk@ovi.com >
2012-01-12 14:52:58 +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
bf4ca06c1e
Fix possible crash in git branch dialog
...
Do not crash when checking out a branch while not currently
on any branch.
Task-number: QTCREATORBUG-5784
Change-Id: I5d007e91c1778e6f09a5d543990d948bc1427599
Reviewed-on: http://codereview.qt.nokia.com/2958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Robert Löhning <robert.loehning@nokia.com >
2011-08-15 15:01:13 +02:00