feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
57,811 Commits 108 Branches 368 Tags
710e57a628c90259297150ab3a0ac28e315ca1af
Commit Graph

84 Commits

Author SHA1 Message Date
Orgad Shaneh
681297ad7e Git: Fix reading of gitfile 
* QFile ctor does not open the file for read.
* Replace readLine with read(8) to avoid needless read.

This amends commit e9eeaf33b3.

Change-Id: I33c230497ad431091d7d6b271846f5af661b4e0d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-10-01 19:21:39 +00:00
Orgad Shaneh
e9eeaf33b3 Git: Detect also gitfile in isVcsFileOrDirectory 
Change-Id: Ic182407505fbcb9b5bd1768126885c4b06a30280
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-09-30 13:18:44 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists 
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 16:25:09 +00:00
Orgad Shaneh
4ca1fb0e9a VCS: Fix inverse condition 
compare returns 0 when the strings are equal

Change-Id: I4dfd3b402d48a3043e9674f1d82e66c968e8ba94
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-24 09:07:46 +00:00
Tobias Hunger
28325aa446 VCS: Add a way to filter out files/directories that belong to a VCS 
Change-Id: I4dcbe6242cfe327e3b72d3dd550309be45e326a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-10-21 13:04:40 +00:00
Orgad Shaneh
cfc8ed41c7 Git: Some more QStringList cleanup 
Change-Id: I0c6e8f768ee46985dab8ae14f88f2bc8d34fed26
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2016-08-15 07:30:06 +00:00
Orgad Shaneh
516161c875 Git: De-noise 
* Remove QLatin1{String|Char} where possible
* Use initializer lists for QStringList

Change-Id: I8479f87f4fc909b5d74d854956885564209538e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-22 10:12:59 +00:00
Orgad Shaneh
b55e06716b Git: Suppress stderr output (for the output pane) on clone 
It already appears in the wizard. No need to duplicate.

Change-Id: I74b1f7d9d5be44e95965bf2af3fee9727372995a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 09:22:24 +00:00
Tobias Hunger
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
Tobias Hunger
ef56bc6be0 Git: Make initial checkout more verbose 
I tried this before and it did not work...

Change-Id: Ia503e1d9c72c6bec7e8fdb68c683a6666f32f851
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-18 12:11:04 +00:00
Tobias Hunger
75f067550f IVersionControl: Add method to get a ShellCommand for initial checkouts 
Change-Id: Iabc056dad186d788003b221afb34303c37fef728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-11 11:51:53 +00:00
Tobias Hunger
a55fb4a378 Vcs: Move annotate and annotateRevisionRequested into VcsBaseClientImpl 
... and use that in the Git client.

Change-Id: Ie70ec0d5908776d11eb69613d45f565d4f0ce32b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-13 10:40:58 +00:00
Orgad Shaneh
4eb2224f47 Git: Add override 
Change-Id: Iae0779c1efa8b3b46cf504f7bda00d614a4a157e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2015-04-12 20:03:04 +00:00
Tobias Hunger
2ccae82b5c Vcs: Move vcsBinary and vcsTimeout into VcsBaseClientImpl 
Change-Id: Ib14432c85f42606a0437f3848b9dfa2fe63fb2f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-09 07:25:17 +00:00
Tobias Hunger
90ce38da39 Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl 
... and update users of that functionality accordingly.

Unexpected plus: Now every supported VCS actually saves their setting
when requested.

Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-08 09:30:44 +00:00
Tobias Hunger
f44161bb9a Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient 
Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-26 14:20:54 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Tobias Hunger
262f7f428f Vcs: Remove unused GetRepositoryRootOperation 
Change-Id: I2443aef788c75a96ba19e2499dfb3f17c201d468
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-19 10:20:12 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Tobias Hunger
6d7c2eed60 Core: Remove unused functionality to checkout from VCS 
Change-Id: I1ee17142e14200c5ae9597bbf9bee3f3978704f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-15 10:10:06 +01: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
Orgad Shaneh
febdfeb92f Git: Rename gitBinaryPath => gitExecutable 
Avoid confusion with gitBinDirectory

