feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
65,032 Commits 108 Branches 368 Tags
43b658e9e7b4d939ad409fbf24d81dfa86b723f6
Commit Graph

78 Commits

Author SHA1 Message Date
hjk
43b658e9e7 Utils: Drop Utils::SkipEmptyParts again 
We require Qt 5.14 nowadays.

Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-07-21 12:42:27 +00:00
hjk
1c81a3b3e8 All: Use Utils::SkipEmptyParts 
Task-number: QTCREATORBUG-24098
Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-06-17 05:55:25 +00:00
Lars Knoll
99a81e78d5 Port from QRegExpValidator to QRegularExpressionValidator 
QRegExpValidator is going away in Qt6, so port over to the
version using QRegularExpression.

Change-Id: Iecd1ba1f0e5e01009ae43b79c1ccc73f0fc046b2
Reviewed-by: hjk <hjk@qt.io>
 2020-03-20 11:39:42 +00:00
Orgad Shaneh
7c4f0a9b1e Git: Store singleton instance in GitClient 
On many cases, GitPlugin is not required at all, and is only used as
a proxy for GitClient.

Change-Id: I246012658ab3e8c7a12f1a459b1b1748ff358e0b
Reviewed-by: hjk <hjk@qt.io>
 2020-02-26 10:29:27 +00:00
Kai Koehne
fda9955df0 Globally disable WindowContextHelpButtonHint 
Do set the global application flag AA_DisableWindowContextHelpButton
to avoid having to unset the default WindowContextHelpButtonHint
in every single dialog.

AA_DisableWindowContextHelpButton was added in Qt 5.10.

Change-Id: I21fe8bc5ddfa4c01ec7a799b04bfb6ff1c9d6d86
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2020-02-25 13:26:44 +00:00
hjk
eb1226df68 Git: Partially move plugin pimpl to .cpp 
Same procedure as for ClearCase.
Unfortuately, some deep accesses are not easy to get rid of. Make them
available by static functions in the plugin itself. Definitely not the
favorite setup, but allows to proceed with the QObject removals.

Change-Id: Id85ed07bc7a6c1c053431a14dd7f68892f7ebea0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2020-02-07 12:56:10 +00:00
hjk
1cd936c531 Vcs: Pimpl plugins 
Essentially rename all *Plugin into *PluginPrivate, and pull out
the actual IPlugin related pieces into new *Plugin classes.

Shift the construction of the PluginPrivate to initialize(),
following the general pattern.

I tried to keep the patch as mechanical as possible, giving
room to some obvious but less mechanical cleanup needs,
that are intentionally left out of this here.

Change-Id: Iac662bf73338f9f7669064ed67b960246875c23c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2020-01-24 09:47:28 +00:00
Sona Kurazyan
82bcf4e9f5 Remove usages of deprecated APIs 
Replaced:
  QPalette::ColorRole::Background -> QPalette::ColorRole::Window
  QPalette::ColorRole::Foreground -> QPalette::ColorRole::WindowText
  Qt::ItemDataRole::TextColorRole -> Qt::ItemDataRole::ForegroundRole
  QFontMetrics::width() -> QFontMetrics::horizontalAdvance()

Task-number: QTBUG-76491
Change-Id: I1302e6b569e725daa6f7be1428ffe055657fc644
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-09-03 09:15:30 +00:00
hjk
6f37348b4c Replace static_casts by QOverload where possible 
Mainly to get rid of the QProcess::finished deprecation warning.

Also adjust coding style in the surrounding connects when needed.

Change-Id: I12f9b248c7974b892c4a069356e578e80f8c59e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-02-26 15:18:14 +00:00
Eike Ziller
afb6538dc6 Merge remote-tracking branch 'origin/master' into 4.8 
Change-Id: I99d7e3aa727316db2e4909be6c0ea7583b90c816
 2018-09-21 10:19:34 +02:00
Orgad Shaneh
6296e7bb38 Git: Avoid usage of deprecated QDateTime::fromTime_t 
Change-Id: I37ce617990ee385e37261624d847a0aef757d283
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-09-21 08:16:28 +00:00
Orgad Shaneh
202d40f256 Git: Modernize 
* Use auto
* Use override
* Use some member initializers

