7872981d62
Git: Simplify commit message codec handling
...
Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-03-18 13:44:58 +01:00
7ed1576083
Clean up single namespace forward-declarations
...
Done using the following ruby script:
Dir.glob('**/*.h').each { |file|
if File.file?(file)
s = File.read(file)
t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
if t != s
puts file
File.open(file, 'w').write(t)
end
end
}
Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com >
2014-02-12 09:30:37 +01:00
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
325c0beda5
Git: Show commit on double-click in fixup editor
...
Change-Id: I8cb08b0fcba3ddac7223b39b3762ff71e8d61f8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-06 10:25:10 +02:00
8695fe6d7c
Git: Implement "Fixup previous commit"
...
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-04 20:01:04 +02:00
06da25f610
Git: Add commit type to CommitData
...
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-02 16:52:10 +02:00
cb055c1d0f
Git: Simplify editor code a bit
...
* Introduce a const submitEditorWidget() and use it
* Directly use layout from ui
Change-Id: Ib566bab464d4f1c08a3f2af0edb5e1fa989c3160
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-02 16:47:19 +02:00
7b851602cc
Git: Use an enum for simple/amend commit
...
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-04-30 14:38:00 +02:00
e427eab068
Git: Close submit editor if all changes were committed externally
...
Change-Id: Iae4e9d52aed333def0e5f0c56bca9c68a38430a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-03-01 11:25:22 +01:00
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
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
76f6729892
Git: Pass rows instead of files for diffSelectedFiles
...
Useful when the same file can appear more than once
(e.g. staged + modified)
Task-number: QTCREATORBUG-5347
Change-Id: I3ce716c22840c149490e00e6948612607ae57159
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-11 13:13:39 +01:00
cecfffc7a3
VCS: Refresh submit editor status when it might change
...
Including Git implementation
Task-number: QTCREATORBUG-5644
Change-Id: Ic5dede99d93b84e5d271292b4694216f51e66882
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2012-12-30 21:47:35 +01:00
cf6298ff32
Git: Introduce MergeTool support
...
Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2012-11-07 16:12:27 +01:00
386ca7c8dd
Adjust license headers
...
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2012-10-05 17:12:56 +02:00
e0e8cf3ada
Contact -> qt-project.org
...
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-19 13:23:21 +02:00
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
2931a499e6
Long live the king!
...
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-01-26 19:55:36 +01:00
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
85cf2b661e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
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
057bc58d84
Small coding style cleanup
...
Change-Id: I4b7a3dbd58cb52f9c6245ed59be2b1be8c98f66d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-10-21 11:44:36 +02:00
08f97b50d7
Git: Support encoding convert of commit messages
...
We need read i18n.commitEncoding value, to write correct encoding of the commit file.
In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages.
Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-10-21 11:42:28 +02:00
b705ff3dab
Fix MSVC's class/vs struct warning.
...
Change-Id: I5839f979b6fc8687b55dc46917dfc72abd3122a9
Reviewed-on: http://codereview.qt.nokia.com/2913
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
2011-08-12 13:45:42 +02:00
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
8397663964
Update license.
2011-04-13 11:49:28 +02:00
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
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
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
d1976d1959
Git: Only enable submit button when a description is available
...
Only enable submit button in the git submit editor when a non-empty
desciption of the patch is available. Git rejects empty commit messages
and old versions fail without even giving an error Qt Creator can detect,
so this should make commiting a bit more save.
Task-number: QTCREATORBUG-2410
2010-11-23 16:01:48 +01:00
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
884b7af769
Update license headers and sales contact details.
...
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
9b7274a011
Remove comment lines from the git commit message (as git commit -F does not do that)
...
Reviewed-by: dt <qtc-committer@nokia.com >
enter the commit message for your changes. Lines starting
2009-03-24 15:46:58 +01:00
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
59affcfffc
Bump year in licence header.
2009-01-13 19:22:14 +01:00
e2ef36a65d
Fixes: Enable multiselection in file list of git submit editor
...
Details: Refactor the git command to be able to run a batch. Run diff and diff --cached in a batch
2009-01-13 17:25:09 +01:00
4741a7282d
Fixes: Make git diff work for staged files, do not launch submit if file list empty, make file model read only, add conveniences
...
Details: Add a type data field to the git file model
2009-01-13 10:06:06 +01:00
17daca603a
Fixes: Use a model for the submit file list (to resolve the git diff mess)
2009-01-12 17:44:04 +01:00
da3cb14483
chancge Nokia GPL exception version from 1.2 to 1.3
2008-12-16 17:20:00 +01:00
c4c2437dd4
Fixes: Ability to uncheck files in git.
2008-12-02 15:43:58 +01:00
df7aacd637
more file cosmetics
2008-12-02 15:08:31 +01:00
ab83dcd87c
off-by-one in headers
2008-12-02 14:20:25 +01:00
8a43d9b9f3
end-of-line whitespace correction of the new headers
2008-12-02 14:17:16 +01:00
05c35356ab
Initial import
2008-12-02 12:01:29 +01:00
Orgad Shaneh
Robert Loehning
Oswald Buddenhagen
hjk
Eike Ziller
Erik Verbruggen
hjk
Tobias Hunger
Yuchen Deng
Friedemann Kleint
Jason McDonald
Daniel Molkentin
hjk