Commit Graph

24 Commits

Author SHA1 Message Date
Eike Ziller
3ec87e37ee Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
2022-07-20 12:03:40 +02:00
Jarek Kobus
60a5f77ef2 Drop Qt5: VCS: Get rid of QComboBox QOverload
Change-Id: Ib2f21f28a0ec16b817f9227c6234424001752d50
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-19 21:45:59 +00:00
Eike Ziller
11b0cab178 Project settings: Fix missing IDs for global settings links
Change-Id: Id99bf5f9d45dd399c589011ca724914046305c53
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 07:19:27 +00:00
Jarek Kobus
e793841b4f Remove Core::ShellCommand
Move the implementation into VcsCommand.
Use Utils::ShellCommand inside coreplugin API.

Change-Id: I74a34057b33832a138b05f1dfa6937565027edb4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-07-11 10:04:08 +00:00
Christian Stenger
674cca18a7 GitLab: Use IntegerAspect instead of QSpinBox
Change-Id: I06e9d907a6a65f8cf135031f0aed3cd3eca9281b
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-07-08 07:00:17 +00:00
hjk
7cc06b85d0 Replace more used of PathChooser::pathChanged by filePathChanged
Change-Id: I0f92be6fcfd0a5319ad9f5d3681266966e40705e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-07-01 10:07:24 +00:00
hjk
9e363c6421 Add plugintr.h files to all plugins
Except FakeVim, which had it before.

for i in [a-eg-z]*/*.json ; do
    upper=${i##*/}
    upper=${upper/.json/}
    lower=${i%/*}
    trfile=$lower/${lower}tr.h

    cat << EOT > $lower/${lower}tr.h
/****************************************************************************
**
** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/

namespace $upper {

struct Tr
{
    Q_DECLARE_TR_FUNCTIONS($upper)
};

} // namespace $upper
EOT

    git add $trfile

    perl -pi -e "s/(${lower}_global.h)/\1\n    ${lower}tr.h/"  $lower/CMakeLists.txt

    perl -pi -e "s/(\"${lower}_global.h\",)/\1 \"${lower}tr.h\",/"  $lower/$lower.qbs

done

Change-Id: I15ebbaaa9443c57b391b9e143f592d8a0c9208a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-27 13:34:57 +00:00
Eike Ziller
92c74abbf1 Fix lupdate issues
Change-Id: I7256c8aff5eb77b264b76ba24e79c26ab2924e84
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-27 07:05:22 +00:00
Jarek Kobus
13c7513024 QueryRunner: Connect to done() signal
Instead of connecting to errorOccurred() and finished() signals.

Change-Id: I57adabc52b38be6b22a4d7380e6fbaaae3192201
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-20 08:00:59 +00:00
hjk
152b14207c Replace QtcProcess::stopProcess() by stop() plus waitForFinished
... or nothing, if the process object is destroyed immediately.

Change-Id: I6a1e1928bc49fc20a1c0e0ee9b8f4f723276bbca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-16 08:26:10 +00:00
Christian Stenger
d06d6ebeba GitLab: Fix reflecting port data inside ui
Set values did not show up inside the ui. Likely a redo of
the options page would be more appropriate, but for now the
quick fix should be good as well.

Change-Id: Id782ba48ea4dee08b2c6720cdf9e78350f1e9a47
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 12:57:44 +00:00
Christian Stenger
e42ff3f14e GitLab: Allow localhost for server
Change-Id: I026f6a72c9eb0b377319fca847062885c666ed4a
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 12:27:56 +00:00
Christian Stenger
0cfd264279 GitLab: Handle certificate issues
Allow to bypass certificate verifications.
Currently the bypassing is not stored into the settings,
so this is not permanent.

Change-Id: Ieb564464a28cf2d4973c6b1baa696d6c22b07177
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 12:27:45 +00:00
Christian Stenger
fdb413c9a7 GitLab: Support unsecure http as well
Change-Id: Idfb4faf1cbfbfd6c2914b057e6c76461de0ceeff
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-10 12:27:30 +00:00
Christian Stenger
d291008322 GitLab: Display link to global settings in project settings
Change-Id: I18208c44f9538c31fae4df61f2e0d93c1efcc319
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 12:39:33 +00:00
Artem Sokolovskii
674f62d481 ProjectExplorer: Add possibility to keep link visible
Added possibility to keep link to global settings visible when
checkbox is invisible.

Change-Id: I724f1c1997b640b2277c4004acd24d5f6cca9faa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 11:43:20 +00:00
hjk
b6db9d8152 Gitlab: Some layout code cosmetics
Take advantage of the aspects' setLabelText.

Change-Id: I00060a02393fb90557f0f4dd01411fd3928c4c19
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 10:43:15 +00:00
Christian Stenger
fe63fb2881 GitLab: Add hint what link to gitlab is for
Change-Id: I5ee32fac4a2a73b3b40438d1697071491c17ac94
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-03 11:40:37 +00:00
Christian Stenger
23ba55cade GitLab: Avoid wrong request
Change-Id: I8be467559c5a742d40b865fa4ffd2c10344ccbba
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-03 10:34:34 +00:00
Christian Stenger
ed02ebf615 GitLab: Slightly tweak clone dialog layout
Change-Id: I884c06108515f81f77d00fa6d16821f91be000a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-03 10:34:26 +00:00
Eike Ziller
ffe1ff2368 GitLab: Fix warning "lambda capture not used"
Change-Id: Ife9c83a9cf8302800c9ad14e1e349a7688240717
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-01 11:46:42 +00:00
Christian Stenger
dd27901759 GitLab: Allow fetching events
Projects that are linked to a GitLab instance will now fetch
notifications for this project and print them to the vcs output pane.

Change-Id: Ifb960e64b30a260327efb28a3dfd26f6457503a0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 10:47:11 +00:00
Christian Stenger
dcfa15ff17 GitLab: Allow browsing and cloning projects
Change-Id: I1cc877ea6b5a55ae7bdb8e7a529afeb08d09e0c0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 10:13:06 +00:00
Christian Stenger
743dd442d7 GitLab: Introduce minimal GitLab plugin
So far only adding global settings and project settings.
Global settings allow to specify configurations used later
inside the project settings or when accessing GitLab
server instances.
Project settings already can "link" to GitLab projects,
which will allow to fetch notifications for the project
later on.
Real functionality is added in the follow ups.

Change-Id: I8a0f978001c58c6dc9e07917c183891abec9a3d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-25 09:54:09 +00:00