feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,766 Commits 108 Branches 368 Tags
9654df9f1f92ab2c1548c10ca614a6ab82783ac4
Commit Graph

46 Commits

Author SHA1 Message Date
Andre Hartmann
9654df9f1f Git: Allow direct push after commit 
Git commit dialog: Added a drop-down menu to the commit button to
execute "git push" or open the "Push to Gerrit" dialog directly after
a commit or amend.

Task-number: QTCREATORBUG-8854
Change-Id: I00ff8f816d1768e0cdaf6929126b55826788e578
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-30 19:20:11 +02:00
hjk
c4d1d7f278 Core: Clean up some ICore::instance() uses 
Change-Id: I888b30094ed75818ee3af58c94ebf8468afa5eb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-24 09:57:55 +02:00
hjk
98917598d3 ProjectManager: Use Core::Id for progress types 
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-04 14:59:06 +02:00
hjk
267e441af4 Apply 'static' pattern to VcsManager 
Adapt user and surrounding code.

Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-03 12:01:24 +02:00
hjk
df36184371 Core: Static pattern for ProgressManager, clean up all users 
Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-02 12:41:47 +02:00
Orgad Shaneh
54b7146986 Gerrit: Notify on invalid configuration 
Task-number: QTCREATORBUG-9548
Change-Id: I4c5f9a4c6b7a818d296a923df1d665c22afd8292
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:47:03 +02:00
Andre Hartmann
f1ed40a02c Git: Add Gerrit to Locator 
The Gerrit dialog itself was missing while Push to Gerrit was already
there.

Change-Id: Ie4b85cad9dba96beafb595c505daf28d0a1ceeb5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-06-11 16:24:47 +02:00
Orgad Shaneh
eb2a359f06 Gerrit: Close write channel for fetch process 
Change-Id: I1557d2e57f5838d7820bcb41190ff2bb4b9a0473
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-06-11 15:11:18 +02:00
Petar Perisin
36bec480ae Git - execute push asynchronously 
Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:59:38 +02:00
Orgad Shaneh
1f447715b0 Git: Remove double warning for gerrit push 
Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:43:54 +02:00
Petar Perisin
77c136646b Gerrit - Removed all patch set stuff 
Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-05-31 06:08:35 +02:00
Petar Perisin
86d7e28db4 Git - added submoduleDataMap to handle submodule data 
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-28 21:53:26 +02:00
Petar Perisin
beac53ad8d Gerrit - use new diff editor for diff 
Change-Id: I7ba84491a5f6796ff446c2e21487ed4c04441b82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-28 10:25:26 +02:00
Petar Perisin
b28ae07274 Gerrit Dialog - renamed "Apply" to "Cherry Pick" 
Cherry pick is git command that everyone who works with git knows. First
time I saw "Apply" I thought it was some git or gerrit command unknown
to me. Renaming it to "Cherry Pick" makes dialog more clear, since user
knows what command will execute when button is pressed.

Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-26 15:08:36 +02:00
Orgad Shaneh
c60ab1ca3c Git: Fix object leaks 
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-17 17:59:10 +02:00
Orgad Shaneh
74a512892a Git: Use Git process environment for Gerrit plugin processes 
Change-Id: Iab0124d3aeed189c5ffd900c02ce6b87293b9c79
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-17 11:42:14 +02:00
Leena Miettinen
bc9bb4b93c UI text: fix VCS related strings 
Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-05-16 14:33:32 +02:00
Orgad Shaneh
566d3d9d9b Git: Enable commit selection in Push to Gerrit dialog 
Change-Id: Ie0ca8322858ac75d4bacf8b3efe66fa40577e3a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-05-07 11:50:51 +02:00
Orgad Shaneh
1f38110dad Git: Preserve reviewers list in GerritPushDialog 
Not stored in settings (it is not important enough), but usually
the same reviewers are required for consequent changes