Change-Id: I335cf6bc82284e02e0652b057f0b80f292d6ddc0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-18 11:19:54 +02:00
Orgad Shaneh
c5d34eb6b3 Git: Use Git bin directory as an additional path 
Change-Id: I4738a4aec3b1b83b6d596497842086aeb1278f27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-16 12:43:36 +02:00
Tobias Hunger
bddf1d1101 Git: Report additional search paths 
Change-Id: I07d9ea0946ec44b4d1a7d7d02b1f50dbaf78f6e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-03-05 14:00:43 +01:00
Orgad Shaneh
cd48c5e513 IVersionControl: Implement topic cache in the base class 
Derivatives need to derive TopicCache, implement its pure virtual
functions and pass it in IVersionControl's constructor.

Change-Id: I3a904c84541fda95eee75296f86441c4bae55d79
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-19 09:25:31 +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
920fa79667 Git: Really add new/existing files 
Task-number: QTCREATORBUG-10117

Change-Id: Ic254cb2f7860ca0973cfda58cf66f62b1b8eaeb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-11-18 10:11:14 +01:00
Tobias Hunger
741ab2cbfb Vcs: Remove snapshot support 
The functionality is unused.

Change-Id: I45017106509b8dbff9f3eff3aaef6de19be31ce7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-10-15 16:53:58 +02:00
Orgad Shaneh
fdb6ef90fc VCS: Do not try to add files that are already tracked 
Task-number: QTCREATORBUG-2455
Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-11 12:43:25 +02:00
Orgad Shaneh
afcb9b2c41 Git: Show active branch next to command in progress 
Revised topic is "master (MERGING)" instead of MERGING

This should also fix topic getting stuck as REBASING

Change-Id: I934643f5b4e632318495f141536c666f775bd15d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-27 12:22:43 +02:00
Orgad Shaneh
f6833168ac Git: Capitalize display name 
Change-Id: I1274cf39ad02e214c64b0ca3308381adae2a5a80
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-11 12:32:33 +02:00
Orgad Shaneh
69d0d6cdca Git: Style fixes 
Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-11 10:30:55 +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
Knut Petter Svendsen
0d3b54f410 ClearCase: Don't show Hijack button for dynamic view 
The Hijack button (makeWriteableButton) should only
be shown for snapshot views.

Change-Id: I809981885d18b6057d82f73b5104b0f1041cd255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-11 14:18:51 +01:00
Orgad Shaneh
cdcc8256a0 Git: Require 1.7.2 
Remove legacy code

Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-20 13:29:11 +01: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
daef1fbb88 Git: Use stash pop instead of apply... 
... when the stash should be removed on successful pop

Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 14:59:24 +01:00
Orgad Shaneh
6a58cdffc2 Git: Rename synchronousBranch -> synchronousTopic 
Change-Id: I272e9db7a560f6e72dda6a0368d463da820f5b0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 13:24:49 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords 
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:20:46 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor 
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-20 08:57:35 +01:00
Mathias Hasselmann
c9b45c0d61 Git: Report current branch 
Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:11:24 +01:00
Orgad Shaneh
a1e3a5de9e Git: Refactor branch/HEAD access 
Change-Id: I0c9955737033c0f839ac1f6ea053fecc20c24d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-22 12:38:43 +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
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
3b5c40ba47 Git: Cleanup 
* Remove unused 'silent' argument
* Do not output 'git --version' command

Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:10:34 +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
Orgad Shaneh
6a17d889d4 Git: Find correct topLevel 
Task-number: QTCREATORBUG-6756

Change-Id: Iefaa8cb112f7da6e6eb76ec852f8f61abcd626ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:43:58 +01:00