Change-Id: I3ca000d1c8e4d02331d58b85e68e4d771c636b29
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-09-19 19:47:07 +00:00
Orgad Shaneh
cf960e4788 Gerrit: Fix some clang-tidy warnings 
Change-Id: Idaccca0bd6d7682feeac8a0964ce2abb788f3e99
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-06-01 05:59:04 +00:00
Orgad Shaneh
366b813c5c Gerrit: Warn when probably pushing to wrong branch 
For rebase/merge strategies, this can cause real problems (when the target
branch is forwarded to a more recent branch...)

Task-number: QTCREATORBUG-20062
Change-Id: Ic7c282a1e0571b31d9333290141817c59daa0e7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-05-02 15:45:53 +00:00
Leena Miettinen
88a889d45a Gerrit: Fix UI text 
Change-Id: I5be1fc3629961dbc224d65d1bc52efc9a4613d2a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-02-05 16:14:01 +00:00
Alessandro Portale
2349a0a5c4 Git: Gerritpushdialog: Fix draft push for older Gerrits 
Logic for "Non-Draft" and "Draft" was swapped.

Change-Id: I14640e1a6321332c6f0cc0b3e8364194f52bcbaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-12-03 18:37:41 +00:00
Orgad Shaneh
2310ec5891 Gerrit: Support Private/Work-In-Progress push on Gerrit >= 2.15 
A private change[1] is only visible to the uploader and reviewers (like
draft in older Gerrit).

A WIP change[2] does not generate notifications until it becomes ready.

[1] https://gerrit-review.googlesource.com/Documentation/intro-user.html#private-changes
[2] https://gerrit-review.googlesource.com/Documentation/user-upload.html#wip

Change-Id: I4905461c529e93e86be934c60eab218ff7474fcd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-10-17 08:58:14 +00:00
Orgad Shaneh
c19c2551fb Gerrit: Move push target logic to GerritPushDialog 
Less indirection + will simplify new private/wip flags.

Change-Id: If8c4072b6456b4044d83ef17e130e0360a1d05f8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-10-15 16:44:59 +00:00
Orgad Shaneh
7a04014f9f Merge remote-tracking branch 'origin/4.5' 
Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
 2017-10-15 00:23:08 +03:00
Orgad Shaneh
5e798b0bf4 Gerrit: Improve error message when Gerrit remote is missing 
Task-number: QTCREATORBUG-18980
Change-Id: I99336732d59136f9aec9fc0a97fb3135e9c43f65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-10-13 13:06:14 +00:00
Tobias Hunger
c330cf0679 Replace manual signal blocking/unblocking with QSignalBlocker 
Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-10-04 09:35:06 +00:00
Orgad Shaneh
3b4c6ed5bd PushToGerrit: Fix support for multiple projects on the same remote 
Use case: A project has a legacy repo and a new repo. Both are used as
remotes in the same local directory. If the legacy repo's remote name is
less than the current repo (legacy < origin) then only legacy appears.

Change-Id: Ie02cbee3142c4d2628cb51cbcad50cf903a75bb0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-09-11 09:49:41 +00:00
Orgad Shaneh
9df86c2e67 Gerrit: Show only gerrit remotes in Push to Gerrit dialog 
Task-number: QTCREATORBUG-16367
Change-Id: I18e24dd0748bd64790bd8d2c0eeeee2cf1d3991a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-07-01 19:37:37 +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
e366e135b7 Git: Eradicate Q_FOREACH loops 
Change-Id: I29b6071ea244d1b3ae0701d36c90b1e93cf21fbb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
 2017-02-06 09:37:44 +00:00
Orgad Shaneh
7cfbcb41b9 Git: Persist topic per branch on Push to Gerrit 
Change-Id: I5a4056f562bb3264a8bd35d73fb16860eb0984e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-01-23 11:53:12 +00:00
Alessandro Portale
9c830a1619 Git: Use Utils::Icon for IconItemDelegate constructor 
Use our icon abstraction instead of file names, because themed icons are
coming.