Change-Id: I28564791419ac441478db65e51b09189b9f2f196
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:01:00 +02:00
Orgad Shaneh
df767f1c48 Git: Fix leak when GerritPushDialog is canceled or fails 
Change-Id: Id7479f44ee01f68e1423cc8346bc80f78ddfedb4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:00:54 +02:00
Orgad Shaneh
002fa92a34 Git: Fix validation in GerritPushDialog 
Change-Id: I1764ccd4950d5d5fee3cbd00515716ef5f524bf0
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-07 11:00:40 +02:00
Orgad Shaneh
fb40fd8297 Git: Allow reviewers specification in Push to Gerrit dialog 
Change-Id: I6126411209d73797cc7e4f7c15a6a49b50366c63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 19:59:44 +02:00
Orgad Shaneh
711315f383 Gerrit: Add topic in Push to Gerrit dialog 
Change-Id: I4f2df0d40d7518b1a88595ad2ff52fd50b8ac92d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 13:26:29 +02:00
Petar Perisin
311ca8cd01 Git - added continue and abort 
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-21 23:07:46 +02:00
Friedemann Kleint
ad9081e3d8 tr()-Fixes in git/gerrit. 
Introduce common message for "Cannot run", remove exclamation
marks.

Change-Id: Ib3f36e95c67136041cde56e697ec4ba0a3b9549e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-15 15:04:05 +02:00
Petar Perisin
c49fe8350d Git: Add a function for getting current local branch 
Change-Id: Ibda70cb896633cc7afa3a845b99aac523246c558
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-08 19:23:47 +02:00
Petar Perisin
9dce1fe429 Coding style modifications 
Change-Id: I098cbde76e844229f189eb05d0e0b5013af8c5fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-08 10:33:14 +02:00
Petar Perisin
fe1f7e4bf6 Gerrit: Added pushToGerrit dialog 
Change-Id: Ic16eae2def11343ef7be5ce8378d24b5fd11a386
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:28:05 +02:00
Petar Perisin
83d51b2691 Gerrit: added ability to save path for applying patches 
Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:27:57 +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
c57e6029c6 Gerrit: Use GitClient functions for checkout and cherry-pick 
This is cleaner, and for cherry-pick also handles conflicts

Change-Id: I50a7035c532a2cfa07fdd960e70ffb4af666a80e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-01-24 13:47:57 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
hjk
e833b794b3 Use Core::Id in ICore::showOptionsDialog 
Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-29 19:04:30 +01:00
Friedemann Kleint
45b4ff4e74 Gerrit: Disable buttons while fetch operation is in progress. 
Gerrit operations should not be started in parallel since
they use FETCH_HEAD, which can cause mix-ups.

Change-Id: Icb421c8065f680a4bb93acd63e1ffe6309ce774a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-12-11 15:19:35 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02: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
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin 
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-05 10:18:56 +02:00
Leena Miettinen
174226e21e UI text: write Git in upper case 
Change-Id: I012af35287b0ee478eb99c95c54ba438f8e4e6d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-10-01 14:31:30 +02:00
Daniel Teske
ff6e9333ad Make IOutputPane behaviour more granular 
The commit looks big, but it's mostly trivial. Also any build/run
related popups are now "flashes" if the current mode has no placeholder.

Task-number: QTCREATORBUG-7875
Change-Id: I3af40557f7af01798f905c0d1829423c80058cb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-13 17:37:02 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget* 
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-19 15:15:53 +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
Eike Ziller
3934347fe9 ActionManager API cleanup. 
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-25 10:08:24 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 13:51:14 +02:00
Orgad Shaneh
88bc6df12f Gerrit: Make patch display behave like git diff 
Change-Id: If6b0b449d29b43a2eb6a135504c12caaf6fcd43b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-04-26 14:35:12 +02:00
Friedemann Kleint
2193915cca Start on a gerrit plugin as a sub-plugin of git. 
- Add a gerrit window that shows a list of changes
  and buttons to display, apply or check out
  a change.
- Uses the new Qt 5 Json API or the utils/json
  classes for Qt 4.

Tested-by: Tobias Hunger <tobias.hunger@nokia.com>
Tested-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I14c6c2c2de8f95fb785752c7319be8638b386a1e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-04-26 14:34:41 +02:00