diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-02-15 17:10:26 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-02-17 11:35:55 +0000 |
| commit | 330a6f793c5a06c00fec39c8057bd1ff22692ae5 (patch) | |
| tree | f9bf7dab4756a38eacab950365ed777f5414c533 | |
| parent | 5c98eaf5929ed4e2d5b56344e3aa11b7ae596647 (diff) | |
Link with Qt: Remove now harmful check
The check was trying to find out if the Qt Creator installation is part
of the online installer or a Qt installer, by checking if there are
install settings without the key "Settings/InstallSettings".
Since we made Qt Creator optional in the installer, the install settings
contain that redirection key anyway, so it is no longer an indicator for
Qt Creator being part of the online or an Qt installer anymore.
Actually the check now _disables_ the Link with Qt button for the
commercial Qt Creator offline installer on macOS, because that ships
install settings that add the plugin path to the commercial plugins
outside the Qt Creator app bundle, but does not contain "Settings/
InstallSettings".
Just remove the check.
Change-Id: I88c3ef007a728dff0f4214e5a5683ffcede23796
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 56bd6d4722..8ae0e5d639 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -852,14 +852,6 @@ static bool canLinkWithQt(QString *toolTip) tip << Tr::tr("%1's resource directory is not writable.") .arg(Core::Constants::IDE_DISPLAY_NAME); } - // guard against redirecting Qt Creator that is part of a Qt installations - // TODO this fails for pre-releases in the online installer - // TODO this will fail when make Qt Creator non-required in the Qt installers - if (installSettingsExist && !installSettingsValue) { - canLink = false; - tip << Tr::tr("%1 is part of a Qt installation.") - .arg(Core::Constants::IDE_DISPLAY_NAME); - } const FilePath link = installSettingsValue ? *installSettingsValue : FilePath(); if (!link.isEmpty()) tip << Tr::tr("%1 is currently linked to \"%2\".") |