aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2022-05-27 15:22:39 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2022-05-31 06:54:42 +0000
commit255f7f836f6275fc9b115652c2e8306895fcc33b (patch)
tree804a4b9faa70320b75d9aa61520985f072b109ca
parentf6fdcfef536c1d4e6333cd30ddb6eebf122b5fe3 (diff)
StudioWelcomePage: Disable data download by default
QML/Designer/EnableWelcomePageDownload is not set, no download or probing will start. Change-Id: Icadd29b2a8c0439ebd8435b987647f5d6f7167a7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--src/plugins/studiowelcome/examplecheckout.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp
index d0c3d40734c..c759f684bc1 100644
--- a/src/plugins/studiowelcome/examplecheckout.cpp
+++ b/src/plugins/studiowelcome/examplecheckout.cpp
@@ -57,6 +57,12 @@
using namespace Utils;
+static bool enableDownload()
+{
+ const QString lastQDSVersionEntry = "QML/Designer/EnableWelcomePageDownload";
+ return Core::ICore::settings()->value(lastQDSVersionEntry, false).toBool();
+}
+
void ExampleCheckout::registerTypes()
{
static bool once = []() {
@@ -186,6 +192,12 @@ bool FileDownloader::available() const
void FileDownloader::probeUrl()
{
+ if (!enableDownload()) {
+ m_available = false;
+ emit availableChanged();
+ return;
+ }
+
auto request = QNetworkRequest(m_url);
request.setAttribute(QNetworkRequest::RedirectPolicyAttribute,
QNetworkRequest::UserVerifiedRedirectPolicy);
@@ -447,6 +459,13 @@ DataModelDownloader::DataModelDownloader(QObject * /* parent */)
void DataModelDownloader::start()
{
+
+ if (!enableDownload()) {
+ m_available = false;
+ emit availableChanged();
+ return;
+ }
+
m_fileDownloader.setUrl(QUrl::fromUserInput(
"https://download.qt.io/learning/examples/qtdesignstudio/dataImports.zip"));