07921dee77
Git: Expand branches also on internal model refresh
...
Change-Id: I91e3b875be1a2c3b5da9ae7720709b34a7d83232
Reviewed-by: André Hartmann <aha_1980@gmx.de >
2017-03-26 20:37:53 +00:00
53c4b36e4a
Git: Resize columns in branches dialog when data is changed
...
When setting a tracking branch, creating or deleting a branch.
Change-Id: I58dd06912fbf23900674a8714224ee414f1da4b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io >
2016-06-23 13:05:27 +00:00
b4195d5174
Git: Modernize
...
* pragma once
* member initialization
* s/struct/class/
* Introduce a static GitPlugin::client() method and use it
Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2016-02-10 15:01:57 +00:00
397e7f4843
Update License according to agreement with Free Qt Foundation
...
* Update files in src/plugins
Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com >
2016-01-19 15:57:01 +00:00
7b3aa16dc6
Git: Use Qt5-style connects
...
The heavy lifting was done by clazy.
Change-Id: I60dcd378419b92f96dc681921701c9231ef8ee57
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2015-11-23 14:48:09 +00:00
3c85058694
Update License
...
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2015-01-16 12:37:56 +01:00
8295b503be
License update
...
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com >
2014-10-09 11:41:44 +02:00
d967b6413f
Git: Add reset button to branches dialog
...
Task-number: QTCREATORBUG-11391
Change-Id: I5146a8b00a88124f96c788cba2bbfa786618ee20
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-02-25 15:44:10 +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
2ac65aaa7c
Git - Add Cherry Pick in branches dialog
...
Change-Id: Ic01846e3f8622cfa7b6c6ada8b626af6fa8cb3e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-24 17:28:58 +02:00
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
be5133cf72
Git: Update branches dialog when repository is changed
...
and on fetch
Task-number: QTCREATORBUG-9667
Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82
Reviewed-by: Robert Loehning <robert.loehning@digia.com >
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-07-04 15:26:39 +02:00
cfc8ce8c1b
Remove changeEvent(QEvent::LanguageChange) implementation
...
This was implemented only for a small set of widgets. It's unlikely that
we will ever have or even want a dynamic language selection, until then
this code is only dead freight.
Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-05-27 08:58:51 +02:00
0dee89bac1
Git: added rename branch
...
Change-Id: I327a2bc91b871dc03797d9af52bb2d32be8e76d2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-04-08 11:25:46 +02:00
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
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
7df112b687
Git: Added Merge and Rebase
...
Added git functions - "Merge" and "Rebase"
They are in the "Branches" dialog:
- Merge - merge selected branch into current one
- Rebase - rebase current branch on selected one
Task-number: QTCREATORBUG-8367
Change-Id: I9ed306c64d5d4b7bd1d58730a5e1009f0bd4ec0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-07 15:26:47 +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
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
5f6a91e009
Git: Rework branch dialog
...
* Make adding new branches more discoverable
* Make adding tracking branches more discoverable
* Update UI
Task-number: QTCREATORBUG-4943
Task-number: QTCREATORBUG-4944
Change-Id: Idcbf5f8321a3bd04c925e33d094bb479788a7d9b
Reviewed-on: http://codereview.qt.nokia.com/588
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2011-06-22 10:46:48 +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
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
e02e0f8c4a
VCS[git]: Added showing logs of all branches
2010-08-27 15:52:18 +02:00
ce24dfa378
VCS[git]: Ensure that only one branch is selected at a time
2010-08-27 15:52:16 +02:00
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
18ab532e56
VCS[git]: Make Branchdialog non-modal as is StashDialog.
...
Give dialogs a consistent look, set
WA_DeleteOnClose on them and improve updating.
Add a Refresh/Diff buttons to branch dialog.
2010-01-27 12:47:23 +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
b789ffa91b
Added and corrected copyright headers
2009-03-20 14:59:12 +01:00
4e16705a27
Added changeEvent calls where appropriate
...
Need to call into the superclass in order not to lose functionality. Was
missing in the wizard, hence the many missing occurrences.
Reviewed-by: Friedemann Kleint
2009-03-17 18:25:44 +01:00
94d646a206
Fixes: Added dbl-click handling for remote branches
...
Task:
RevBy:
AutoTest:
Details: Moved code to create a local branch from model to dialog which is slightly better since all the modifying app code is there.
2009-01-09 16:27:42 +01:00
352cf14353
Fixes: Add way to create a new local branch in the git plugin
...
Task: 205821
Details: Split up the branch model into remote branch base class and extended local branch class with <New Branch> row.
2009-01-07 12:58:31 +01:00
defc270896
Fixes: Start a git branch dialog.
2008-12-19 17:42:08 +01:00
Orgad Shaneh
Tobias Hunger
Eike Ziller
Eike Ziller
Tobias Hunger
Robert Loehning
Petar Perisin
hjk
Friedemann Kleint
Oswald Buddenhagen
hjk
Eike Ziller
Erik Verbruggen
hjk
Tobias Hunger
Robert Loehning
Friedemann Kleint
Jason McDonald
Thorbjørn Lindeijer