Change-Id: I0f4e44caf96aeab0c354d2166b111d59b7b29149
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-10-11 13:29:30 +00:00
Orgad Shaneh
7f0b371c11 Git: Fix initially disabled OK button in Push to Gerrit 
Change-Id: I7223ef113781eb9adae59dba58036c19a96a11b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-05 16:04:14 +00:00
Orgad Shaneh
8d14f76c10 Gerrit: Support pushing initial commit for review 
Enable manual selection of target branch on this case.

Task-number: QTCREATORBUG-16780
Change-Id: I925ceef52ec56ebf77abcee58065c7b8afcc0854
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-09-12 14:21:07 +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
5834769cbf Git: Hide obsolete branches by default in branches dialog 
Task-number: QTCREATORBUG-15544
Change-Id: I411c7eacd2c154cad08234c0bd22e16dfecb961c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-03-10 10:24:50 +00:00
Tobias Hunger
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
Friedemann Kleint
97af238656 Preferably use QStringRef::toInt(). 
Avoid allocations for converting to int.

Change-Id: Id8c79334f4809ec075ffe7e6b7635be4873eafd8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-02-04 07:56:58 +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
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
4f7844d6f5 Git: s/GitPlugin::gitClient/GitPlugin::client/ 
... same name as with almost all other plugins.

Change-Id: I964159044d86685735e8b1e816a0bf67e0576fd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-08 09:52:25 +00:00
Orgad Shaneh
a260afe004 Gerrit: Place gerrit and origin remotes first 
Change-Id: Icf74210934b92c3f794ccc764b8e526d51eafc2b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-16 15:29:39 +00:00
Orgad Shaneh
7471187404 Gerrit: List remote branches also for non-fetched remotes 
Task-number: QTCREATORBUG-13718
Change-Id: I0259d06f4f06b68af459d747176dc46b14a55008
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-16 15:29:25 +00:00
Orgad Shaneh
bd5afaf4c6 Gerrit: Gracefully handle error retrieving branch distance 
Change-Id: If4f6babe654a6f667c36ac3afb851b078439d3b6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-16 15:29:21 +00:00
Orgad Shaneh
9fd5c44f4b Gerrit: Simplify loop in setRemoteBranches 
Change-Id: I9f32080c15ca48a2eb9feb1693eabcc1d8f20dd5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-02-16 15:23:24 +00:00
Tobias Hunger
4caee9fcbf Gerrit: Polish push to gerrit dialog 
Make the UI a bit nicer and simplify the code to find remotes.

Task-number: QTCREATORBUG-13718
Change-Id: I3b973fee30061232188c9aed3ad95abc8f8f095d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-02-16 13:31:05 +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
2998d33562 Gerrit: Rename member 
This is more in line with what we do elsewhere.

Change-Id: If5fb57a498c021c2c2f830d9aaa375bc13afeb19
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-02-04 15:12:25 +00: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
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
e5b2c079ca PushToGerrit: Do not allow spaces in the reviewers edit 
Task-number: QTCREATORBUG-11930
Change-Id: I0566fe2ef1d6e5ad9d99256d8a57a8e876a2e0c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-08-14 18:17:44 +02:00
Orgad Shaneh
48a5fb4b13 PushToGerrit: Do not calculate number of commits for empty input 
Change-Id: Ib2e5305dd47b486a963edf5bb04e6d16d76d5e68
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-14 10:38:34 +01:00
Orgad Shaneh
5a562e9239 PushToGerrit: Pass local branch to determineRemoteBranch 
Simpler

Change-Id: Ice180200a1b78e57b8ff6b246db7b2e8f3b39eb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-14 10:38:30 +01:00
Orgad Shaneh
0c6ee31684 Git: Fix target branch auto-detection in Push to Gerrit 
Initialization order is important.

* updateCommits populates the LogChangeWidget.
* determineRemoteBranch looks up by earliest commit (for which the
  LogChangeWidget must already by populated)
* Assignment to m_suggestedRemoteBranch must come before calling
  setRemoteBranches
* remoteComboBox was wrongfully used instead of targetBranchComboBox

Change-Id: Ib0db057313c8fd65910b0ec7394b6b8c7d997dab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-14 10:38:24 +01:00
Orgad Shaneh
635a355f97 Git: Suppress "No local commits" error message in Push to Gerrit 
Change-Id: Ib0cf79acf48d24848fda92a8b7b06efe62b46dbc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-12 12:42:45 +01:00