feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/coreplugin/dialogs/shortcutsettings.cpp

Change-Id: I1f21845350bb69268ca51bc77167a8244adce22a
This commit is contained in:
Eike Ziller
2020-03-26 15:26:27 +01:00
parent 0b7c4520cd 9414961206
commit bac32dc740
96 changed files with 1068 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -778,7 +778,7 @@ void AndroidSettingsWidget::openNDKDownloadUrl()
void AndroidSettingsWidget::openOpenJDKDownloadUrl()
{
QDesktopServices::openUrl(QUrl::fromUserInput("http://www.oracle.com/technetwork/java/javase/downloads/"));
QDesktopServices::openUrl(QUrl::fromUserInput("https://www.oracle.com/java/technologies/javase-jdk8-downloads.html"));
}
void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)