diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-11-20 09:40:37 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-11-21 14:10:56 +0100 |
| commit | 1d994b1471bd43d7003697b47e3f7d2ebfc808df (patch) | |
| tree | 1439c230895f55bfc386cd09cf7f48ecac0d8cc3 | |
| parent | 6f3c749f0e85c0bfd93a6d176fce2f25edf58962 (diff) | |
| download | qttools-1d994b1471bd43d7003697b47e3f7d2ebfc808df.tar.gz | |
Use https instead of http when opening docs
Pick-to: 6.0 6.0.0
Change-Id: I10dfbd66b2510ae23ef91a2048f1ead6ddfb588f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 4 | ||||
| -rw-r--r-- | src/distancefieldgenerator/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index 11cb350df..55e250283 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -1001,9 +1001,9 @@ bool QDesignerActions::showHelp(const QString &htmlFile) { const int qtVersion = QT_VERSION; QString url; - QTextStream(&url) << "http://doc.qt.io/qt-" << (qtVersion >> 16) + QTextStream(&url) << "https://doc.qt.io/qt-" << (qtVersion >> 16) // TODO: uncomment the line below just before Qt 6.0 release -// we should have then http://doc.qt.io/qt-6.0/ link valid (like in case of 5.x series). +// we should have then https://doc.qt.io/qt-6.0/ link valid (like in case of 5.x series). // Currently it redirects to Qt 6 snapshot. // << "." << ((qtVersion >> 8) & 0xFF) << '/' << htmlFile; diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp index 2f0820ae7..41516bd49 100644 --- a/src/distancefieldgenerator/mainwindow.cpp +++ b/src/distancefieldgenerator/mainwindow.cpp @@ -52,7 +52,10 @@ QT_BEGIN_NAMESPACE static void openHelp() { - QDesktopServices::openUrl(QUrl(QLatin1String("http://doc.qt.io/qt-5/qtdistancefieldgenerator-index.html"))); + const int qtVersion = QT_VERSION; + QString url; + QTextStream(&url) << "https://doc.qt.io/qt-" << (qtVersion >> 16) << "/qtdistancefieldgenerator-index.html"; + QDesktopServices::openUrl(QUrl(url)); } MainWindow::MainWindow(QWidget *parent) diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 815bed2bf..90af24f20 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -1329,7 +1329,7 @@ void MainWindow::manual() { const int qtVersion = QT_VERSION; QString url; - QTextStream(&url) << "http://doc.qt.io/qt-" << (qtVersion >> 16) << "/qtlinguist-index.html"; + QTextStream(&url) << "https://doc.qt.io/qt-" << (qtVersion >> 16) << "/qtlinguist-index.html"; QDesktopServices::openUrl(QUrl(url)); } |